diff --git a/COPYRIGHT b/COPYRIGHT index d5936091929..7065c0b9adc 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -11,27 +11,28 @@ However it uses some external libraries under different licences. This is compat Composant Version License Compatible GPL Usage ---------------------------------------------------------------------------- PHP libraries: -AdoDb-Date 0.21 Modified BSD License Yes Date convertion -ArtiChow 1.07 Public Domain Yes Graphics -CKEditor 3.6.1 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG -FPDI 1.4.1 Apache Software License 2.0 ? PDF templates management -NuSoap 0.9.5 LGPL 2.1 Yes Library to develop SOAP Web services -OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files -Php-barcode 0.3pl1 GPL 2.0 Yes Bar code generation -PHPExcel 1.7.6 LGPL 2.1 Yes Read/Write XLS files, read ODS files -TCPDF 5.9.098 LGPL 3.0 Yes PDF generation +AdoDb-Date 0.21 Modified BSD License Yes Date convertion +ArtiChow 1.07 Public Domain Yes Graphics +CKEditor 3.6.1 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG +FPDI 1.4.1 Apache Software License 2.0 ? PDF templates management +NuSoap 0.9.5 LGPL 2.1 Yes Library to develop SOAP Web services +OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files +Php-barcode 0.3pl1 GPL 2.0 Yes Bar code generation +PHPExcel 1.7.6 LGPL 2.1 Yes Read/Write XLS files, read ODS files +TCPDF 5.9.098 LGPL 3.0 Yes PDF generation JS libraries: -jQuery 1.6.1 GPL and MIT Licence Yes JS library -jQuery UI 1.8.14 GPL and MIT Licence Yes JS library plugin UI -jQuery Flot 0.7 MIT Licence Yes JS library to build graph -jQuery JCrop 0.9.8 MIT Licence Yes JS library plugin Crop (to crop images) -jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15) -jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows) -jQuery jNotify 1.1.00 Apache Software License 2.0 ? JS library plugin jNotify (to use ajax popups) -jQuery Mobile 1.0b1 GPL and MIT Licence Yes JS library for smartphone (not used) -jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips -JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports) +jQuery 1.6.4 GPL and MIT Licence Yes JS library +jQuery UI 1.8.16 GPL and MIT Licence Yes JS library plugin UI +jQuery Flot 0.7 MIT Licence Yes JS library to build graph +jQuery JCrop 0.9.8 MIT Licence Yes JS library plugin Crop (to crop images) +jQuery jeditable 1.7.1 MIT Licence Yes JS library plugin jeditable (to edit in place) +jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15) +jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows) +jQuery jNotify 1.1.00 Apache Software License 2.0 ? JS library plugin jNotify (to use ajax popups) +jQuery Mobile 1.0rc2 GPL and MIT Licence Yes JS library for smartphone (not used) +jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips +JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports) For licenses compatibility informations: diff --git a/ChangeLog b/ChangeLog index 46951fd1344..33d948133b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,8 @@ For developers: - Qual: Add more "hooks". - Qual: Add "canvas" feature to overwrite page of thirdparty, contact, product with yours. - Qual: More OOP (usage of "abstract", "static", ...), uniformize constructors. +- Qual: task #216 : Move /lib in /core/lib directory +- Qual: task #217 : Move core files in core directory (login, menus, triggers, boxes, modules) ***** ChangeLog for 3.1 compared to 3.0 ***** diff --git a/build.xml b/build.xml index b510c6e7b86..18dc95c341e 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ - + @@ -44,18 +44,7 @@ @@ -67,18 +56,7 @@ diff --git a/build/deb/conf.php.install b/build/deb/conf.php.install index d392d431955..78195f27006 100755 --- a/build/deb/conf.php.install +++ b/build/deb/conf.php.install @@ -136,7 +136,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci'; # This parameter contains the way authentication is done. # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_* # Default value: dolibarr -# Possible values: Any values found in files in htdocs/includes/login directory after +# Possible values: Any values found in files in htdocs/core/login directory after # the "function_" string and before the ".php" string. You can also separate several # values using a ",". In this case, Dolibarr will check login/pass for each value in # order defined into value. However, note that this can't work with all values. diff --git a/build/doxygen/hudson-doxygen.doxyfile b/build/doxygen/hudson-doxygen.doxyfile index f3ebc166ffd..22318f7114b 100644 --- a/build/doxygen/hudson-doxygen.doxyfile +++ b/build/doxygen/hudson-doxygen.doxyfile @@ -611,7 +611,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/core/filemanagerdol htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie +EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/core/filemanagerdol htdocs/includes htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/build/makepack-dolibarrmodule.conf b/build/makepack-dolibarrmodule.conf index 287b4a58d55..8fddcd07a3b 100644 --- a/build/makepack-dolibarrmodule.conf +++ b/build/makepack-dolibarrmodule.conf @@ -8,8 +8,8 @@ # Setup: Go on Dolibarr setup - modules page to enable module. # # Files in module -htdocs/includes/modules/modMyModule.class.php -htdocs/includes/triggers/interface_mymodule.class.php +htdocs/core/modules/modMyModule.class.php +htdocs/core/triggers/interface_mymodule.class.php htdocs/mymodule/page1.php htdocs/mymodule/page2.php htdocs/mymodule/sql/script1.sql diff --git a/build/tgz/tar_exclude.txt b/build/tgz/tar_exclude.txt index 12ba7ebbf39..78b2360b27b 100644 --- a/build/tgz/tar_exclude.txt +++ b/build/tgz/tar_exclude.txt @@ -45,15 +45,15 @@ htdocs/includes/treemenu/docs htdocs/includes/treemenu/images htdocs/includes/treemenu/imagesAlt htdocs/includes/treemenu/imagesAlt2 -htdocs/includes/modules/modBookmark4u.class.php -htdocs/includes/modules/modDocument.class.php -htdocs/includes/modules/modDroitPret.class.php -htdocs/includes/modules/modEditeur.class.php -htdocs/includes/modules/modPostnuke.class.php -htdocs/includes/modules/modTelephonie.class.php -htdocs/includes/triggers/interface_user.class.php -htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN -htdocs/includes/triggers/interface_modEditeur_Editeur.class.php-NORUN +htdocs/core/modules/modBookmark4u.class.php +htdocs/core/modules/modDocument.class.php +htdocs/core/modules/modDroitPret.class.php +htdocs/core/modules/modEditeur.class.php +htdocs/core/modules/modPostnuke.class.php +htdocs/core/modules/modTelephonie.class.php +htdocs/core/triggers/interface_user.class.php +htdocs/core/triggers/interface_contractfrombill.class.php-NORUN +htdocs/core/triggers/interface_modEditeur_Editeur.class.php-NORUN htdocs/includes/tcpdf/fonts/utils htdocs/includes/tcpdf/fonts/free*.ctg.z htdocs/includes/tcpdf/fonts/free*.z diff --git a/build/zip/zip_exclude.txt b/build/zip/zip_exclude.txt index e94edb93793..e6db7bddcc0 100644 --- a/build/zip/zip_exclude.txt +++ b/build/zip/zip_exclude.txt @@ -46,16 +46,16 @@ */htdocs/includes/treemenu/images/* */htdocs/includes/treemenu/imagesAlt/* */htdocs/includes/treemenu/imagesAlt2/* -*/htdocs/includes/modules/modBarcode.class.php -*/htdocs/includes/modules/modBookmark4u.class.php -*/htdocs/includes/modules/modClickToDial.class.php -*/htdocs/includes/modules/modDocument.class.php -*/htdocs/includes/modules/modDomain.class.php -*/htdocs/includes/modules/modDroitPret.class.php -*/htdocs/includes/modules/modEditeur.class.php -*/htdocs/includes/modules/modPostnuke.class.php -*/htdocs/includes/triggers/interface_user.class.php -*/htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN +*/htdocs/core/modules/modBarcode.class.php +*/htdocs/core/modules/modBookmark4u.class.php +*/htdocs/core/modules/modClickToDial.class.php +*/htdocs/core/modules/modDocument.class.php +*/htdocs/core/modules/modDomain.class.php +*/htdocs/core/modules/modDroitPret.class.php +*/htdocs/core/modules/modEditeur.class.php +*/htdocs/core/modules/modPostnuke.class.php +*/htdocs/core/triggers/interface_user.class.php +*/htdocs/core/triggers/interface_contractfrombill.class.php-NORUN */htdocs/includes/tcpdf/fonts/utils/* */htdocs/includes/tcpdf/fonts/free*.ctg.z */htdocs/includes/tcpdf/fonts/free*.z diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php index d7b97936e24..15df2afa79f 100644 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-propale.php @@ -106,9 +106,9 @@ if ($resql) $user->rights->propale->valider=1; -if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) +if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); } $i=0; diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 27f44a01f22..2beb4eee7f1 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -20,12 +20,12 @@ /** * \defgroup mymodule Module MyModule * \brief Example of a module descriptor. - * Such a file must be copied into htdocs/mymodule/includes/modules directory. - * \file htdocs/mymodule/includes/modules/modMyModule.class.php + * Such a file must be copied into htdocs/mymodule/core/modules directory. + * \file htdocs/mymodule/core/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** @@ -69,7 +69,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/core/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. @@ -139,7 +139,7 @@ class modMyModule extends DolibarrModules */ // Boxes - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. $this->boxes = array(); // List of boxes $r=0; // Example: diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php index 6980c1322ec..3306d28a9f8 100644 --- a/dev/skeletons/skeleton_webservice_server.php +++ b/dev/skeletons/skeleton_webservice_server.php @@ -26,7 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php"); diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php index 17ec9feb824..78d89b691a9 100644 --- a/dev/translation/autotranslator.php +++ b/dev/translation/autotranslator.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Include Dolibarr environment require_once($path.'../../htdocs/master.inc.php'); -require_once($path.'../../htdocs/lib/files.lib.php'); +require_once($path.'../../htdocs/core/lib/files.lib.php'); // After this $db is an opened handler to database. We close it at end of file. // Load main language strings diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 512423e1400..fe8dc327f41 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -28,8 +28,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $langs->load("admin"); $langs->load("members"); @@ -417,7 +417,7 @@ function form_constantes($tableau) { print ''; // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php) - require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); $arrayoflabels=array(); foreach(array_keys($_Avery_Labels) as $codecards) { @@ -442,7 +442,7 @@ function form_constantes($tableau) } else if (in_array($const,array('ADHERENT_AUTOREGISTER_MAIL','ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('constvalue'.$const,$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60); $doleditor->Create(); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 8615877fefb..7f9d3fe1ca5 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); $langs->load("members"); @@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/lib/admin_extrafields.inc.php"); +require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 69e038492c6..d40e075e46e 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -25,9 +25,9 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $langs->load("members"); $langs->load("admin"); diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index e9e065125b7..43f75f7e122 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -24,8 +24,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); @@ -372,7 +372,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ { require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); // Creation de la ligne paiement $amounts[$invoice->id] = price2num($cotisation); diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index b5602c26ce1..ad783039514 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -23,10 +23,10 @@ * \brief Page to output members business cards */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/member/cards/modules_cards.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/member/labels/modules_labels.php"); $langs->load("members"); $langs->load("errors"); diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index abd23ca85c2..5f2bee45e27 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -28,8 +28,8 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); /** @@ -162,7 +162,7 @@ class Adherent extends CommonObject $from=$conf->email_from; if ($conf->global->ADHERENT_MAIL_FROM) $from=$conf->global->ADHERENT_MAIL_FROM; - include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); + include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $mailfile = new CMailFile($subjecttosend, $this->email, $from, $texttosend, $filename_list, $mimetype_list, $mimefilename_list, $addr_cc, $addr_bcc, $deliveryreceipt, $msgishtml); if ($mailfile->sendfile()) { diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 4111d66e0ff..c6c4a9e0c4f 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -25,8 +25,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); @@ -67,7 +67,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $ // Envoie fichier if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (create_exdir($upload_dir) >= 0) { diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index acf978600a5..1f28bf85ae0 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -25,10 +25,10 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); @@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes') if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $datenaiss=''; if (isset($_POST["naissday"]) && $_POST["naissday"] @@ -696,7 +696,7 @@ if ($action == 'create') // Civility print ''.$langs->trans("UserTitle").''; - print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').''; + print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').''; print ''; // Lastname @@ -923,7 +923,7 @@ if ($action == 'edit') // Civilite print ''.$langs->trans("UserTitle").''; - print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n"; + print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n"; print ''; print ''; @@ -1078,7 +1078,7 @@ if ($rowid && $action != 'edit') if (empty($login)) { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $login=dol_buildlogin($object->nom,$object->prenom); } if (empty($login)) $login=strtolower(substr($object->prenom, 0, 4)) . strtolower(substr($object->nom, 0, 4)); diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 58a19fdf0e7..d7b86d7202d 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 87c3abcb07f..7fc5b055798 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -23,9 +23,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php index a4ae0d6f33f..4634bc4a7d0 100644 --- a/htdocs/adherents/info_subscription.php +++ b/htdocs/adherents/info_subscription.php @@ -23,9 +23,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); $langs->load("companies"); diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 5bfcf87acdf..d202a411271 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -23,9 +23,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 731a2412b83..49bafc349f4 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); @@ -136,7 +136,7 @@ if ($id) { print ""; print "id."\">"; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$adh->note,'',280,'dolibarr_notes','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MEMBER,10,80); $doleditor->Create(); } diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 5ac68ded510..d805316dae6 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -23,7 +23,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $graphwidth = 700; $mapratio = 0.5; diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 90fcf1f840c..33829124cc0 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherentstats.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index ff0f40ba007..11e4b0fe1b3 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -240,7 +240,7 @@ if ($_GET["action"] == 'create') print ""; print ''.$langs->trans("WelcomeEMail").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print ''; @@ -620,7 +620,7 @@ if ($rowid > 0) print ""; print ''.$langs->trans("WelcomeEMail").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print ""; diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php index c860747533e..64c011622d6 100644 --- a/htdocs/admin/accounting.php +++ b/htdocs/admin/accounting.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 0a13ad70362..3d175a27d86 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -24,8 +24,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 6426c4f6c7a..3b34474cd1f 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -23,11 +23,11 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->admin) accessforbidden(); @@ -101,8 +101,6 @@ $form=new Form($db); $formadmin=new FormAdmin($db); $formother=new FormOther($db); -//$arrayofjs=array('/includes/jquery/plugins/colorpicker/jquery.colorpicker.js'); -//$arrayofcss=array('/includes/jquery/plugins/colorpicker/jquery.colorpicker.css'); $arrayofjs=array(); $arrayofcss=array(); diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 06d52f46065..3d370927fe9 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -22,8 +22,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/agenda.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'); if (!$user->admin) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 6db0f3bf8ad..66d4268ba38 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); $langs->load("admin"); @@ -108,7 +108,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/barcode/"; + $dir = $dirroot . "/core/modules/barcode/"; $handle=@opendir($dir); if (is_resource($handle)) @@ -193,7 +193,7 @@ if ($resql) // Chargement de la classe de codage foreach ($conf->file->dol_document_root as $dirroot) { - $dir=$dirroot . "/includes/modules/barcode/"; + $dir=$dirroot . "/core/modules/barcode/"; $result=@include_once($dir.$obj->coder.".modules.php"); //print $dir.$obj->coder.".modules.php - ".$result; if ($result) break; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 83c6091e53b..45d003a6acc 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -23,8 +23,8 @@ */ require("../main.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); -include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); @@ -277,12 +277,12 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/core/boxes/".$boxname.".php"; } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = "/includes/boxes/".$boxname.".php"; + $sourcefile = "/core/boxes/".$boxname.".php"; } dol_include_once($sourcefile); @@ -393,12 +393,12 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/core/boxes/".$boxname.".php"; } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = "/includes/boxes/".$boxname.".php"; + $sourcefile = "/core/boxes/".$boxname.".php"; } dol_include_once($sourcefile); diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 909a7978024..c2d5590413b 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index a4ba25d7d1a..d5e71e6ade8 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -29,7 +29,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load("admin"); @@ -72,7 +72,7 @@ if ($action == 'specimen') $commande->initAsSpecimen(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/commande/"; $file = "pdf_".$modele.".modules.php"; if (file_exists($dir.$file)) { @@ -243,7 +243,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/commande/"; + $dir = $dirroot . "/core/modules/commande/"; if (is_dir($dir)) { @@ -258,7 +258,7 @@ foreach ($conf->file->dol_document_root as $dirroot) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/".$file.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/".$file.".php"); $module = new $file; @@ -374,7 +374,7 @@ clearstatcache(); foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/commande/"; + $dir = $dirroot . "/core/modules/commande/"; if (is_dir($dir)) { diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 324cbdd8bea..41da98b8ac9 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -25,11 +25,11 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); @@ -47,7 +47,7 @@ accessforbidden(); if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"])) || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') ) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $new_pays_id=$_POST["pays_id"]; $new_pays_code=getCountry($new_pays_id,2); @@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb') if ($_GET["action"] == 'removelogo') { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo; dol_delete_file($logofile); diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index af9f54ee7dc..ac4a620a9e6 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index 8920fee2885..8c67fd28cf5 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("sendings"); @@ -65,7 +65,7 @@ else if ($action == 'disable_delivery') /* * Affiche page */ -$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/"; +$dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/"; $html=new Form($db); llxHeader("",""); diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 38ed35e425b..59237e73711 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -24,13 +24,13 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); -if (!$user->admin) -accessforbidden(); -//var_dump($_POST); +if (! $user->admin) accessforbidden(); + +$action = GETPOST('action'); $typeconst=array('yesno','texte','chaine'); @@ -39,7 +39,7 @@ $typeconst=array('yesno','texte','chaine'); * Actions */ -if ($_POST["action"] == 'add') +if ($action == 'add') { $error=0; @@ -93,9 +93,9 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De } // Delete line from delete picto -if ($_GET["action"] == 'delete') +if ($action == 'delete') { - if (dolibarr_del_const($db, $_GET["rowid"],$_GET["entity"]) < 0) + if (dolibarr_del_const($db, $_GET["rowid"], $_GET["entity"]) < 0) { dolibarr_print_error($db); } @@ -112,7 +112,7 @@ llxHeader('',$langs->trans("OtherSetup")); if ($conf->use_javascript_ajax) { ?> -'."\n"; } @@ -204,12 +204,12 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/core/boxes/".$boxname.".php"); } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = DOL_DOCUMENT_ROOT."/includes/boxes/".$boxname.".php"; + $sourcefile = DOL_DOCUMENT_ROOT."/core/boxes/".$boxname.".php"; } include_once($sourcefile); @@ -233,7 +233,8 @@ class InfoBox $j++; } } - else { + else + { $this->error=$this->db->error(); dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR); return array(); @@ -265,12 +266,12 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/core/boxes/".$boxname.".php"; } else { $boxname=preg_replace('/.php$/i','',$obj->file); - $sourcefile = "/includes/boxes/".$boxname.".php"; + $sourcefile = "/core/boxes/".$boxname.".php"; } dol_include_once($sourcefile); @@ -299,7 +300,8 @@ class InfoBox $j++; } } - else { + else + { $this->error=$this->db->error(); dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR); return array(); @@ -323,7 +325,7 @@ class InfoBox { global $conf; - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid); diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest index 9d7b4f8d58c..f0ea032ea16 100644 --- a/htdocs/cache.manifest +++ b/htdocs/cache.manifest @@ -12,7 +12,7 @@ index.php main.inc.php master.inc.php filefunc.inc.php -lib/functions.lib.php +core/lib/functions.lib.php # The NETWORK section contains the path to a folder to ensure that requests # to load resources contained under /api will bypass the cache and always fetch the resource from the server. diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 4580e01e959..c879523ec27 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); // If socid provided by ajax company selector diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 87a46c7eee2..9f2ea75cc00 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); +include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); /** diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index c5ead2e504d..d1203ec5674 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -175,7 +175,7 @@ $html = new Form($db); */ if ($socid) { - require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("companies"); @@ -284,7 +284,7 @@ else if ($id || $ref) /* * Fiche categorie de produit */ - require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); // Produit @@ -339,7 +339,7 @@ else if ($id || $ref) /* * Fiche categorie d'adherent */ - require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index e1e68db7a58..ab58b71972c 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1201,7 +1201,7 @@ class Categorie */ function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/"; $dir .= "photos/"; @@ -1236,7 +1236,7 @@ class Categorie */ function add_thumb($file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); if (file_exists($file)) { @@ -1306,7 +1306,7 @@ class Categorie */ function delete_photo($file) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index acb12159f9e..e513b901db0 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -134,7 +134,7 @@ print ''; print ''; print ''.$langs->trans("Description").''; print ''; -require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('description',$categorie->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); $doleditor->Create(); print ''; diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 5ac78405053..c59567527bc 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -209,7 +209,7 @@ if ($user->rights->categorie->creer) // Description print ''.$langs->trans("Description").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50); $doleditor->Create(); print ''; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 29fa9decf7f..d6cb0166c96 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); $type=(GETPOST('type') ? GETPOST('type') : 0); diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 56d2d844204..82f7b742bb3 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/categories.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); $langs->load("categories"); $langs->load("bills"); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index c1bb3b9739d..80c9cac9e06 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/categories.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); $langs->load("categories"); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index a6672adfa93..806d60929f2 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -91,7 +91,7 @@ class ActionComm extends CommonObject /** * Add an action/event into database - * + * * @param User $user Object user making action * @param int $notrigger 1 = disable triggers, 0 = enable triggers * @return int Id of created event, < 0 if KO @@ -126,10 +126,15 @@ class ActionComm extends CommonObject // Get id from code $cactioncomm=new CActionComm($this->db); $result=$cactioncomm->fetch($this->type_code); - if ($result) + if ($result > 0) { $this->type_id=$cactioncomm->id; } + else if ($result == 0) + { + $this->error='Failed to get record with code AC_OTH from dictionnary "type of events"'; + return -1; + } else { $this->error=$cactioncomm->error; @@ -219,7 +224,7 @@ class ActionComm extends CommonObject /** * Charge l'objet action depuis la base - * + * * @param int $id id de l'action a recuperer * @return int <0 if KO, >0 if OK */ @@ -307,7 +312,7 @@ class ActionComm extends CommonObject /** * Supprime l'action de la base - * + * * @return int <0 if KO, >0 if OK */ function delete() @@ -480,7 +485,7 @@ class ActionComm extends CommonObject /** * Charge les informations d'ordre info dans l'objet facture - * + * * @param int $id Id de la facture a charger * @return void */ @@ -530,7 +535,7 @@ class ActionComm extends CommonObject /** * Return label of status - * + * * @param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @param hidenastatus 1=Show nothing if status is "Not applicable" * @return string String with status @@ -665,8 +670,8 @@ class ActionComm extends CommonObject { global $conf,$langs,$dolibarr_main_url_root,$mysoc; - require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php"); - require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php"); + require_once (DOL_DOCUMENT_ROOT ."/core/lib/xcal.lib.php"); + require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php"); dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG); @@ -695,7 +700,7 @@ class ActionComm extends CommonObject if ($cachedelay) { $nowgmt = dol_now(); - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) { dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled"); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 96185f80627..542aac2679a 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -26,11 +26,11 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); @@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="name"; */ if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Creation repertoire si n'existe pas $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index ca45390ea42..c6f8bdc8c6f 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -26,14 +26,14 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formactions.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("companies"); $langs->load("commercial"); @@ -48,7 +48,6 @@ $action=GETPOST("action"); $socid = GETPOST('socid'); $id = GETPOST('id'); if ($user->societe_id) $socid=$user->societe_id; -// TODO: revoir les droits car pas clair //$result = restrictedArea($user, 'agenda', $id, 'actioncomm', 'actions', '', 'id'); if (isset($_GET["error"])) $error=$_GET["error"]; @@ -587,7 +586,7 @@ if ($action == 'create') // Description print ''.$langs->trans("Description").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',($_POST["note"]?$_POST["note"]:$actioncomm->note),'',280,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90); $doleditor->Create(); print ''; @@ -801,7 +800,7 @@ if ($id) // Description print ''.$langs->trans("Description").''; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$act->note,'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_5,90); $doleditor->Create(); print ''; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 700c5569916..31a6d112c45 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -29,9 +29,9 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $filter=GETPOST("filter"); $filtera = GETPOST("userasked","int")?GETPOST("userasked","int"):GETPOST("filtera","int"); @@ -69,6 +69,7 @@ $year=GETPOST("year","int")?GETPOST("year","int"):date("Y"); $month=GETPOST("month","int")?GETPOST("month","int"):date("m"); $week=GETPOST("week","int")?GETPOST("week","int"):date("W"); $day=GETPOST("day","int")?GETPOST("day","int"):0; +$actioncode=GETPOST("actioncode"); $pid=GETPOST("projectid","int")?GETPOST("projectid","int"):0; $status=GETPOST("status"); $maxprint=GETPOST("maxprint"); @@ -198,6 +199,7 @@ if ($filterd) $param.="&filterd=".$filterd; if ($socid) $param.="&socid=".$socid; if ($showbirthday) $param.="&showbirthday=1"; if ($pid) $param.="&projectid=".$pid; +if ($actioncode) $param.="&actioncode=".$actioncode; if (GETPOST("type")) $param.="&type=".GETPOST("type"); if ($action == 'show_day' || $action == 'show_week') $param.='&action='.$action; if ($maxprint) $param.="&maxprint=on"; @@ -281,6 +283,7 @@ $sql.= ' AND a.fk_user_author = u.rowid'; $sql.= ' AND u.entity in (0,'.$conf->entity.')'; // To limit to entity $sql.= ' AND a.entity = '.$conf->entity; if ($user->societe_id) $sql.= ' AND a.fk_soc = '.$user->societe_id; // To limit to external user company +if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'"; if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid); if ($action == 'show_day') { diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 8024fa74495..fe2781fcdf5 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -23,8 +23,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 54aed0cbd15..97ac30ea22b 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -27,9 +27,9 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("companies"); $langs->load("agenda"); @@ -39,6 +39,7 @@ $action=GETPOST('action','alpha'); $year=GETPOST("year",'int'); $month=GETPOST("month",'int'); $day=GETPOST("day",'int'); +$actioncode=GETPOST('actioncode'); $pid=GETPOST("projectid",'int'); $status=GETPOST("status",'alpha'); @@ -144,6 +145,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ud ON a.fk_user_done = ud.rowid"; $sql.= " WHERE c.id = a.fk_action"; $sql.= ' AND a.fk_user_author = u.rowid'; $sql.= ' AND a.entity = '.$conf->entity; // To limit to entity +if ($actioncode) $sql.=" AND c.code='".$db->escape($actioncode)."'"; if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid); if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 840442f99b4..25d0403f3c4 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -25,10 +25,10 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/action/rapport.pdf.php"); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 8e7526410f9..2cecb224515 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -27,11 +27,11 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'); if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); - require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); } $langs->load("propal"); @@ -82,9 +82,9 @@ if ($_GET["action"] == 'create') $obj = $conf->global->PROPALE_ADDON; if ($obj) { - if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) + if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); $modPropale = new $obj; $numpr = $modPropale->getNextValue($soc,$propal); } diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 0ef8b32d49b..f3a04d23eb2 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php"); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 67396ee432e..40314836c4b 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -28,8 +28,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 1d8320fcfe3..234ffddbfcd 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/client.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 72505c0c145..8b4516bfd63 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -25,9 +25,9 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); $langs->load("mails"); @@ -36,7 +36,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden(); -$dirmod=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; +$dirmod=DOL_DOCUMENT_ROOT."/core/modules/mailings"; $mesg = ''; @@ -69,7 +69,7 @@ if ($_GET["action"] == 'add') $var=true; foreach ($conf->file->dol_document_root as $dirmod) { - $dir=$dirmod."/includes/modules/mailings/"; + $dir=$dirmod."/core/modules/mailings/"; if (is_dir($dir)) { @@ -229,7 +229,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $var=true; foreach ($conf->file->dol_document_root as $dirroot) { - $dir=$dirroot."/includes/modules/mailings/"; + $dir=$dirroot."/core/modules/mailings/"; if (is_dir($dir)) { diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 777729e97a2..6fbade0ac8c 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -23,10 +23,10 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); @@ -450,7 +450,7 @@ if (! empty($_POST["removedfileid"])) // Action update emailing if ($_POST["action"] == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $mil = new Mailing($db); $mil->fetch($_POST["id"]); @@ -633,7 +633,7 @@ if ($_GET["action"] == 'create') print ''; print ''; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('body',$_POST['body'],'',320,'dolibarr_mailings','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING,20,70); $doleditor->Create(); print ''; @@ -1045,7 +1045,7 @@ else print ''; print ''; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('body',$mil->body,'',320,'dolibarr_mailings','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING,20,70); $doleditor->Create(); print ''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 04dd40a3bb4..ba9c9371213 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); $langs->load("commercial"); $langs->load("orders"); @@ -67,7 +67,7 @@ print "
\n"; print ''; print ''; -$dir=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; +$dir=DOL_DOCUMENT_ROOT."/core/modules/mailings"; $handle=opendir($dir); $var=True; diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 5efbd584853..632120ac5ec 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -24,8 +24,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); $langs->load("mails"); diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index a42babb571e..3d9ed3de3b6 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); $langs->load("orders"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 11d66010363..f202b1ce7d7 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -30,12 +30,12 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.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."/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); $langs->load('companies'); @@ -399,7 +399,7 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer) */ if ($_POST['addfile']) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -416,7 +416,7 @@ if ($_POST['addfile']) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -501,7 +501,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] $mimetype = $attachedfiles['mimes']; // Envoi de la propal - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index a7556454a3c..dd64f66e865 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -26,8 +26,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); $langs->load('propal'); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 4731f0343da..e553641f54c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -209,7 +209,7 @@ class Propal extends CommonObject { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); @@ -306,7 +306,7 @@ class Propal extends CommonObject global $conf; dol_syslog("Propal::Addline propalid=$propalid, 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.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -453,7 +453,7 @@ class Propal extends CommonObject global $conf,$user,$langs; dol_syslog("Propal::UpdateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters $remise_percent=price2num($remise_percent); @@ -885,7 +885,7 @@ class Propal extends CommonObject $objsoc->fetch($object->socid); - if (empty($conf->global->PROPALE_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) + if (empty($conf->global->PROPALE_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { $this->error='ErrorSetupNotComplete'; return -1; @@ -900,7 +900,7 @@ class Propal extends CommonObject $object->ref_client = ''; // Set ref - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); $obj = $conf->global->PROPALE_ADDON; $modPropale = new $obj; $object->ref = $modPropale->getNextValue($objsoc,$object); @@ -1734,7 +1734,7 @@ class Propal extends CommonObject function delete($user, $notrigger=0) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -2275,7 +2275,7 @@ class Propal extends CommonObject global $conf, $db, $langs; $langs->load("propal"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/propale/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/propale/"; if (! empty($conf->global->PROPALE_ADDON)) { diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index e4dfe3299a7..9ba449fee5c 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("facture"); diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 3a3d41b2fcb..05860909553 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -26,8 +26,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('compta'); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index 25b24a0764c..4758df0f0b7 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -24,9 +24,9 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 3277f9cb812..18fb187033d 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 47463460abe..3e99e1addef 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -24,7 +24,7 @@ */ require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 278e25a20c7..b93c0706b4a 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); $langs->load("propal"); diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 57fb8e5e338..32347362e09 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index 270499378f4..9ef8ffceb89 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 2722ae7b426..abfb5005972 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index e6b79bc44bc..977f9000ff2 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/discount.class.php"); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 348e0000ba7..991718fe291 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -25,8 +25,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ba39d848325..e40ef308228 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -126,7 +126,7 @@ class Commande extends CommonObject global $db, $langs, $conf; $langs->load("order"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/commande"; if (! empty($conf->global->COMMANDE_ADDON)) { @@ -174,7 +174,7 @@ class Commande extends CommonObject function valid($user) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -975,7 +975,7 @@ class Commande extends CommonObject { dol_syslog("Commande::addline commandeid=$commandeid, 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", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -1320,7 +1320,7 @@ class Commande extends CommonObject { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); @@ -2173,7 +2173,7 @@ class Commande extends CommonObject global $conf; dol_syslog("CustomerOrder::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); if ($this->brouillon) { @@ -2290,7 +2290,7 @@ class Commande extends CommonObject function delete($user) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $err = 0; diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 0502fea62a4..ebfb90552e7 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("orders"); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index bc5feec9fc7..5c2e43f0431 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -25,8 +25,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index deb3b0fd568..9330ece6129 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -30,13 +30,13 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); if (!$user->rights->commande->lire) accessforbidden(); @@ -852,7 +852,7 @@ if ($action == 'builddoc') // In get or post { /* * Generate order document - * define into /includes/modules/commande/modules_commande.php + * define into /core/modules/commande/modules_commande.php */ // Sauvegarde le dernier modele choisi pour generer un document @@ -892,7 +892,7 @@ if ($action == 'remove_file') { if ($object->fetch($id)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $upload_dir = $conf->commande->dir_output; $file = $upload_dir . '/' . $_GET['file']; @@ -906,7 +906,7 @@ if ($action == 'remove_file') */ if ($_POST['addfile']) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -922,7 +922,7 @@ if ($_POST['addfile']) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -1006,7 +1006,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -1285,7 +1285,7 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; print '"; diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index cc09dbeac21..cad4ee3e70c 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -23,9 +23,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 343b5d38e2b..dfd1be92018 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 2d56d33b3d8..e0bf60b204a 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -27,7 +27,7 @@ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/compta/bank/admin/bank.php index 4d1608b7bd2..0802a931d70 100644 --- a/htdocs/compta/bank/admin/bank.php +++ b/htdocs/compta/bank/admin/bank.php @@ -24,7 +24,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); $langs->load("admin"); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 154760a139c..77f188eb5c7 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Security check diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5c27ce120bd..346887d312d 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -25,8 +25,8 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $langs->load("banks"); $langs->load("bills"); diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 40362bb5f70..602da307cc0 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -354,7 +354,7 @@ class Account extends CommonObject } // Chargement librairie pour acces fonction controle RIB - require_once DOL_DOCUMENT_ROOT.'/lib/bank.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; $now=dol_now(); @@ -510,7 +510,7 @@ class Account extends CommonObject global $conf,$langs; // Chargement librairie pour acces fonction controle RIB - require_once(DOL_DOCUMENT_ROOT.'/lib/bank.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'); dol_syslog("Account::update_bban $this->code_banque,$this->code_guichet,$this->number,$this->cle_rib,$this->iban"); @@ -915,7 +915,7 @@ class Account extends CommonObject */ function verif() { - require_once DOL_DOCUMENT_ROOT . '/lib/bank.lib.php'; + require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php'; // Call function to check BAN if (! checkBanForAccount($this)) diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index ad4072918c5..888f9c584b0 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -25,8 +25,8 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); $langs->load("banks"); @@ -301,7 +301,7 @@ if ($action == 'create') print ''; print ''; @@ -589,7 +589,7 @@ else print ''; print ''; diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index df4e557f6fa..df4f4f951c9 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 4c04e7ecc7b..08aaad1c78d 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index 94dfa43d8ad..4e01b6fcee0 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -22,7 +22,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index fb8f2d98e69..301362dda1e 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 1affb418c16..0db2c4ec816 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); $langs->load("companies"); $langs->load("banks"); diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 0031fb2dae2..528111982e0 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/bankcateg.class.php"); diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 103b8bde928..6a6a1580f64 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 4ec9e206e2a..8c6fc905e30 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); $langs->load("banks"); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 2c358e51edc..dd2f719f360 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("compta"); diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 1060a853a9f..eb5551e2a82 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -44,7 +44,8 @@ class Deplacement extends CommonObject var $fk_user_author; var $fk_user; var $km; - var $note; + var $note; // TODO obsolete + var $note_private; var $note_public; var $socid; var $statut; // 0=draft, 1=validated @@ -55,7 +56,7 @@ class Deplacement extends CommonObject * * @param DoliDB $db Database handler */ - function Deplacement($db) + function __construct($db) { $this->db = $db; @@ -106,13 +107,13 @@ class Deplacement extends CommonObject $sql.= ", ".$user->id; $sql.= ", ".$this->fk_user; $sql.= ", '".$this->type."'"; - $sql.= ", ".($this->note?"'".$this->db->escape($this->note)."'":"null"); + $sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); $sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null"); $sql.= ", ".($this->fk_project > 0? $this->fk_project : 0); $sql.= ", ".($this->fk_soc > 0? $this->fk_soc : "null"); $sql.= ")"; - dol_syslog("Deplacement::create sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG); $result = $this->db->query($sql); if ($result) { @@ -125,6 +126,7 @@ class Deplacement extends CommonObject } else { + $this->error=$this->db->error(); $this->db->rollback(); return $result; } @@ -178,12 +180,12 @@ class Deplacement extends CommonObject $sql .= " , fk_user = ".$this->fk_user; $sql .= " , fk_user_modif = ".$user->id; $sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null'); - $sql .= " , note = ".($this->note?"'".$this->db->escape($this->note)."'":"null"); + $sql .= " , note = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); $sql .= " , note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null"); $sql .= " , fk_projet = ".($this->fk_project>0?$this->fk_project:0); $sql .= " WHERE rowid = ".$this->id; - dol_syslog("Deplacement::update sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG); $result = $this->db->query($sql); if ($result) { @@ -192,8 +194,8 @@ class Deplacement extends CommonObject } else { - $this->db->rollback(); $this->error=$this->db->lasterror(); + $this->db->rollback(); return -1; } } @@ -210,23 +212,23 @@ class Deplacement extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."deplacement"; $sql.= " WHERE rowid = ".$id; - dol_syslog("Deplacement::fetch sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG); $result = $this->db->query($sql); if ( $result ) { $obj = $this->db->fetch_object($result); - $this->id = $obj->rowid; - $this->ref = $obj->rowid; - $this->date = $this->db->jdate($obj->dated); - $this->fk_user = $obj->fk_user; - $this->socid = $obj->fk_soc; - $this->km = $obj->km; - $this->type = $obj->type; - $this->fk_statut = $obj->fk_statut; - $this->note = $obj->note; - $this->note_public = $obj->note_public; - $this->fk_project = $obj->fk_projet; + $this->id = $obj->rowid; + $this->ref = $obj->rowid; + $this->date = $this->db->jdate($obj->dated); + $this->fk_user = $obj->fk_user; + $this->socid = $obj->fk_soc; + $this->km = $obj->km; + $this->type = $obj->type; + $this->fk_statut = $obj->fk_statut; + $this->note_private = $obj->note; + $this->note_public = $obj->note_public; + $this->fk_project = $obj->fk_projet; return 1; } @@ -245,17 +247,21 @@ class Deplacement extends CommonObject */ function delete($id) { + $this->db->begin(); + $sql = "DELETE FROM ".MAIN_DB_PREFIX."deplacement WHERE rowid = ".$id; - dol_syslog("Deplacement::delete sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG); $result = $this->db->query($sql); if ($result) { + $this->db->commit(); return 1; } else { $this->error=$this->db->error(); + $this->db->rollback(); return -1; } } diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index ce36b404709..791584581c3 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -23,11 +23,12 @@ */ require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); } @@ -35,21 +36,23 @@ $langs->load("trips"); // Security check -$id=isset($_GET["id"])?$_GET["id"]:$_POST["id"]; +$id = GETPOST('id'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement', $id,''); +$action = GETPOST('action'); +$confirm = GETPOST('confirm'); + $mesg = ''; - +$object = new Deplacement($db); /* * Actions */ -if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->deplacement->supprimer) +if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) { - $deplacement = new Deplacement($db); - $result=$deplacement->delete($_GET["id"]); + $result=$object->delete($id); if ($result >= 0) { Header("Location: index.php"); @@ -57,41 +60,35 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user- } else { - $mesg=$deplacement->error; + $mesg=$object->error; } } -if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) +if ($action == 'add' && $user->rights->deplacement->creer) { if (! $_POST["cancel"]) { $error=0; - $dated=dol_mktime(12, 0, 0, - $_POST["remonth"], - $_POST["reday"], - $_POST["reyear"]); + $object->date = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $object->km = $_POST["km"]; + $object->type = $_POST["type"]; + $object->socid = $_POST["socid"]; + $object->fk_user = $_POST["fk_user"]; + $object->note_private = $_POST["note_private"]; + $object->note_public = $_POST["note_public"]; - $deplacement = new Deplacement($db); - $deplacement->date = $dated; - $deplacement->km = $_POST["km"]; - $deplacement->type = $_POST["type"]; - $deplacement->socid = $_POST["socid"]; - $deplacement->fk_user = $_POST["fk_user"]; - $deplacement->note = $_POST["note"]; - $deplacement->note_public = $_POST["note_public"]; - - if (! $deplacement->date) + if (! $object->date) { $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")); $error++; } - if ($deplacement->type == '-1') // Otherwise it is TF_LUNCH,... + if ($object->type == '-1') // Otherwise it is TF_LUNCH,... { $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
'; $error++; } - if (! ($deplacement->fk_user > 0)) + if (! ($object->fk_user > 0)) { $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")).'
'; $error++; @@ -99,22 +96,22 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) if (! $error) { - $id = $deplacement->create($user); + $id = $object->create($user); if ($id > 0) { - Header("Location: fiche.php?id=".$id); + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); exit; } else { - $mesg=$deplacement->error; - $_GET["action"]='create'; + $mesg=$object->error; + $action='create'; } } else { - $_GET["action"]='create'; + $action='create'; } } else @@ -124,45 +121,44 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) } } -if ($_POST["action"] == 'update' && $user->rights->deplacement->creer) +if ($action == 'update' && $user->rights->deplacement->creer) { if (empty($_POST["cancel"])) { - $deplacement = new Deplacement($db); - $result = $deplacement->fetch($_POST["id"]); + $result = $object->fetch($id); - $deplacement->date = dol_mktime(12, 0 , 0, - $_POST["remonth"], - $_POST["reday"], - $_POST["reyear"]); - $deplacement->km = $_POST["km"]; - $deplacement->type = $_POST["type"]; - $deplacement->fk_user = $_POST["fk_user"]; - $deplacement->socid = $_POST["socid"]; - $result = $deplacement->update($user); + $object->date = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $object->km = $_POST["km"]; + $object->type = $_POST["type"]; + $object->fk_user = $_POST["fk_user"]; + $object->socid = $_POST["socid"]; + $object->note_private = $_POST["note_private"]; + $object->note_public = $_POST["note_public"]; + + $result = $object->update($user); if ($result > 0) { - Header("Location: fiche.php?id=".$_POST["id"]); + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); exit; } else { - $mesg=$deplacement->error; + $mesg=$object->error; } } else { - Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST["id"]); + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); exit; } } // Set into a project -if ($_POST['action'] == 'classin') +if ($action == 'classin') { $trip = new Deplacement($db); - $trip->fetch($_GET['id']); + $trip->fetch($id); $result=$trip->setProject($_POST['projectid']); if ($result < 0) dol_print_error($db,$trip->error); } @@ -180,18 +176,15 @@ $html = new Form($db); /* * Action create */ -if ($_GET["action"] == 'create') +if ($action == 'create') { print_fiche_titre($langs->trans("NewTrip")); dol_htmloutput_errors($mesg); - $datec = dol_mktime(12, 0, 0, - $_POST["remonth"], - $_POST["reday"], - $_POST["reyear"]); + $datec = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); - print "
\n"; + print '' . "\n"; print ''; print ''; @@ -199,12 +192,12 @@ if ($_GET["action"] == 'create') print ""; print ''; print ""; print ''; print ""; @@ -213,12 +206,12 @@ if ($_GET["action"] == 'create') print ''; // Km - print ''; + print ''; // Company print ""; print ''; // Public note @@ -238,10 +231,10 @@ if ($_GET["action"] == 'create') print ''; print ''; print ''; } @@ -253,209 +246,227 @@ if ($_GET["action"] == 'create') print ''; } -else +else if ($id) { - if ($id) + $result = $object->fetch($id); + if ($result > 0) { - $deplacement = new Deplacement($db); - $result = $deplacement->fetch($id); - if ($result > 0) + dol_htmloutput_mesg($mesg); + + $head = trip_prepare_head($object); + + dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip'); + + if ($action == 'edit') { - if ($mesg) print $mesg."
"; - - $h=0; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/fiche.php?id=$deplacement->id"; - $head[$h][1] = $langs->trans("Card"); - $head[$h][2] = 'card'; - $h++; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/note.php?id=$deplacement->id"; - $head[$h][1] = $langs->trans("Note"); - $head[$h][2] = 'note'; - $h++; - - dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip'); - - if ($_GET["action"] == 'edit') + $soc = new Societe($db); + if ($object->socid) { - $soc = new Societe($db); - if ($deplacement->socid) - { - $soc->fetch($deplacement->socid); - } - - print "\n"; - print ''; - print ''; - print ''; - - print '
'.$langs->trans("TargetsStatistics").'
'.$langs->trans('Model').''; // pdf - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); $liste=ModelePDFCommandes::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF); print "
'.$langs->trans("Comment").''; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70); $doleditor->Create(); print '
'.$langs->trans("Comment").''; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70); $doleditor->Create(); print '
'.$langs->trans("Type").''; - print $html->select_type_fees($_POST["type"]?$_POST["type"]:$_GET["type"],'type',1); + print $html->select_type_fees(GETPOST("type"),'type',1); print '
'.$langs->trans("Person").''; - print $html->select_users($_POST["fk_user"]?$_POST["fk_user"]:$_GET["fk_user"],'fk_user',1); + print $html->select_users(GETPOST("fk_user"),'fk_user',1); print '
'.$langs->trans("FeesKilometersOrAmout").'
'.$langs->trans("FeesKilometersOrAmout").'
'.$langs->trans("CompanyVisited").''; - print $html->select_societes($_POST["socid"]?$_POST["socid"]:$_GET["socid"],'socid','',1); + print $html->select_societes(GETPOST("socid"),'socid','',1); print '
'.$langs->trans('NotePrivate').''; - print '
'; - - // Ref - print ""; - print ''; - - // Type - print ""; - print ''; - - // Who - print ""; - print ''; - - // Date - print ''; - - // Km - print ''; - - // Where - print ""; - print ''; - - print '
'.$langs->trans("Ref").''; - print $deplacement->ref; - print '
'.$langs->trans("Type").''; - print $html->select_type_fees($_POST["type"]?$_POST["type"]:$deplacement->type,'type',0); - print '
'.$langs->trans("Person").''; - print $html->select_users($_POST["fk_user"]?$_POST["fk_user"]:$deplacement->fk_user,'fk_user',0); - print '
'.$langs->trans("Date").''; - print $html->select_date($deplacement->date,'','','','','update'); - print '
'.$langs->trans("FeesKilometersOrAmout").'
'.$langs->trans("CompanyVisited").''; - print $html->select_societes($soc->id,'socid','',1); - print '
'; - - print '
  '; - print ''; - print '
'; - - print ''; - - print ''; - } - else - { - /* - * Confirmation de la suppression du deplacement - */ - if ($_GET["action"] == 'delete') - { - $ret=$html->form_confirm("fiche.php?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete"); - if ($ret == 'html') print '
'; - } - - $soc = new Societe($db); - if ($deplacement->socid) $soc->fetch($deplacement->socid); - - print ''; - - // Ref - print ""; - print ''; - - // Type - print ''; - - // Who - print ''; - - // Date - print ''; - - // Km/Price - print ''; - - // Where - print ''; - print ''; - - // Project - if ($conf->projet->enabled) - { - $langs->load('projects'); - print ''; - print ''; - print ''; - } - - // Statut - print ''; - - print "
'.$langs->trans("Ref").''; - print $html->showrefnav($deplacement,'id','',1,'rowid','ref',''); - print '
'.$langs->trans("Type").''.$langs->trans($deplacement->type).'
'.$langs->trans("Person").''; - $userfee=new User($db); - $userfee->fetch($deplacement->fk_user); - print $userfee->getNomUrl(1); - print '
'.$langs->trans("Date").''; - print dol_print_date($deplacement->date,'day'); - print '
'.$langs->trans("FeesKilometersOrAmout").''.$deplacement->km.'
'.$langs->trans("CompanyVisited").''; - if ($soc->id) print $soc->getNomUrl(1); - print '
'; - - print ''; - if ($_GET['action'] != 'classify') - { - print ''; - } - print '
'; - print $langs->trans('Project'); - print 'id.'">'; - print img_edit($langs->trans('SetProject'),1); - print '
'; - print '		'; - if ($_GET['action'] == 'classify') - { - $html->form_project($_SERVER['PHP_SELF'].'?id='.$deplacement->id, $deplacement->socid, $deplacement->fk_project,'projectid'); - } - else - { - $html->form_project($_SERVER['PHP_SELF'].'?id='.$deplacement->id, $deplacement->socid, $deplacement->fk_project,'none'); - } - print '
'.$langs->trans("Status").''.$deplacement->getLibStatut(4).'
"; - - print ''; + $soc->fetch($object->socid); } + print '
' . "\n"; + print ''; + print ''; + print ''; + + print ''; + + // Ref + print ""; + print ''; + + // Type + print ""; + print ''; + + // Who + print ""; + print ''; + + // Date + print ''; + + // Km + print ''; + + // Where + print ""; + print ''; + + // Public note + print ''; + print '"; + + // Private note + if (! $user->societe_id) + { + print ''; + print '"; + } + + print '
'.$langs->trans("Ref").''; + print $object->ref; + print '
'.$langs->trans("Type").''; + print $html->select_type_fees($_POST["type"]?$_POST["type"]:$object->type,'type',0); + print '
'.$langs->trans("Person").''; + print $html->select_users($_POST["fk_user"]?$_POST["fk_user"]:$object->fk_user,'fk_user',0); + print '
'.$langs->trans("Date").''; + print $html->select_date($object->date,'','','','','update'); + print '
'.$langs->trans("FeesKilometersOrAmout").''; + print ''; + print '
'.$langs->trans("CompanyVisited").''; + print $html->select_societes($soc->id,'socid','',1); + print '
'.$langs->trans("NotePublic").''; + print '
"; + print "
'.$langs->trans("NotePrivate").''; + print '
"; + print "
'; + + print '
  '; + print ''; + print '
'; + + print '
'; + + print ''; } else { - dol_print_error($db); + /* + * Confirmation de la suppression du deplacement + */ + if ($action == 'delete') + { + $ret=$html->form_confirm("fiche.php?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete"); + if ($ret == 'html') print '
'; + } + + $soc = new Societe($db); + if ($object->socid) $soc->fetch($object->socid); + + if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxeditinplace.tpl.php'); + + print ''; + + // Ref + print ""; + print ''; + + // Type + print ''; + + // Who + print ''; + + // Date + print ''; + + // Km/Price + print ''; + + // Where + print ''; + print ''; + + // Project + if ($conf->projet->enabled) + { + $langs->load('projects'); + print ''; + print ''; + print ''; + } + + // Statut + print ''; + + // Public note + print ''; + print '"; + + // Private note + if (! $user->societe_id) + { + print ''; + print '"; + } + + print "
'.$langs->trans("Ref").''; + print $html->showrefnav($object,'id','',1,'rowid','ref',''); + print '
'.$langs->trans("Type").''.$langs->trans($object->type).'
'.$langs->trans("Person").''; + $userfee=new User($db); + $userfee->fetch($object->fk_user); + print $userfee->getNomUrl(1); + print '
'.$langs->trans("Date").''; + print dol_print_date($object->date,'day'); + print '
'.$langs->trans("FeesKilometersOrAmout").''.$object->km.'
'.$langs->trans("CompanyVisited").''; + if ($soc->id) print $soc->getNomUrl(1); + print '
'; + + print ''; + if ($action != 'classify') + { + print ''; + } + print '
'; + print $langs->trans('Project'); + print 'id.'">'; + print img_edit($langs->trans('SetProject'),1); + print '
'; + print '		'; + if ($action == 'classify') + { + $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid'); + } + else + { + $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none'); + } + print '
'.$langs->trans("Status").''.$object->getLibStatut(4).'
'.$langs->trans("NotePublic").''; + print '
'; + print ($object->note_public ? dol_nl2br($object->note_public) : " "); + print '
'; + print "
'.$langs->trans("NotePrivate").''; + print '
'; + print ($object->note_private ? dol_nl2br($object->note_private) : " "); + print '
'; + print "
"; + + print ''; + + /* + * Barre d'actions + */ + + print '
'; + + if ($user->rights->deplacement->creer) + { + print ''.$langs->trans('Modify').''; + } + else + { + print ''.$langs->trans('Modify').''; + } + if ($user->rights->deplacement->supprimer) + { + print ''.$langs->trans('Delete').''; + } + else + { + print ''.$langs->trans('Delete').''; + } + + print '
'; } } -} - - -/* - * Barre d'actions - * - */ - -print '
'; - -if ($_GET["action"] != 'create' && $_GET["action"] != 'edit') -{ - if ($user->rights->deplacement->creer) - { - print ''.$langs->trans('Modify').''; - } else { - print ''.$langs->trans('Modify').''; - } - if ($user->rights->deplacement->supprimer) - { - print ''.$langs->trans('Delete').''; - } - else - { - print ''.$langs->trans('Delete').''; + dol_print_error($db); } } -print '
'; - $db->close(); llxFooter(); diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 46220223823..995ae8966c4 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -32,7 +32,7 @@ $langs->load("users"); $langs->load("trips"); // Security check -$socid = $_GET["socid"]?$_GET["socid"]:''; +$socid = GETPOST('socid'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement','',''); diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php new file mode 100644 index 00000000000..7dee9417339 --- /dev/null +++ b/htdocs/compta/deplacement/info.php @@ -0,0 +1,64 @@ + + * Copyright (C) 2004-2005 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 + * the Free Software Foundation; either version 2 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 . + */ + +/** + * \file htdocs/compta/deplacement/info.php + * \ingroup trip + * \brief Page to show a trip information + */ + +require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); + +$langs->load("trips"); + +// Security check +$id = GETPOST('id'); +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'deplacement', $id, ''); + + +/* + * View + */ + +llxHeader(); + +if ($id) +{ + $object = new Deplacement($db); + $object->fetch($id); + $object->info($id); + + $head = trip_prepare_head($object); + + dol_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip'); + + print '
'; + dol_print_object_info($object); + print '
'; + + print ''; +} + +$db->close(); + +llxFooter(); +?> diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 8ac93658241..5a74877adc3 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -32,7 +32,7 @@ $langs->load("users"); $langs->load("trips"); // Security check -$socid = $_GET["socid"]?$_GET["socid"]:''; +$socid = GETPOST('socid'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement','',''); diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php deleted file mode 100644 index 2ef51313192..00000000000 --- a/htdocs/compta/deplacement/note.php +++ /dev/null @@ -1,209 +0,0 @@ - - * Copyright (C) 2004-2011 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 - * the Free Software Foundation; either version 2 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 . - */ - -/** - * \file htdocs/compta/deplacement/note.php - * \ingroup trip - * \brief Notes on a trip card - */ - -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); - -$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; - -if (!$user->rights->deplacement->lire) - accessforbidden(); - -$langs->load("companies"); -$langs->load("bills"); -$langs->load("trips"); - -// Securiy check -if ($user->societe_id > 0) -{ - unset($_GET["action"]); - $socid = $user->societe_id; -} - - -$trip = new Deplacement($db); - - -/******************************************************************************/ -/* Actions */ -/******************************************************************************/ - -if ($_POST["action"] == 'update_public' && $user->rights->deplacement->creer) -{ - $db->begin(); - - $trip->fetch($_GET["id"]); - - $res=$trip->update_note_public($_POST["note_public"],$user); - if ($res < 0) - { - $mesg='
'.$fac->error.'
'; - $db->rollback(); - } - else - { - $db->commit(); - } -} - -if ($_POST["action"] == 'update' && $user->rights->deplacement->creer) -{ - $db->begin(); - - $trip->fetch($_GET["id"]); - - $res=$trip->update_note($_POST["note"],$user); - if ($res < 0) - { - $mesg='
'.$fac->error.'
'; - $db->rollback(); - } - else - { - $db->commit(); - } -} - - - -/******************************************************************************/ -/* Affichage fiche */ -/******************************************************************************/ - -llxHeader(); - -$html = new Form($db); - -$id = $_GET['id']; -$ref= $_GET['ref']; -if ($id > 0 || ! empty($ref)) -{ - $trip = new Deplacement($db); - $trip->fetch($id,$ref); - - $soc = new Societe($db); - $soc->fetch($trip->socid); - - $h=0; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/fiche.php?id=$trip->id"; - $head[$h][1] = $langs->trans("Card"); - $head[$h][2] = 'card'; - $h++; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/note.php?id=$trip->id"; - $head[$h][1] = $langs->trans("Note"); - $head[$h][2] = 'note'; - $h++; - - dol_fiche_head($head, 'note', $langs->trans("TripCard"), 0, 'trip'); - - - print ''; - - // Ref - print ''; - print ''; - - // Type - print ''; - - // Who - print ""; - print ''; - - print ''; - print ''; - - // Note publique - print ''; - print '"; - - // Note privee - if (! $user->societe_id) - { - print ''; - print '"; - } - - print "
'.$langs->trans('Ref').''; - $morehtmlref=''; - print $html->showrefnav($trip,'ref','',1,'ref','ref',$morehtmlref); - print '
'.$langs->trans("Type").''.$langs->trans($trip->type).'
'.$langs->trans("Person").''; - $userfee=new User($db); - $userfee->fetch($trip->fk_user); - print $userfee->getNomUrl(1); - print '
'.$langs->trans("CompanyVisited").''; - if ($soc->id) print $soc->getNomUrl(1); - print '
'.$langs->trans("NotePublic").''; - if ($_GET["action"] == 'edit') - { - print '
'; - print ''; - print ''; - print '
"; - print ''; - print '
'; - } - else - { - print ($trip->note_public?nl2br($trip->note_public):" "); - } - print "
'.$langs->trans("NotePrivate").''; - if ($_GET["action"] == 'edit') - { - print '
'; - print ''; - print ''; - print '
"; - print ''; - print '
'; - } - else - { - print ($trip->note?nl2br($trip->note):" "); - } - print "
"; - - - /* - * Actions - */ - print ''; - print '
'; - - if ($user->rights->deplacement->creer && $_GET["action"] <> 'edit') - { - print "id&action=edit\">".$langs->trans('Modify').""; - } - - print "
"; - - -} - -$db->close(); - -llxFooter(); -?> diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 750cd936988..0051d74f56a 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -23,12 +23,12 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); $langs->load("companies"); $langs->load("donations"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 369fe03290f..b780aef1713 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -30,15 +30,15 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); $langs->load('bills'); //print 'ee'.$langs->trans('BillsCustomer');exit; @@ -223,7 +223,7 @@ if ($action == 'valid') if ($action == 'set_thirdparty') { - $object->updateObjectField('facture',$id,'fk_soc',$socid); + $object->setValueFrom('facture',$id,'fk_soc',$socid); Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); exit; @@ -1177,7 +1177,7 @@ if ($action == 'down' && $user->rights->facture->creer) */ if ($_POST['addfile']) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -1193,7 +1193,7 @@ if ($_POST['addfile']) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -1292,7 +1292,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1); if ($mailfile->error) { @@ -1722,7 +1722,7 @@ if ($action == 'create') // Modele PDF print ''.$langs->trans('Model').''; print ''; - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); $liste=ModelePDFFactures::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF); print ""; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 1a33f00cde2..cac85592238 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -27,8 +27,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index f9baebbe540..0ac3b4da79b 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -409,7 +409,7 @@ class FactureRec extends Facture function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0) { dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Check parameters if ($type < 0) return -1; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index aa1f4b48816..78591487591 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1044,7 +1044,7 @@ class Facture extends CommonObject { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); @@ -1488,7 +1488,7 @@ class Facture extends CommonObject function validate($user, $force_number='') { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -1790,7 +1790,7 @@ class Facture extends CommonObject function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0) { dol_syslog("Facture::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -1947,7 +1947,7 @@ class Facture extends CommonObject */ function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0) { - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); dol_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type", LOG_DEBUG); @@ -2557,7 +2557,7 @@ class Facture extends CommonObject // Include file with class foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot."/includes/modules/facture/"; + $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) $mybool|=@include_once($dir.$file); } @@ -2570,7 +2570,7 @@ class Facture extends CommonObject // Include file with class foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot."/includes/modules/facture/"; + $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) $mybool|=@include_once($dir.$file); } diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index c4fc13c00a5..4335d21855f 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -25,7 +25,7 @@ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; include_once DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php"; -include_once DOL_DOCUMENT_ROOT . "/lib/date.lib.php"; +include_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php"; /** * \class FactureStats diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 2aae1a917c2..f826d454858 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("bills"); diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index a2df7ced07e..14a47995a1b 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -27,8 +27,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/invoice.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('propal'); diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 9b49f27c7e1..8bfa5d75072 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -28,8 +28,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); $langs->load("bills"); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 5f04fda1944..4bcf7acea5c 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -25,8 +25,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); $langs->load("bills"); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 6fbb1b18049..90b338b8ce6 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index a67ecd2bbc9..a6b603d6d7b 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -25,7 +25,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 66964796dae..f48dda6de05 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -23,8 +23,8 @@ * \brief Page with purchases journal */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 1ead0d71a72..6d42ecbe133 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -23,8 +23,8 @@ * \brief Page with sells journal */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index e7890ec980a..dfe19ad5988 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -479,7 +479,7 @@ class RemiseCheque extends CommonObject dol_syslog("RemiseCheque::generatePdf model=".$model." id=".$this->id, LOG_DEBUG); - $dir=DOL_DOCUMENT_ROOT ."/includes/modules/cheque/pdf/"; + $dir=DOL_DOCUMENT_ROOT ."/core/modules/cheque/pdf/"; // Charge le modele $file = "pdf_".$model.".class.php"; diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index ae1223a1e01..b0b9dc690df 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index c32f9c3c107..609785976bd 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index cb72c923efb..5a939f37365 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -23,8 +23,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/rapport/pdf_paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Security check if (! $user->rights->facture->lire) diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index d69efe561ab..577fe00342b 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -29,7 +29,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); $langs->load('bills'); diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index f23b09fdfb2..8266381265a 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -24,8 +24,8 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"; $langs->load("bills"); diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php index 90dd3bf8016..46cfd1791d0 100644 --- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php +++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php @@ -218,7 +218,7 @@ class RejetPrelevement $soc = new Societe($this->db); $soc->fetch($fac->socid); - require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $subject = $langs->trans("InfoRejectSubject"); $sendto = $emuser->getFullName($langs)." <".$emuser->email.">"; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index e7a9098369b..606bc3600f2 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -27,7 +27,7 @@ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("widthdrawals"); $langs->load("companies"); @@ -80,7 +80,7 @@ $bprev = new BonPrelevement($db); llxHeader('', $langs->trans("NewStandingOrder")); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); if (prelevement_check_config() < 0) { $langs->load("errors"); diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 5bd3db7b996..82ab1bb4402 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -23,7 +23,7 @@ * \brief Page to list withdraw requests */ require("../bank/pre.inc.php"); -require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/modules/modPrelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 0d813e09876..58fe3761db9 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -25,7 +25,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 1fd40679a25..0fb5e55cf77 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -24,7 +24,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 2fdc98fb3e7..9d8261cf209 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -23,7 +23,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 8ccde5bf97d..abe3798fc6a 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -24,7 +24,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); if (!$user->rights->prelevement->bons->lire) @@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST("confirm") == 'yes') if ($action == 'infotrans' && $user->rights->prelevement->bons->send) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $bon = new BonPrelevement($db,""); $bon->fetch($id); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 80c54c315ab..7c9a1347d9b 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -49,7 +49,7 @@ $result = restrictedArea($user, 'prelevement','',''); llxHeader('',$langs->trans("CustomersStandingOrdersArea")); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); if (prelevement_check_config() < 0) { $langs->load("errors"); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index c741bb04dbe..6333000b8ad 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -24,7 +24,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 7660cf99a1e..519ae0960d5 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -30,7 +30,7 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 6cf731dfaa8..72771a20c8b 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -23,7 +23,7 @@ */ require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 04557e00b8b..a5c566391e9 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -25,9 +25,9 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("bills"); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index d8dce74a3cc..2af686bdec7 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -23,7 +23,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); $year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"]; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 7ad351bb118..4b02a954fac 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -23,9 +23,9 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); // Security check $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 5b26de3791b..7962b3f1059 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -24,9 +24,9 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 338a47a5d85..2942b62c912 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -23,7 +23,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); $year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"]; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 46f2c91caf4..2a407140eb8 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -25,9 +25,9 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index a84d800164a..b8a532399ea 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -24,9 +24,9 @@ * \brief Index page of VAT reports */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("other"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 6a16a19ce73..c45a609d5a3 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -26,9 +26,9 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 9d59caf0cc4..61366fe7219 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -156,7 +156,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci'; # This parameter contains the way authentication is done. # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_* # Default value: dolibarr -# Possible values: Any values found in files in htdocs/includes/login directory after +# Possible values: Any values found in files in htdocs/core/login directory after # the "function_" string and before the ".php" string. You can also separate several # values using a ",". In this case, Dolibarr will check login/pass for each value in # order defined into value. However, note that this can't work with all values. diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 4592072e9af..f65a6a500c0 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -394,7 +394,7 @@ abstract class ActionsContactCardCommon if ($action == 'create_user') { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $login=dol_buildlogin($this->object->nom, $this->object->prenom); $generated_password=''; diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index 6a93b254d11..e75b099a861 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); $langs->load("companies"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 745d0c3d6e7..514ca3a29a3 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -28,8 +28,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); $langs->load("companies"); @@ -154,7 +154,7 @@ if (empty($reshook)) if (! $_POST["name"]) { $error++; $errors[]=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label")); - $_GET["action"] = $_POST["action"] = 'create'; + $action = 'create'; } if ($_POST["name"]) @@ -163,7 +163,7 @@ if (empty($reshook)) if ($id <= 0) { $error++; $errors[]=($object->error?array($object->error):$object->errors); - $_GET["action"] = $_POST["action"] = 'create'; + $action = 'create'; } } @@ -403,7 +403,7 @@ else // Civility print ''.$langs->trans("UserTitle").''; - print $formcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); + print $formcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); print ''; print ''.$langs->trans("PostOrFunction").'poste).'">'; @@ -582,7 +582,7 @@ else // Civility print ''.$langs->trans("UserTitle").''; - print $formcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); + print $formcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); print ''; print ''.$langs->trans("PostOrFunction" ).'poste).'">'; @@ -711,7 +711,7 @@ else if ($action == 'create_user') { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $login=dol_buildlogin($object->nom,$object->prenom); $generated_password=''; diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 64d5c53be4f..ad802afa59f 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -23,9 +23,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); $langs->load("companies"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 82f48c2d381..3daa1b3b0de 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -24,9 +24,9 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("companies"); $langs->load("ldap"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 7de2f333936..9b6481b309b 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); $langs->load("companies"); $langs->load("other"); @@ -199,7 +199,7 @@ else // Date To Birth if ($contact->birthday != '') { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); print ''.$langs->trans("DateToBirth").''.dol_print_date($contact->birthday,"day"); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index cefaf94c63e..25d6bdbe883 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php"); /** @@ -95,7 +95,7 @@ class Contrat extends CommonObject global $db, $langs, $conf; $langs->load("contract"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/contract"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/contract"; if (empty($conf->global->CONTRACT_ADDON)) { diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 858d531cbf6..bee4163db93 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -23,7 +23,7 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index b9e7686a0ec..c8a7e6b6b0c 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -26,9 +26,9 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contract.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("other"); @@ -69,7 +69,7 @@ $modulepart='contract'; */ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (create_exdir($upload_dir) >= 0) { diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 6710aa0f0bf..beccf9a85f8 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -26,13 +26,13 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/contract/modules_contract.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/modules/contract/modules_contract.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("contracts"); $langs->load("orders"); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index f682ff46870..315dc569432 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -22,8 +22,8 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $langs->load("contracts"); diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 748b309286d..8c4cc75f721 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -23,7 +23,7 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/lib/admin_extrafields.inc.php b/htdocs/core/admin_extrafields.inc.php similarity index 98% rename from htdocs/lib/admin_extrafields.inc.php rename to htdocs/core/admin_extrafields.inc.php index 1854d635b48..00d4e4cfa48 100644 --- a/htdocs/lib/admin_extrafields.inc.php +++ b/htdocs/core/admin_extrafields.inc.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/admin_extrafields.inc.php + * \file htdocs/core/admin_extrafields.inc.php * \brief Code for actions on extrafields admin pages */ diff --git a/htdocs/core/ajaxbox.php b/htdocs/core/ajax/box.php similarity index 96% rename from htdocs/core/ajaxbox.php rename to htdocs/core/ajax/box.php index 07a7edc0f18..0ee675434b9 100644 --- a/htdocs/core/ajaxbox.php +++ b/htdocs/core/ajax/box.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/ajaxbox.php + * \file htdocs/core/ajax/box.php * \brief File to return Ajax response on Box move */ @@ -28,7 +28,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); +require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/boxes.php"); diff --git a/htdocs/core/ajaxconstantonoff.php b/htdocs/core/ajax/constantonoff.php similarity index 93% rename from htdocs/core/ajaxconstantonoff.php rename to htdocs/core/ajax/constantonoff.php index b7fcde0b2e7..c6aeab1ac61 100644 --- a/htdocs/core/ajaxconstantonoff.php +++ b/htdocs/core/ajax/constantonoff.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/core/ajaxconstantonoff.php + * \file htdocs/core/ajax/constantonoff.php * \brief File to set or del an on/off constant */ @@ -27,8 +27,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require('../../main.inc.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); /* diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajax/fileupload.php similarity index 98% rename from htdocs/core/ajaxfileupload.php rename to htdocs/core/ajax/fileupload.php index 82067d69fa7..0d0820d3176 100644 --- a/htdocs/core/ajaxfileupload.php +++ b/htdocs/core/ajax/fileupload.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/ajaxfileupload.php + * \file htdocs/core/ajax/fileupload.php * \brief File to return Ajax response on file upload */ @@ -33,10 +33,9 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) -require("../main.inc.php"); - -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); error_reporting(E_ALL | E_STRICT); diff --git a/htdocs/lib/databases/index.php b/htdocs/core/ajax/index.php similarity index 100% rename from htdocs/lib/databases/index.php rename to htdocs/core/ajax/index.php diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php new file mode 100644 index 00000000000..214ca46d81c --- /dev/null +++ b/htdocs/core/ajax/loadinplace.php @@ -0,0 +1,49 @@ + + * + * 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 2 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 . + */ + +/** + * \file htdocs/core/ajax/loadinplace.php + * \brief File to load field value + */ + +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); + +require('../../main.inc.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); + +/* + * View + */ + +top_httphead(); + +//print ''."\n"; + +// Load original field value +if((isset($_GET['field']) && ! empty($_GET['field'])) && (isset($_GET['table_element']) && ! empty($_GET['table_element'])) && (isset($_GET['fk_element']) && ! empty($_GET['fk_element']))) +{ + $object = new GenericObject($db); + $ret=$object->getValueFrom($_GET['table_element'], $_GET['fk_element'], $_GET['field']); + echo $ret; +} + +?> diff --git a/htdocs/core/ajaxrow.php b/htdocs/core/ajax/row.php similarity index 96% rename from htdocs/core/ajaxrow.php rename to htdocs/core/ajax/row.php index 9556a9d3668..882a28f9c42 100644 --- a/htdocs/core/ajaxrow.php +++ b/htdocs/core/ajax/row.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/core/ajaxrow.php + * \file htdocs/core/ajax/row.php * \brief File to return Ajax response on Row move */ @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); +require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php new file mode 100644 index 00000000000..5e0ff2b6b42 --- /dev/null +++ b/htdocs/core/ajax/saveinplace.php @@ -0,0 +1,54 @@ + + * + * 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 2 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 . + */ + +/** + * \file htdocs/core/ajax/saveinplace.php + * \brief File to save field value + */ + +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); + +require('../../main.inc.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); + +/* + * View + */ + +top_httphead(); + +//print ''."\n"; +//var_dump($_POST); + +// Load original field value +if((isset($_POST['field']) && ! empty($_POST['field'])) && (isset($_POST['table_element']) && ! empty($_POST['table_element'])) && (isset($_POST['fk_element']) && ! empty($_POST['fk_element']))) +{ + $object = new GenericObject($db); + + // Clean parameters + $value = trim($_POST['value']); + + $ret=$object->setValueFrom($_POST['table_element'], $_POST['fk_element'], $_POST['field'], $value); + if ($ret > 0) echo (! empty($value) ? dol_nl2br($value) : ' '); +} + +?> diff --git a/htdocs/core/ajaxsecurity.php b/htdocs/core/ajax/security.php similarity index 95% rename from htdocs/core/ajaxsecurity.php rename to htdocs/core/ajax/security.php index 9cdf885734c..13ef292c3eb 100644 --- a/htdocs/core/ajaxsecurity.php +++ b/htdocs/core/ajax/security.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/core/ajaxsecurity.php + * \file htdocs/core/ajax/security.php * \brief File for return security data */ @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); +require('../../main.inc.php'); /* * View diff --git a/htdocs/core/ajaxziptown.php b/htdocs/core/ajax/ziptown.php similarity index 98% rename from htdocs/core/ajaxziptown.php rename to htdocs/core/ajax/ziptown.php index c83ef3cb61f..52eeafb4c8a 100644 --- a/htdocs/core/ajaxziptown.php +++ b/htdocs/core/ajax/ziptown.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/ajaxziptown.php + * \file htdocs/core/ajax/ziptown.php * \ingroup core * \brief File to return Ajax response on zipcode or town request */ @@ -29,7 +29,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); -require('../main.inc.php'); +require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); diff --git a/htdocs/lib/antispamimage.php b/htdocs/core/antispamimage.php similarity index 97% rename from htdocs/lib/antispamimage.php rename to htdocs/core/antispamimage.php index 3549b84360b..303413c0036 100644 --- a/htdocs/lib/antispamimage.php +++ b/htdocs/core/antispamimage.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/antispamimage.php + * \file htdocs/core/antispamimage.php * \brief Return antispam image */ diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php similarity index 97% rename from htdocs/includes/boxes/box_actions.php rename to htdocs/core/boxes/box_actions.php index 1b27b7dceb9..d8a9548f73d 100644 --- a/htdocs/includes/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_actions.php + * \file htdocs/core/boxes/box_actions.php * \ingroup actions * \brief Module to build boxe for events */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_actions extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php similarity index 96% rename from htdocs/includes/boxes/box_bookmarks.php rename to htdocs/core/boxes/box_bookmarks.php index dbf1585e022..aa31aa3cf7d 100644 --- a/htdocs/includes/boxes/box_bookmarks.php +++ b/htdocs/core/boxes/box_bookmarks.php @@ -16,11 +16,11 @@ */ /** - * \file htdocs/includes/boxes/box_bookmarks.php + * \file htdocs/core/boxes/box_bookmarks.php * \ingroup bookmark * \brief Module to generate box of bookmarks list */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_bookmarks extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php similarity index 97% rename from htdocs/includes/boxes/box_clients.php rename to htdocs/core/boxes/box_clients.php index 33feb5e4910..c9db0650c43 100644 --- a/htdocs/includes/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_clients.php + * \file htdocs/core/boxes/box_clients.php * \ingroup societes * \brief Module de generation de l'affichage de la box clients */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_clients extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php similarity index 97% rename from htdocs/includes/boxes/box_commandes.php rename to htdocs/core/boxes/box_commandes.php index b5fdd6cfb4d..8aac9fada59 100644 --- a/htdocs/includes/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_commandes.php + * \file htdocs/core/boxes/box_commandes.php * \ingroup commande * \brief Module de generation de l'affichage de la box commandes */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_commandes extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php similarity index 97% rename from htdocs/includes/boxes/box_comptes.php rename to htdocs/core/boxes/box_comptes.php index be8e3abd56e..fc70f640161 100644 --- a/htdocs/includes/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/boxes/box_comptes.php + * \file htdocs/core/boxes/box_comptes.php * \ingroup banque * \brief Module to generate box for bank accounts */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); diff --git a/htdocs/includes/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php similarity index 97% rename from htdocs/includes/boxes/box_contacts.php rename to htdocs/core/boxes/box_contacts.php index 8ae7c6a81d6..0371e821d22 100755 --- a/htdocs/includes/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_contacts.php + * \file htdocs/core/boxes/box_contacts.php * \ingroup societes * \brief Module to show box of contacts */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); diff --git a/htdocs/includes/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php similarity index 97% rename from htdocs/includes/boxes/box_contracts.php rename to htdocs/core/boxes/box_contracts.php index 9da5205c1be..223d9259d8f 100644 --- a/htdocs/includes/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -16,12 +16,12 @@ */ /** - * \file htdocs/includes/boxes/box_contracts.php + * \file htdocs/core/boxes/box_contracts.php * \ingroup contracts * \brief Module de generation de l'affichage de la box contracts */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_contracts extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php similarity index 97% rename from htdocs/includes/boxes/box_external_rss.php rename to htdocs/core/boxes/box_external_rss.php index cf159c41599..dfaf342f5e8 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -19,13 +19,13 @@ */ /** - * \file htdocs/includes/boxes/box_external_rss.php + * \file htdocs/core/boxes/box_external_rss.php * \ingroup external_rss * \brief Fichier de gestion d'une box pour le module external_rss */ include_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php"); -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_external_rss extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php similarity index 97% rename from htdocs/includes/boxes/box_factures.php rename to htdocs/core/boxes/box_factures.php index e917a42e6ed..b7359c19932 100644 --- a/htdocs/includes/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/boxes/box_factures.php + * \file htdocs/core/boxes/box_factures.php * \ingroup factures * \brief Module de generation de l'affichage de la box factures */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_factures extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php similarity index 97% rename from htdocs/includes/boxes/box_factures_fourn.php rename to htdocs/core/boxes/box_factures_fourn.php index dd28066c6ef..5cbb0af5cd9 100644 --- a/htdocs/includes/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/boxes/box_factures_fourn.php + * \file htdocs/core/boxes/box_factures_fourn.php * \ingroup supplier * \brief Fichier de gestion d'une box des factures fournisseurs */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_factures_fourn extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php similarity index 97% rename from htdocs/includes/boxes/box_factures_fourn_imp.php rename to htdocs/core/boxes/box_factures_fourn_imp.php index 1f1d7430a7d..61363d2bcac 100644 --- a/htdocs/includes/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/boxes/box_factures_fourn_imp.php + * \file htdocs/core/boxes/box_factures_fourn_imp.php * \ingroup fournisseur * \brief Fichier de gestion d'une box des factures fournisseurs impayees */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_factures_fourn_imp extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php similarity index 97% rename from htdocs/includes/boxes/box_factures_imp.php rename to htdocs/core/boxes/box_factures_imp.php index 3b268185e2c..57b0e2cb722 100644 --- a/htdocs/includes/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_factures_imp.php + * \file htdocs/core/boxes/box_factures_imp.php * \ingroup factures * \brief Module de generation de l'affichage de la box factures impayees */ -require_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +require_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php similarity index 97% rename from htdocs/includes/boxes/box_fournisseurs.php rename to htdocs/core/boxes/box_fournisseurs.php index 5528066c158..5ca61023b71 100644 --- a/htdocs/includes/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/boxes/box_fournisseurs.php + * \file htdocs/core/boxes/box_fournisseurs.php * \ingroup fournisseurs * \brief Module to generate box of suppliers */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_fournisseurs extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_members.php b/htdocs/core/boxes/box_members.php similarity index 96% rename from htdocs/includes/boxes/box_members.php rename to htdocs/core/boxes/box_members.php index 0cba1596a3c..8b3cc143b33 100755 --- a/htdocs/includes/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_members.php + * \file htdocs/core/boxes/box_members.php * \ingroup societes * \brief Module de generation de l'affichage de la box clients */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_members extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php similarity index 96% rename from htdocs/includes/boxes/box_osc_client.php rename to htdocs/core/boxes/box_osc_client.php index f9ea1fb4c40..a2a539f22ac 100644 --- a/htdocs/includes/boxes/box_osc_client.php +++ b/htdocs/core/boxes/box_osc_client.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/boxes/box_osc_client.php + * \file htdocs/core/boxes/box_osc_client.php * \ingroup osc * \brief Module to generate box of shop customers */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_osc_clients extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php similarity index 97% rename from htdocs/includes/boxes/box_produits.php rename to htdocs/core/boxes/box_produits.php index 166711e8e2e..711ee033a8c 100644 --- a/htdocs/includes/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_produits.php + * \file htdocs/core/boxes/box_produits.php * \ingroup produits,services * \brief Module to generate box of last products/services */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php similarity index 97% rename from htdocs/includes/boxes/box_propales.php rename to htdocs/core/boxes/box_propales.php index 64d7508ff6b..91bc157ea80 100644 --- a/htdocs/includes/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_propales.php + * \file htdocs/core/boxes/box_propales.php * \ingroup propales * \brief Module de generation de l'affichage de la box propales */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_propales extends ModeleBoxes { diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php similarity index 97% rename from htdocs/includes/boxes/box_prospect.php rename to htdocs/core/boxes/box_prospect.php index c34e18e0028..3e4c3c67a0b 100644 --- a/htdocs/includes/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -18,13 +18,13 @@ */ /** - * \file htdocs/includes/boxes/box_prospect.php + * \file htdocs/core/boxes/box_prospect.php * \ingroup societe * \brief Module to generate the last prospects box. */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/core/boxes/box_services_vendus.php similarity index 97% rename from htdocs/includes/boxes/box_services_vendus.php rename to htdocs/core/boxes/box_services_vendus.php index 2ccf675ed23..067deee6d1f 100644 --- a/htdocs/includes/boxes/box_services_vendus.php +++ b/htdocs/core/boxes/box_services_vendus.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/boxes/box_services_vendus.php + * \file htdocs/core/boxes/box_services_vendus.php * \ingroup produits,services * \brief Module de generation de l'affichage de la box services_vendus */ -include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); +include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_services_vendus extends ModeleBoxes { diff --git a/htdocs/lib/index.php b/htdocs/core/boxes/index.php similarity index 100% rename from htdocs/lib/index.php rename to htdocs/core/boxes/index.php diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php similarity index 99% rename from htdocs/includes/boxes/modules_boxes.php rename to htdocs/core/boxes/modules_boxes.php index d899f0e0ce3..e03ec6aa778 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/boxes/modules_boxes.php + * \file htdocs/core/boxes/modules_boxes.php * \ingroup facture * \brief Fichier contenant la classe mere des boites */ diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php similarity index 99% rename from htdocs/lib/CMailFile.class.php rename to htdocs/core/class/CMailFile.class.php index 9c2a1059e91..c0db88697b3 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/lib/CMailFile.class.php + * \file htdocs/core/class/CMailFile.class.php * \brief File of class to send emails (with attachments or not) * \author Dan Potter. * \author Eric Seigne diff --git a/htdocs/lib/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php similarity index 99% rename from htdocs/lib/CSMSFile.class.php rename to htdocs/core/class/CSMSFile.class.php index 5e38bc9d7f7..658e09f2db3 100755 --- a/htdocs/lib/CSMSFile.class.php +++ b/htdocs/core/class/CSMSFile.class.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/lib/CSMSFile.class.php + * \file htdocs/core/class/CSMSFile.class.php * \brief File of class to send sms * \author Laurent Destailleur. */ diff --git a/htdocs/lib/antivir.class.php b/htdocs/core/class/antivir.class.php similarity index 98% rename from htdocs/lib/antivir.class.php rename to htdocs/core/class/antivir.class.php index cbf71e70839..8a43c28f8a4 100644 --- a/htdocs/lib/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/antivir.class.php + * \file htdocs/core/class/antivir.class.php * \brief File of class to scan viruses * \author Laurent Destailleur. */ diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index e3167957336..b47b5b07f74 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -589,25 +589,50 @@ abstract class CommonObject return $result; } + + /** + * Load value from specific field + * + * @param string $table Table of element or element line + * @param int $id Element id + * @param string $field Field selected + * @return int <0 if KO, >0 if OK + */ + function getValueFrom($table, $id, $field) + { + $result=false; + + $sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table; + $sql.= " WHERE rowid = ".$id; + + $resql = $this->db->query($sql); + if ($resql) + { + $row = $this->db->fetch_row($resql); + $result = $row[0]; + } + + return $result; + } /** - * Update a specific field from an object + * Update a specific field from an object * - * @param table Table element or element line - * @param id Object id - * @param field Field to update - * @param value New value - * @return int <0 if KO, >0 if OK + * @param string $table Table element or element line + * @param int $id Object id + * @param string $field Field to update + * @param mixte $value New value + * @return int <0 if KO, >0 if OK */ - function updateObjectField($table,$id,$field,$value) + function setValueFrom($table, $id, $field, $value) { global $conf; $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET "; - $sql.= $field." = '".$value."'"; + $sql.= $field." = '".$this->db->escape($value)."'"; $sql.= " WHERE rowid = ".$id; - dol_syslog(get_class($this)."::updateObjectField sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::setValueFrom sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -1083,10 +1108,10 @@ abstract class CommonObject } /** - * Update public note of element + * Update public note of element * - * @param string $note_public New value for note - * @return int <0 if KO, >0 if OK + * @param string $note_public New value for note + * @return int <0 if KO, >0 if OK */ function update_note_public($note_public) { @@ -1116,20 +1141,20 @@ abstract class CommonObject /** * Update total_ht, total_ttc and total_vat for an object (sum of lines) * - * @param exclspec Exclude special product (product_type=9) - * @param roundingadjust -1=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND or 0), 0=Use total of rounding, 1=Use rounding of total - * @return int <0 if KO, >0 if OK + * @param int $exclspec Exclude special product (product_type=9) + * @param int $roundingadjust -1=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND or 0), 0=Use total of rounding, 1=Use rounding of total + * @return int <0 if KO, >0 if OK */ function update_price($exclspec=0,$roundingadjust=-1) { - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); if ($roundingadjust < 0 && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $roundingadjust=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND; if ($roundingadjust < 0) $roundingadjust=0; $err=0; - // List lines to sum + // Define constants to find lines to sum $fieldtva='total_tva'; $fieldlocaltax1='total_localtax1'; $fieldlocaltax2='total_localtax2'; @@ -1150,6 +1175,8 @@ abstract class CommonObject $this->total_localtax1 = 0; $this->total_localtax2 = 0; $this->total_ttc = 0; + $vatrates = array(); + $vatrates_alllines = array(); $num = $this->db->num_rows($resql); $i = 0; @@ -1163,9 +1190,25 @@ abstract class CommonObject $this->total_localtax2 += $obj->total_localtax2; $this->total_ttc += $obj->total_ttc; - // TODO Also fill array by vat rate - $varates[$this->vatrate][]=array('total_ht'=>$obj->total_ht,'total_tva'=>$obj->total_tva,'total_ttc'=>$obj->total_ttc, - 'total_localtax1'=>$obj->total_localtax1,'total_localtax2'=>$obj->total_localtax2); + // Define vatrates with totals for each line and for all lines + $vatrates[$this->vatrate][]=array( + 'total_ht' =>$obj->total_ht, + 'total_tva' =>$obj->total_tva, + 'total_ttc' =>$obj->total_ttc, + 'total_localtax1'=>$obj->total_localtax1, + 'total_localtax2'=>$obj->total_localtax2 + ); + if (! isset($vatrates_alllines[$this->vatrate]['total_ht'])) $vatrates_alllines[$this->vatrate]['total_ht']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_tva'])) $vatrates_alllines[$this->vatrate]['total_tva']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_localtax1'])) $vatrates_alllines[$this->vatrate]['total_localtax1']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_localtax2'])) $vatrates_alllines[$this->vatrate]['total_localtax2']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_ttc'])) $vatrates_alllines[$this->vatrate]['total_ttc']=0; + $vatrates_alllines[$this->vatrate]['total_ht'] +=$obj->total_ht; + $vatrates_alllines[$this->vatrate]['total_tva'] +=$obj->total_tva; + $vatrates_alllines[$this->vatrate]['total_localtax1']+=$obj->total_localtax1; + $vatrates_alllines[$this->vatrate]['total_localtax2']+=$obj->total_localtax2; + $vatrates_alllines[$this->vatrate]['total_ttc'] +=$obj->total_ttc; + $i++; } @@ -1186,7 +1229,7 @@ abstract class CommonObject } } - // Now update field total_ht, total_ttc and tva + // Now update global field total_ht, total_ttc and tva $fieldht='total_ht'; $fieldtva='tva'; $fieldlocaltax1='localtax1'; @@ -1227,9 +1270,9 @@ abstract class CommonObject } /** - * Add objects linked in llx_element_element. + * Add objects linked in llx_element_element. * - * @return int <=0 if KO, >0 if OK + * @return int <=0 if KO, >0 if OK */ function add_object_linked() { @@ -1345,11 +1388,14 @@ abstract class CommonObject if ($objecttype == 'delivery') { $classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon'; } if ($objecttype == 'invoice_supplier') { $classpath = 'fourn/class'; } if ($objecttype == 'order_supplier') { $classpath = 'fourn/class'; } - if ($objecttype == 'fichinter') { $classpath = 'fichinter/class'; $subelement ='fichinter'; $module ='ficheinter'; } + if ($objecttype == 'fichinter') { $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter'; } + + // TODO ajout temporaire - MAXIME MANGIN + if ($objecttype == 'contratabonnement') { $classpath = 'contrat/class'; $subelement = 'contrat'; $module = 'contratabonnement'; } $classfile = strtolower($subelement); $classname = ucfirst($subelement); - if ($objecttype == 'invoice_supplier') { $classfile = 'fournisseur.facture'; $classname='FactureFournisseur'; } - if ($objecttype == 'order_supplier') { $classfile = 'fournisseur.commande'; $classname='CommandeFournisseur'; } + if ($objecttype == 'invoice_supplier') { $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur'; } + if ($objecttype == 'order_supplier') { $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur'; } if ($conf->$module->enabled && $element != $this->element) { diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 9b21460fef5..44a366f876c 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -90,7 +90,7 @@ class Conf dol_syslog("Conf::setValues"); // Directory of core triggers - $this->triggers_modules[] = "/includes/triggers"; // Default relative path to triggers file + $this->triggers_modules[] = "/core/triggers"; // Default relative path to triggers file // Avoid warning if not defined if (empty($this->db->dolibarr_main_db_encryption)) $this->db->dolibarr_main_db_encryption=0; @@ -142,13 +142,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; + $this->triggers_modules[] = '/'.$modulename.'/core/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = dol_buildpath('/'.$modulename.'/includes/login/'); + $this->login_method_modules[] = dol_buildpath('/'.$modulename.'/core/login/'); } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/lib/doleditor.class.php b/htdocs/core/class/doleditor.class.php similarity index 99% rename from htdocs/lib/doleditor.class.php rename to htdocs/core/class/doleditor.class.php index d7219283079..0339dedb3b1 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/doleditor.class.php + * \file htdocs/core/class/doleditor.class.php * \brief Class to manage a WYSIWYG editor */ diff --git a/htdocs/lib/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php similarity index 98% rename from htdocs/lib/dolgeoip.class.php rename to htdocs/core/class/dolgeoip.class.php index 08192ca0167..7ffa64d1961 100644 --- a/htdocs/lib/dolgeoip.class.php +++ b/htdocs/core/class/dolgeoip.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/dolgeoip.class.php + * \file htdocs/core/class/dolgeoip.class.php * \ingroup geoip * \brief Library for managing module geoip */ diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 25eaa6bcf54..86ebf20bf6f 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -435,7 +435,7 @@ class ExtraFields } else if ($type == 'text') { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('options_'.$key,$value,'',200,'dolibarr_notes','In',false,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,5,100); $out=$doleditor->Create(1); } diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php index de4511f8283..06f8067f2b4 100755 --- a/htdocs/core/class/genericobject.class.php +++ b/htdocs/core/class/genericobject.class.php @@ -37,7 +37,7 @@ class GenericObject extends CommonObject * * @param DoliDB $DB Database handler */ - function GenericObject($db) + function __construct($db) { $this->db=$db; } diff --git a/htdocs/lib/google.class.php b/htdocs/core/class/google.class.php similarity index 97% rename from htdocs/lib/google.class.php rename to htdocs/core/class/google.class.php index ce0423c715d..c1b79235564 100644 --- a/htdocs/lib/google.class.php +++ b/htdocs/core/class/google.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/google.class.php + * \file htdocs/core/class/google.class.php * \brief A set of functions for using Google APIs */ class GoogleAPI diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index f031e575b67..79d3dc57eb6 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2253,7 +2253,7 @@ class Form { global $langs; - require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("project"); if ($htmlname != "none") @@ -3048,7 +3048,7 @@ class Form if (! $disabled) { $retstring.=''; } @@ -3188,7 +3188,7 @@ class Form // Generate the date part, depending on the use or not of the javascript calendar if (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == "eldy") { - $base=DOL_URL_ROOT.'/lib/'; + $base=DOL_URL_ROOT.'/core/lib/'; $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');'; } else @@ -3238,7 +3238,7 @@ class Form { if ($iSecond) { - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $hourSelected = ConvertSecondToTime($iSecond,'hour'); $minSelected = ConvertSecondToTime($iSecond,'min'); diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index 34fe0035a5a..f878dee86c3 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -338,19 +338,11 @@ class FormCompany } /** - * \brief Retourne la liste deroulante des civilite actives - * \param selected civilite pre-selectionnee - * \param htmlname Name of HTML select combo field - */ - function select_civilite($selected='',$htmlname='civilite_id') - { - print $this->select_civility($selected,$htmlname); - } - - /** - * \brief Retourne la liste deroulante des civilite actives - * \param selected civilite pre-selectionnee - * \param htmlname Name of HTML select combo field + * Return combo list with people title + * + * @param string $selected Title preselected + * @param string $htmlname Name of HTML select combo field + * @return void */ function select_civility($selected='',$htmlname='civilite_id') { @@ -362,7 +354,7 @@ class FormCompany $sql = "SELECT rowid, code, civilite, active FROM ".MAIN_DB_PREFIX."c_civilite"; $sql.= " WHERE active = 1"; - dol_syslog("Form::select_civilite sql=".$sql); + dol_syslog("Form::select_civility sql=".$sql); $resql=$this->db->query($sql); if ($resql) { @@ -636,7 +628,7 @@ class FormCompany $size=''; if (!empty($fieldsize)) $size='size="'.$fieldsize.'"'; - if ($conf->use_javascript_ajax && empty($disableautocomplete)) $out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajaxziptown.php')."\n"; + if ($conf->use_javascript_ajax && empty($disableautocomplete)) $out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n"; $out.= ''."\n"; return $out; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 71d2023c777..a2256cc229f 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -182,7 +182,7 @@ class FormFile function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false) { // filedir = conf->...dir_ouput."/".get_exdir(id) - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); global $langs,$bc,$conf; @@ -221,7 +221,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'); $modellist=ModeleThirdPartyDoc::liste_modeles($this->db); } } @@ -230,7 +230,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'); $modellist=ModelePDFPropales::liste_modeles($this->db); } } @@ -239,7 +239,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/commande/modules_commande.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); $modellist=ModelePDFCommandes::liste_modeles($this->db); } } @@ -248,7 +248,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/expedition/pdf/ModelePdfExpedition.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/pdf/ModelePdfExpedition.class.php'); $modellist=ModelePDFExpedition::liste_modeles($this->db); } } @@ -257,7 +257,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/livraison/modules_livraison.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'); $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db); } } @@ -266,7 +266,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/fichinter/modules_fichinter.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php'); $modellist=ModelePDFFicheinter::liste_modeles($this->db); } } @@ -275,7 +275,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); $modellist=ModelePDFFactures::liste_modeles($this->db); // This is to allow to join external files to invoices @@ -295,7 +295,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/project/modules_project.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'); $modellist=ModelePDFProjects::liste_modeles($this->db); } } @@ -304,7 +304,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); $modellist=ModeleExports::liste_modeles($this->db); } } @@ -313,7 +313,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db); } } @@ -322,7 +322,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_invoice/modules_facturefournisseur.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'); $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db); } } @@ -331,7 +331,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/cheque/pdf/modules_chequereceipts.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php'); $modellist=ModeleChequeReceipts::liste_modeles($this->db); } } @@ -340,7 +340,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/includes/modules/dons/modules_don.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'); $modellist=ModeleDon::liste_modeles($this->db); } } @@ -351,7 +351,7 @@ class FormFile else { // Generic feature, for external modules - $file=dol_buildpath('/includes/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0); + $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0); if (file_exists($file)) { $res=include_once($file); @@ -562,7 +562,7 @@ class FormFile $nboffiles=count($filearray); - if ($nboffiles > 0) include_once(DOL_DOCUMENT_ROOT.'/lib/images.lib.php'); + if ($nboffiles > 0) include_once(DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'); $var=true; foreach($filearray as $key => $file) // filearray must be only files here @@ -810,7 +810,7 @@ class FormFile '; print '
'; - print '
'; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index f4825fa2a1b..590282a5358 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -107,7 +107,7 @@ class FormMail function clear_attached_files() { global $conf,$user; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -600,7 +600,7 @@ class FormMail } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('message',$defaultmessage,'',280,'dolibarr_notes','In',true,false,$this->withfckeditor,8,72); $out.= $doleditor->Create(1); } diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 4689ff37c2b..679485a4a07 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -417,7 +417,7 @@ class FormOther /* // No list of colors forced, we can suggest any color print "\n".' + onClick="loadMonth('','','','','defaultlang ?>')"><< + onClick="loadMonth('','','','','defaultlang ?>')">< + onClick="loadMonth('','','','','defaultlang ?>')"> + onClick="loadMonth('','','','','defaultlang ?>')">> + onClick="loadMonth('','','','','defaultlang ?>')">>> diff --git a/htdocs/core/db/index.php b/htdocs/core/db/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/db/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/lib/databases/mssql.class.php b/htdocs/core/db/mssql.class.php similarity index 99% rename from htdocs/lib/databases/mssql.class.php rename to htdocs/core/db/mssql.class.php index b69eff6cf0b..64124d086e1 100644 --- a/htdocs/lib/databases/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/databases/mssql.class.php + * \file htdocs/core/db/mssql.class.php * \brief Fichier de la classe permettant de gerer une base mssql */ diff --git a/htdocs/lib/databases/mysql.class.php b/htdocs/core/db/mysql.class.php similarity index 99% rename from htdocs/lib/databases/mysql.class.php rename to htdocs/core/db/mysql.class.php index d9d189c7438..eb124c36e59 100644 --- a/htdocs/lib/databases/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/databases/mysql.class.php + * \file htdocs/core/db/mysql.class.php * \brief Class file to manage Dolibarr database access for a Mysql database */ diff --git a/htdocs/lib/databases/mysqli.class.php b/htdocs/core/db/mysqli.class.php similarity index 99% rename from htdocs/lib/databases/mysqli.class.php rename to htdocs/core/db/mysqli.class.php index 7dc71ce8c02..0dd93b12400 100644 --- a/htdocs/lib/databases/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/databases/mysqli.class.php + * \file htdocs/core/db/mysqli.class.php * \brief Class file to manage Dolibarr database access for a Mysql database */ diff --git a/htdocs/lib/databases/pgsql.class.php b/htdocs/core/db/pgsql.class.php similarity index 99% rename from htdocs/lib/databases/pgsql.class.php rename to htdocs/core/db/pgsql.class.php index 5a8f1b0c79c..ec57989b090 100644 --- a/htdocs/lib/databases/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/lib/databases/pgsql.class.php + * \file htdocs/core/db/pgsql.class.php * \brief Fichier de la classe permettant de gerer une base pgsql */ diff --git a/htdocs/lib/doxygen.php b/htdocs/core/doxygen.php similarity index 100% rename from htdocs/lib/doxygen.php rename to htdocs/core/doxygen.php diff --git a/htdocs/core/filemanagerdol/index.php b/htdocs/core/filemanagerdol/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/filemanagerdol/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/core/js/index.php b/htdocs/core/js/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/js/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/lib/lib_calendar.js b/htdocs/core/js/lib_calendar.js similarity index 100% rename from htdocs/lib/lib_calendar.js rename to htdocs/core/js/lib_calendar.js diff --git a/htdocs/lib/lib_head.js b/htdocs/core/js/lib_head.js similarity index 99% rename from htdocs/lib/lib_head.js rename to htdocs/core/js/lib_head.js index 9bc3eeafb73..d89f20064ca 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/core/js/lib_head.js @@ -5,7 +5,7 @@ // // -// \file htdocs/lib/lib_head.js +// \file htdocs/core/js/lib_head.js // \brief File that include javascript functions (included if option use_javascript activated) // diff --git a/htdocs/lib/lib_photosresize.js b/htdocs/core/js/lib_photosresize.js similarity index 100% rename from htdocs/lib/lib_photosresize.js rename to htdocs/core/js/lib_photosresize.js diff --git a/htdocs/lib/lib_rare.js b/htdocs/core/js/lib_rare.js similarity index 94% rename from htdocs/lib/lib_rare.js rename to htdocs/core/js/lib_rare.js index 6453e7e255d..a78de915ba6 100644 --- a/htdocs/lib/lib_rare.js +++ b/htdocs/core/js/lib_rare.js @@ -2,7 +2,7 @@ // // Script javascript that contains functions not frequently used // -// \file htdocs/lib/lib_rare.js +// \file htdocs/core/js/lib_rare.js // \brief File that include javascript functions not frequently used (included if option use_javascript activated) diff --git a/htdocs/lib/accountancy.lib.php b/htdocs/core/lib/accountancy.lib.php similarity index 97% rename from htdocs/lib/accountancy.lib.php rename to htdocs/core/lib/accountancy.lib.php index 248db7b5ed7..a1500797866 100644 --- a/htdocs/lib/accountancy.lib.php +++ b/htdocs/core/lib/accountancy.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/accountancy.lib.php + * \file htdocs/core/lib/accountancy.lib.php * \brief Library of accountancy functions */ diff --git a/htdocs/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php similarity index 98% rename from htdocs/lib/admin.lib.php rename to htdocs/core/lib/admin.lib.php index 5f0fa2d4813..949df2d1e7b 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/admin.lib.php + * \file htdocs/core/lib/admin.lib.php * \brief Library of admin functions */ @@ -636,7 +636,7 @@ function Activate($value,$withdeps=1) $found=false; foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot."/includes/modules/"; + $modulesdir[] = $dirroot."/core/modules/"; if ($type == 'alt') { @@ -647,9 +647,9 @@ function Activate($value,$withdeps=1) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } @@ -703,7 +703,7 @@ function Activate($value,$withdeps=1) $num = count($objMod->depends); for ($i = 0; $i < $num; $i++) { - if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/".$objMod->depends[$i].".class.php")) + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->depends[$i].".class.php")) { Activate($objMod->depends[$i]); } @@ -716,7 +716,7 @@ function Activate($value,$withdeps=1) $num = count($objMod->conflictwith); for ($i = 0; $i < $num; $i++) { - if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/".$objMod->conflictwith[$i].".class.php")) + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->conflictwith[$i].".class.php")) { UnActivate($objMod->conflictwith[$i],0); } @@ -751,7 +751,7 @@ function UnActivate($value, $requiredby=1) $found=false; foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot."/includes/modules/"; + $modulesdir[] = $dirroot."/core/modules/"; if ($type == 'alt') { @@ -762,9 +762,9 @@ function UnActivate($value, $requiredby=1) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } @@ -842,7 +842,7 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq $j = 0; // j is module number. Automatically affected if module number not defined. foreach ($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot . "/includes/modules/"; + $dir = $dirroot . "/core/modules/"; // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; diff --git a/htdocs/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php similarity index 91% rename from htdocs/lib/agenda.lib.php rename to htdocs/core/lib/agenda.lib.php index 8aa17c77c08..99e7050c096 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -19,29 +19,30 @@ */ /** - * \file htdocs/lib/agenda.lib.php + * \file htdocs/core/lib/agenda.lib.php * \brief Set of function for the agenda module */ /** * Show filter form in agenda view - * @param $form - * @param $canedit - * @param $status - * @param $year - * @param $month - * @param $day - * @param $showbirthday - * @param $filtera - * @param $filtert - * @param $filterd - * @param $pid - * @param $socid + * + * @param string $form Form name + * @param int $canedit Can edit filter fields + * @param int $status Status + * @param int $year Year + * @param int $month Month + * @param int $day Day + * @param int $showbirthday Show birthday + * @param string $filtera Filter on create by user + * @param string $filtert Filter on assigned to user + * @param string $filterd Filter of done by user + * @param int $pid Product id + * @param int $socid Third party id */ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid) { - global $conf,$langs; + global $conf,$langs,$db; // Filters if ($canedit || $conf->projet->enabled) @@ -66,7 +67,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt print ''; print ''; @@ -74,14 +75,23 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt print ''; print ''; print ''; + + include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + $htmlactions=new FormActions($db); + print ''; + print ''; } diff --git a/htdocs/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php similarity index 98% rename from htdocs/lib/ajax.lib.php rename to htdocs/core/lib/ajax.lib.php index 6d29a8e457e..3b3eec1eb48 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/ajax.lib.php + * \file htdocs/core/lib/ajax.lib.php * \brief Page called by Ajax request for produts */ @@ -234,7 +234,7 @@ function ajax_constantonoff($code,$input=array()) // Set constant $( "#set_'.$code.'" ).click(function() { - $.get( "'.DOL_URL_ROOT.'/core/ajaxconstantonoff.php", { + $.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", { action: \'set\', name: \''.$code.'\' }, @@ -256,7 +256,7 @@ function ajax_constantonoff($code,$input=array()) // Del constant $( "#del_'.$code.'" ).click(function() { - $.get( "'.DOL_URL_ROOT.'/core/ajaxconstantonoff.php", { + $.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", { action: \'del\', name: \''.$code.'\' }, diff --git a/htdocs/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php similarity index 99% rename from htdocs/lib/bank.lib.php rename to htdocs/core/lib/bank.lib.php index ccd931659e8..0ac206dea1f 100644 --- a/htdocs/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/bank.lib.php + * \file htdocs/core/lib/bank.lib.php * \brief Ensemble de fonctions de base pour le module banque * \ingroup banque */ diff --git a/htdocs/lib/bookmark.lib.php b/htdocs/core/lib/bookmark.lib.php similarity index 97% rename from htdocs/lib/bookmark.lib.php rename to htdocs/core/lib/bookmark.lib.php index ea87b9957c9..33bcfb97c50 100644 --- a/htdocs/lib/bookmark.lib.php +++ b/htdocs/core/lib/bookmark.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/bookmark.lib.php + * \file htdocs/core/lib/bookmark.lib.php * \brief List of functions for bookmark module */ diff --git a/htdocs/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php similarity index 97% rename from htdocs/lib/categories.lib.php rename to htdocs/core/lib/categories.lib.php index 6d28390aaea..b2db2f04d3a 100644 --- a/htdocs/lib/categories.lib.php +++ b/htdocs/core/lib/categories.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/categories.lib.php + * \file htdocs/core/lib/categories.lib.php * \brief Ensemble de fonctions de base pour le module categorie * \ingroup categorie */ diff --git a/htdocs/lib/company.lib.php b/htdocs/core/lib/company.lib.php similarity index 99% rename from htdocs/lib/company.lib.php rename to htdocs/core/lib/company.lib.php index 602c6026bb2..16059e6fbe3 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/company.lib.php + * \file htdocs/core/lib/company.lib.php * \brief Ensemble de fonctions de base pour le module societe * \ingroup societe */ diff --git a/htdocs/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php similarity index 97% rename from htdocs/lib/contact.lib.php rename to htdocs/core/lib/contact.lib.php index 87e25f70550..de6db84af94 100644 --- a/htdocs/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/contact.lib.php + * \file htdocs/core/lib/contact.lib.php * \brief Ensemble de fonctions de base pour les contacts */ diff --git a/htdocs/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php similarity index 97% rename from htdocs/lib/contract.lib.php rename to htdocs/core/lib/contract.lib.php index 0c0027a2bc1..00b34678f93 100644 --- a/htdocs/lib/contract.lib.php +++ b/htdocs/core/lib/contract.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/contract.lib.php + * \file htdocs/core/lib/contract.lib.php * \brief Ensemble de fonctions de base pour le module contrat */ diff --git a/htdocs/lib/date.lib.php b/htdocs/core/lib/date.lib.php similarity index 99% rename from htdocs/lib/date.lib.php rename to htdocs/core/lib/date.lib.php index 1ff08b2a32c..e368943cced 100644 --- a/htdocs/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/date.lib.php + * \file htdocs/core/lib/date.lib.php * \brief Set of function to manipulate dates */ diff --git a/htdocs/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php similarity index 97% rename from htdocs/lib/ecm.lib.php rename to htdocs/core/lib/ecm.lib.php index e425fc9f686..f7c267c8d3c 100644 --- a/htdocs/lib/ecm.lib.php +++ b/htdocs/core/lib/ecm.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/ecm.lib.php + * \file htdocs/core/lib/ecm.lib.php * \brief Ensemble de fonctions de base pour le module ecm * \ingroup ecm */ diff --git a/htdocs/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php similarity index 96% rename from htdocs/lib/emailing.lib.php rename to htdocs/core/lib/emailing.lib.php index 1780e0a2eed..b847d2c512e 100644 --- a/htdocs/lib/emailing.lib.php +++ b/htdocs/core/lib/emailing.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/emailing.lib.php + * \file htdocs/core/lib/emailing.lib.php * \brief Library file with function for emailing module */ diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php similarity index 98% rename from htdocs/lib/fichinter.lib.php rename to htdocs/core/lib/fichinter.lib.php index ab6d36cf286..53ac8662738 100644 --- a/htdocs/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/fichinter.lib.php + * \file htdocs/core/lib/fichinter.lib.php * \brief Ensemble de fonctions de base pour le module fichinter * \ingroup fichinter */ diff --git a/htdocs/lib/files.lib.php b/htdocs/core/lib/files.lib.php similarity index 99% rename from htdocs/lib/files.lib.php rename to htdocs/core/lib/files.lib.php index b1a237fe45e..717a6ba4ec4 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/files.lib.php + * \file htdocs/core/lib/files.lib.php * \brief Library for file managing functions */ @@ -520,7 +520,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable // If we need to make a virus scan if (empty($disablevirusscan) && file_exists($src_file) && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) { - require_once(DOL_DOCUMENT_ROOT.'/lib/antivir.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'); $antivir=new AntiVir($db); $result = $antivir->dol_avscan_file($src_file); if ($result < 0) // If virus or error, we stop here @@ -724,7 +724,7 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0) function dol_delete_preview($object) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($object->element == 'commande') $dir = $conf->commande->dir_output; if (empty($dir)) return 'ErrorObjectNoSupportedByFunction'; diff --git a/htdocs/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php similarity index 98% rename from htdocs/lib/format_cards.lib.php rename to htdocs/core/lib/format_cards.lib.php index b291e3c2298..fb758aefb24 100644 --- a/htdocs/lib/format_cards.lib.php +++ b/htdocs/core/lib/format_cards.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/format_cards.lib.php + * \file htdocs/core/lib/format_cards.lib.php * \brief Set of functions used for cards generation * \ingroup core */ diff --git a/htdocs/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php similarity index 96% rename from htdocs/lib/fourn.lib.php rename to htdocs/core/lib/fourn.lib.php index 9987d260112..4fc5114b256 100644 --- a/htdocs/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/fourn.lib.php + * \file htdocs/core/lib/fourn.lib.php * \brief Functions used by supplier invoice module * \ingroup supplier */ @@ -58,7 +58,7 @@ function facturefourn_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id; /*$filesdir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($fac->id,2).$fac->id; - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); @@ -112,7 +112,7 @@ function ordersupplier_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id; /*$filesdir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref); - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php similarity index 99% rename from htdocs/lib/functions.lib.php rename to htdocs/core/lib/functions.lib.php index 2b8c75ebba7..bac286e3c20 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -25,7 +25,7 @@ */ /** - * \file htdocs/lib/functions.lib.php + * \file htdocs/core/lib/functions.lib.php * \brief A set of functions for Dolibarr * This file contains all frequently used functions. */ @@ -44,7 +44,7 @@ */ function getDoliDBInstance($type, $host, $user, $pass, $name, $port) { - require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$type.".class.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/db/".$type.".class.php"); $class='DoliDB'.ucfirst($type); $dolidb=new $class($type, $host, $user, $pass, $name, $port); @@ -1221,7 +1221,7 @@ function dol_print_ip($ip,$mode=0) //$ip='24.24.24.24'; //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat'; Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages) - include_once(DOL_DOCUMENT_ROOT.'/lib/dolgeoip.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'); $geoip=new DolGeoIP('country',$datafile); //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n"; //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n"; @@ -1257,7 +1257,7 @@ function dol_user_country() $datafile=$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE; //$ip='24.24.24.24'; //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat'; - include_once(DOL_DOCUMENT_ROOT.'/lib/dolgeoip.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'); $geoip=new DolGeoIP('country',$datafile); $countrycode=$geoip->getCountryCodeFromIP($ip); $ret=$countrycode; @@ -2081,7 +2081,7 @@ function img_allow($allow,$alt='default') */ function img_mime($file,$alt='') { - require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $mimetype=dol_mimetype($file,'',1); $mimeimg=dol_mimetype($file,'',2); @@ -3812,14 +3812,14 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' { global $conf,$user; - require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); // Check if there is external substitution to do asked by plugins - // We look files into the includes/modules/substitutions directory + // We look files into the core/modules/substitutions directory // By default, there is no such external plugins. foreach ($conf->file->dol_document_root as $dirroot) { - $substitfiles=dol_dir_list($dirroot.'/includes/modules/substitutions','files',0,'functions_'); + $substitfiles=dol_dir_list($dirroot.'/core/modules/substitutions','files',0,'functions_'); foreach($substitfiles as $substitfile) { if (preg_match('/functions_(.*)\.lib\.php/i',$substitfile['name'],$reg)) @@ -3828,7 +3828,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' if (! empty($conf->$module->enabled)) // If module enabled { dol_syslog("Library functions_".$module.".lib.php found into ".$dirroot); - require_once($dirroot."/includes/modules/substitutions/functions_".$module.".lib.php"); + require_once($dirroot."/core/modules/substitutions/functions_".$module.".lib.php"); $function_name=$module."_completesubstitutionarray"; $function_name($substitutionarray,$outputlangs,$object); } diff --git a/htdocs/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php similarity index 99% rename from htdocs/lib/functions2.lib.php rename to htdocs/core/lib/functions2.lib.php index dd74c192347..7483cbd8e0f 100644 --- a/htdocs/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/functions2.lib.php + * \file htdocs/core/lib/functions2.lib.php * \brief A set of functions for Dolibarr * This file contains all rare functions. */ @@ -1059,7 +1059,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0) // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). if (! empty($obj->description)) // List of directories to scan is defined { - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $const=$obj->description; $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); diff --git a/htdocs/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php similarity index 98% rename from htdocs/lib/functions_ch.lib.php rename to htdocs/core/lib/functions_ch.lib.php index d49912ccfe6..41370fa77ac 100644 --- a/htdocs/lib/functions_ch.lib.php +++ b/htdocs/core/lib/functions_ch.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/functions_ch.lib.php + * \file htdocs/core/lib/functions_ch.lib.php * \brief A set of swiss functions for Dolibarr * This file contains rare functions. */ diff --git a/htdocs/lib/images.lib.php b/htdocs/core/lib/images.lib.php similarity index 99% rename from htdocs/lib/images.lib.php rename to htdocs/core/lib/images.lib.php index 666c5297337..22b2997b5ca 100644 --- a/htdocs/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/images.lib.php + * \file htdocs/core/lib/images.lib.php * \brief Set of function for manipulating images */ @@ -94,7 +94,7 @@ function dol_getImageSize($file) */ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); global $conf,$langs; @@ -297,7 +297,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $s */ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); global $conf,$langs; diff --git a/htdocs/lib/import.lib.php b/htdocs/core/lib/import.lib.php similarity index 97% rename from htdocs/lib/import.lib.php rename to htdocs/core/lib/import.lib.php index 23e7f30f73a..4e2f8224b00 100755 --- a/htdocs/lib/import.lib.php +++ b/htdocs/core/lib/import.lib.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/order.lib.php + * \file htdocs/core/lib/order.lib.php * \brief Ensemble de fonctions de base pour le module commande * \ingroup commande */ diff --git a/htdocs/core/lib/index.php b/htdocs/core/lib/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/lib/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php similarity index 96% rename from htdocs/lib/invoice.lib.php rename to htdocs/core/lib/invoice.lib.php index 22b0b276571..f718b345eec 100644 --- a/htdocs/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/invoice.lib.php + * \file htdocs/core/lib/invoice.lib.php * \brief Functions used by invoice module * \ingroup invoice */ @@ -74,7 +74,7 @@ function facture_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id; /*$filesdir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($fac->ref); - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php similarity index 98% rename from htdocs/lib/ldap.lib.php rename to htdocs/core/lib/ldap.lib.php index 3c07b8917c7..c17409e0956 100644 --- a/htdocs/lib/ldap.lib.php +++ b/htdocs/core/lib/ldap.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/ldap.lib.php + * \file htdocs/core/lib/ldap.lib.php * \brief Ensemble de fonctions de base pour le module LDAP * \ingroup ldap */ diff --git a/htdocs/lib/member.lib.php b/htdocs/core/lib/member.lib.php similarity index 99% rename from htdocs/lib/member.lib.php rename to htdocs/core/lib/member.lib.php index 343898df42c..65822f82972 100644 --- a/htdocs/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/member.lib.php + * \file htdocs/core/lib/member.lib.php * \brief Ensemble de fonctions de base pour les adherents */ diff --git a/htdocs/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php similarity index 99% rename from htdocs/lib/memory.lib.php rename to htdocs/core/lib/memory.lib.php index c538c006462..7600d2db16e 100644 --- a/htdocs/lib/memory.lib.php +++ b/htdocs/core/lib/memory.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/memory.lib.php + * \file htdocs/core/lib/memory.lib.php * \brief Set of function for memory/cache management */ diff --git a/htdocs/lib/order.lib.php b/htdocs/core/lib/order.lib.php similarity index 97% rename from htdocs/lib/order.lib.php rename to htdocs/core/lib/order.lib.php index f6bb5d33aa9..fb1000b0dd2 100644 --- a/htdocs/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/order.lib.php + * \file htdocs/core/lib/order.lib.php * \brief Ensemble de fonctions de base pour le module commande * \ingroup commande */ @@ -75,7 +75,7 @@ function commande_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id; /*$filesdir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref); - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php similarity index 99% rename from htdocs/lib/pdf.lib.php rename to htdocs/core/lib/pdf.lib.php index 2eb9d6dac13..10e592d090e 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/lib/pdf.lib.php + * \file htdocs/core/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core */ @@ -41,7 +41,7 @@ function pdf_getFormat() if (empty($conf->global->MAIN_PDF_FORMAT)) { - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $pdfformat=dol_getDefaultFormat(); } else $pdfformat=$conf->global->MAIN_PDF_FORMAT; @@ -1077,7 +1077,7 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0,$hookm */ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false) { - include_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + include_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($object->lines[$i]->special_code != 3) { diff --git a/htdocs/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php similarity index 98% rename from htdocs/lib/prelevement.lib.php rename to htdocs/core/lib/prelevement.lib.php index f210b492989..2e1f13cc220 100644 --- a/htdocs/lib/prelevement.lib.php +++ b/htdocs/core/lib/prelevement.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/prelevement.lib.php + * \file htdocs/core/lib/prelevement.lib.php * \brief Ensemble de fonctions de base pour le module prelevement * \ingroup propal */ diff --git a/htdocs/lib/price.lib.php b/htdocs/core/lib/price.lib.php similarity index 99% rename from htdocs/lib/price.lib.php rename to htdocs/core/lib/price.lib.php index 88a4ddd83d5..6c2eb310525 100644 --- a/htdocs/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/price.lib.php + * \file htdocs/core/lib/price.lib.php * \brief Librairie contenant les fonctions pour calculer un prix. */ diff --git a/htdocs/lib/product.lib.php b/htdocs/core/lib/product.lib.php similarity index 99% rename from htdocs/lib/product.lib.php rename to htdocs/core/lib/product.lib.php index 62011d3ae97..5944af367e6 100644 --- a/htdocs/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/product.lib.php + * \file htdocs/core/lib/product.lib.php * \brief Ensemble de fonctions de base pour le module produit et service * \ingroup product */ diff --git a/htdocs/lib/project.lib.php b/htdocs/core/lib/project.lib.php similarity index 98% rename from htdocs/lib/project.lib.php rename to htdocs/core/lib/project.lib.php index 4f9eb49b112..f5309dd35f4 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/project.lib.php + * \file htdocs/core/lib/project.lib.php * \brief Functions used by project module * \ingroup project */ @@ -59,7 +59,7 @@ function project_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id; /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); @@ -94,7 +94,7 @@ function project_prepare_head($object) /** - * \file htdocs/lib/project.lib.php + * \file htdocs/core/lib/project.lib.php * \brief Ensemble de fonctions de base pour le module projet * \ingroup societe */ @@ -127,7 +127,7 @@ function task_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id; /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php similarity index 96% rename from htdocs/lib/propal.lib.php rename to htdocs/core/lib/propal.lib.php index fc82d7df4cd..29451e58cd0 100644 --- a/htdocs/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/propal.lib.php + * \file htdocs/core/lib/propal.lib.php * \brief Ensemble de fonctions de base pour le module propal * \ingroup propal */ @@ -81,7 +81,7 @@ function propal_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id; /*$filesdir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref); - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/report.lib.php b/htdocs/core/lib/report.lib.php similarity index 98% rename from htdocs/lib/report.lib.php rename to htdocs/core/lib/report.lib.php index 1485d92608d..2df28ab9218 100644 --- a/htdocs/lib/report.lib.php +++ b/htdocs/core/lib/report.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/report.lib.php + * \file htdocs/core/lib/report.lib.php * \brief Set of functions for reporting */ diff --git a/htdocs/lib/security.lib.php b/htdocs/core/lib/security.lib.php similarity index 98% rename from htdocs/lib/security.lib.php rename to htdocs/core/lib/security.lib.php index c238533ef94..12268fd370d 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/security.lib.php + * \file htdocs/core/lib/security.lib.php * \ingroup core * \brief Set of function used for dolibarr security. * Warning, this file must not depends on other library files, except function.lib.php @@ -101,7 +101,7 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod if ($test && $mode && ! $login) { $mode=trim($mode); - $authfile=DOL_DOCUMENT_ROOT.'/includes/login/functions_'.$mode.'.php'; + $authfile=DOL_DOCUMENT_ROOT.'/core/login/functions_'.$mode.'.php'; $result=include_once($authfile); if ($result) { @@ -513,8 +513,8 @@ function getRandomPassword($generic=false) { $nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED); $nomfichier=$nomclass.".class.php"; - //print DOL_DOCUMENT_ROOT."/includes/modules/security/generate/".$nomclass; - require_once(DOL_DOCUMENT_ROOT."/includes/modules/security/generate/".$nomfichier); + //print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass; + require_once(DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier); $genhandler=new $nomclass($db,$conf,$langs,$user); $generated_password=$genhandler->getNewGeneratedPassword(); unset($genhandler); diff --git a/htdocs/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php similarity index 99% rename from htdocs/lib/sendings.lib.php rename to htdocs/core/lib/sendings.lib.php index 0ee728e22ec..de6b38c669c 100644 --- a/htdocs/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/lib/sendings.lib.php + * \file htdocs/core/lib/sendings.lib.php * \ingroup expedition * \brief Library for expedition module */ diff --git a/htdocs/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php similarity index 98% rename from htdocs/lib/stock.lib.php rename to htdocs/core/lib/stock.lib.php index a1894b38634..6623a961e2d 100644 --- a/htdocs/lib/stock.lib.php +++ b/htdocs/core/lib/stock.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/stock.lib.php + * \file htdocs/core/lib/stock.lib.php * \brief Library file with function for stock module */ diff --git a/htdocs/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php similarity index 99% rename from htdocs/lib/tax.lib.php rename to htdocs/core/lib/tax.lib.php index 8f940c24e67..d205b155185 100644 --- a/htdocs/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/tax.lib.php + * \file htdocs/core/lib/tax.lib.php * \ingroup tax * \brief Library for tax module */ diff --git a/htdocs/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php similarity index 99% rename from htdocs/lib/treeview.lib.php rename to htdocs/core/lib/treeview.lib.php index cbb10193140..682aa15b4e6 100644 --- a/htdocs/lib/treeview.lib.php +++ b/htdocs/core/lib/treeview.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/treeview.lib.php + * \file htdocs/core/lib/treeview.lib.php * \ingroup core * \brief Libraries for tree views */ diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php new file mode 100644 index 00000000000..265d9e8df46 --- /dev/null +++ b/htdocs/core/lib/trip.lib.php @@ -0,0 +1,56 @@ + + * + * 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 2 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 . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/lib/trip.lib.php + * \brief Ensemble de fonctions de base pour les deplacements + */ + +/** + * Enter description here... + * + * @param $object + * @return array + */ +function trip_prepare_head($object) +{ + global $langs, $conf; + + $h = 0; + $head = array(); + + $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/fiche.php?id=' . $object->id; + $head[$h][1] = $langs->trans("Card"); + $head[$h][2] = 'card'; + $h++; + + // Show more tabs from modules + // 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,$object,$head,$h,'trip'); + + $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; + + return $head; +} + +?> \ No newline at end of file diff --git a/htdocs/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php similarity index 99% rename from htdocs/lib/usergroups.lib.php rename to htdocs/core/lib/usergroups.lib.php index 9058ff28f2e..cef75daef65 100644 --- a/htdocs/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -19,7 +19,7 @@ /** - * \file htdocs/lib/usergroups.lib.php + * \file htdocs/core/lib/usergroups.lib.php * \brief Ensemble de fonctions de base pour la gestion des utilisaterus et groupes */ function user_prepare_head($object) diff --git a/htdocs/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php similarity index 98% rename from htdocs/lib/ws.lib.php rename to htdocs/core/lib/ws.lib.php index c7d2c019453..f93513bcbdc 100755 --- a/htdocs/lib/ws.lib.php +++ b/htdocs/core/lib/ws.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/ws.lib.php + * \file htdocs/core/lib/ws.lib.php * \ingroup webservices * \brief Set of function for manipulating web services */ diff --git a/htdocs/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php similarity index 99% rename from htdocs/lib/xcal.lib.php rename to htdocs/core/lib/xcal.lib.php index d40c0dfa723..9ddefa83def 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/core/lib/xcal.lib.php @@ -17,7 +17,7 @@ /** - * \file htdocs/lib/xcal.lib.php + * \file htdocs/core/lib/xcal.lib.php * \brief Function to manage calendar files (vcal/ical/...) */ @@ -44,7 +44,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile) $calfileh=fopen($outputfile,'w'); if ($calfileh) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); $now=dol_now(); $encoding=''; diff --git a/htdocs/includes/login/README.txt b/htdocs/core/login/README.txt similarity index 92% rename from htdocs/includes/login/README.txt rename to htdocs/core/login/README.txt index beb66115858..7c00a86887f 100644 --- a/htdocs/includes/login/README.txt +++ b/htdocs/core/login/README.txt @@ -1,6 +1,6 @@ README (english) --------------------------------------------- -Decription of htdocs/includes/login directory +Decription of htdocs/core/login directory --------------------------------------------- This directory contains files that handle way to validate passwords. diff --git a/htdocs/includes/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php similarity index 98% rename from htdocs/includes/login/functions_dolibarr.php rename to htdocs/core/login/functions_dolibarr.php index e3b2325409a..de814814f91 100644 --- a/htdocs/includes/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_dolibarr.php + * \file htdocs/core/login/functions_dolibarr.php * \ingroup core * \brief Authentication functions for Dolibarr mode */ diff --git a/htdocs/includes/login/functions_empty.php b/htdocs/core/login/functions_empty.php similarity index 95% rename from htdocs/includes/login/functions_empty.php rename to htdocs/core/login/functions_empty.php index cf535aff82b..aafba4d9099 100644 --- a/htdocs/includes/login/functions_empty.php +++ b/htdocs/core/login/functions_empty.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/login/functions_empty.php + * \file htdocs/core/login/functions_empty.php * \ingroup core * \brief Empty authentication functions for test */ diff --git a/htdocs/includes/login/functions_forceuser.php b/htdocs/core/login/functions_forceuser.php similarity index 96% rename from htdocs/includes/login/functions_forceuser.php rename to htdocs/core/login/functions_forceuser.php index 8c341b76d56..a2612df16b2 100644 --- a/htdocs/includes/login/functions_forceuser.php +++ b/htdocs/core/login/functions_forceuser.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_forceuser.php + * \file htdocs/core/login/functions_forceuser.php * \ingroup core * \brief Authentication functions for forceuser */ diff --git a/htdocs/includes/login/functions_http.php b/htdocs/core/login/functions_http.php similarity index 96% rename from htdocs/includes/login/functions_http.php rename to htdocs/core/login/functions_http.php index 1e05b10db58..c40e3b1609d 100644 --- a/htdocs/includes/login/functions_http.php +++ b/htdocs/core/login/functions_http.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/login/functions_http.php + * \file htdocs/core/login/functions_http.php * \ingroup core * \brief Authentication functions for HTTP Basic */ diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php similarity index 98% rename from htdocs/includes/login/functions_ldap.php rename to htdocs/core/login/functions_ldap.php index dd3ddb9e340..794187d5ca5 100644 --- a/htdocs/includes/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_ldap.php + * \file htdocs/core/login/functions_ldap.php * \ingroup core * \brief Authentication functions for LDAP */ @@ -71,7 +71,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) if ($ldapdebug) print "DEBUG: Logging LDAP steps
\n"; - require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); $ldap=new Ldap(); $ldap->server=array($ldaphost); $ldap->serverPort=$ldapport; diff --git a/htdocs/includes/login/functions_myopenid.php b/htdocs/core/login/functions_myopenid.php similarity index 99% rename from htdocs/includes/login/functions_myopenid.php rename to htdocs/core/login/functions_myopenid.php index ecb831465c1..c8c5e28cecb 100644 --- a/htdocs/includes/login/functions_myopenid.php +++ b/htdocs/core/login/functions_myopenid.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/login/functions_myopenid.php + * \file htdocs/core/login/functions_myopenid.php * \ingroup core * \brief Authentication functions for OpenId mode */ diff --git a/htdocs/core/login/index.php b/htdocs/core/login/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/login/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/core/menus/index.php b/htdocs/core/menus/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/menus/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql similarity index 100% rename from htdocs/includes/menus/init_menu_auguria.sql rename to htdocs/core/menus/init_menu_auguria.sql diff --git a/htdocs/includes/menus/init_menu_smartphone.sql b/htdocs/core/menus/init_menu_smartphone.sql similarity index 100% rename from htdocs/includes/menus/init_menu_smartphone.sql rename to htdocs/core/menus/init_menu_smartphone.sql diff --git a/htdocs/core/menus/smartphone/index.php b/htdocs/core/menus/smartphone/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/menus/smartphone/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/includes/menus/smartphone/smartphone.lib.php b/htdocs/core/menus/smartphone/smartphone.lib.php similarity index 98% rename from htdocs/includes/menus/smartphone/smartphone.lib.php rename to htdocs/core/menus/smartphone/smartphone.lib.php index 79fef992ee7..b78c0f7c3e8 100755 --- a/htdocs/includes/menus/smartphone/smartphone.lib.php +++ b/htdocs/core/menus/smartphone/smartphone.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/smartphone/smartphone.lib.php + * \file htdocs/core/menus/smartphone/smartphone.lib.php * \brief Library for file smartphone menus */ diff --git a/htdocs/includes/menus/smartphone/smartphone_backoffice.php b/htdocs/core/menus/smartphone/smartphone_backoffice.php similarity index 91% rename from htdocs/includes/menus/smartphone/smartphone_backoffice.php rename to htdocs/core/menus/smartphone/smartphone_backoffice.php index e8f5cc9bbf5..9cf2c1ab7db 100755 --- a/htdocs/includes/menus/smartphone/smartphone_backoffice.php +++ b/htdocs/core/menus/smartphone/smartphone_backoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/smartphone/smartphone_backoffice.php + * \file htdocs/core/menus/smartphone/smartphone_backoffice.php * \brief Gestionnaire nomme smartphone du menu smartphone */ @@ -50,7 +50,7 @@ class MenuSmart { */ function showmenu($limitmenuto) { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/smartphone.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'); print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto); } diff --git a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php b/htdocs/core/menus/smartphone/smartphone_frontoffice.php similarity index 91% rename from htdocs/includes/menus/smartphone/smartphone_frontoffice.php rename to htdocs/core/menus/smartphone/smartphone_frontoffice.php index 85129ff8d21..4be38b571c8 100755 --- a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php +++ b/htdocs/core/menus/smartphone/smartphone_frontoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/smartphone/smartphone_frontoffice.php + * \file htdocs/core/menus/smartphone/smartphone_frontoffice.php * \brief Gestionnaire nomme smartphone du menu smartphone */ @@ -51,7 +51,7 @@ class MenuSmart { */ function showmenu($limitmenuto) { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/smartphone.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'); print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto); } diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php similarity index 99% rename from htdocs/includes/menus/standard/auguria.lib.php rename to htdocs/core/menus/standard/auguria.lib.php index 8a5cf7b5461..84253517cde 100644 --- a/htdocs/includes/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/auguria.lib.php + * \file htdocs/core/menus/standard/auguria.lib.php * \brief Library for file auguria menus */ diff --git a/htdocs/includes/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php similarity index 92% rename from htdocs/includes/menus/standard/auguria_backoffice.php rename to htdocs/core/menus/standard/auguria_backoffice.php index 7c5d669f069..f23153e04ef 100644 --- a/htdocs/includes/menus/standard/auguria_backoffice.php +++ b/htdocs/core/menus/standard/auguria_backoffice.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/auguria_backoffice.php + * \file htdocs/core/menus/standard/auguria_backoffice.php * \brief Gestionnaire nomme Auguria du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -56,7 +56,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -98,7 +98,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_frontoffice.php similarity index 92% rename from htdocs/includes/menus/standard/auguria_frontoffice.php rename to htdocs/core/menus/standard/auguria_frontoffice.php index abd3e3a8be8..e1197a10439 100644 --- a/htdocs/includes/menus/standard/auguria_frontoffice.php +++ b/htdocs/core/menus/standard/auguria_frontoffice.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/auguria_frontoffice.php + * \file htdocs/core/menus/standard/auguria_frontoffice.php * \brief Gestionnaire nomme Auguria du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -57,7 +57,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -98,7 +98,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/auguria.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php similarity index 99% rename from htdocs/includes/menus/standard/eldy.lib.php rename to htdocs/core/menus/standard/eldy.lib.php index cb918651725..9cf00b15144 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/menus/standard/eldy.lib.php + * \file htdocs/core/menus/standard/eldy.lib.php * \brief Library for file eldy menus */ diff --git a/htdocs/includes/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php similarity index 92% rename from htdocs/includes/menus/standard/eldy_backoffice.php rename to htdocs/core/menus/standard/eldy_backoffice.php index 6d70dbb97d8..2785e75520f 100644 --- a/htdocs/includes/menus/standard/eldy_backoffice.php +++ b/htdocs/core/menus/standard/eldy_backoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/standard/eldy_backoffice.php + * \file htdocs/core/menus/standard/eldy_backoffice.php * \brief Gestionnaire nomme eldy du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -54,7 +54,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -95,7 +95,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php similarity index 92% rename from htdocs/includes/menus/standard/eldy_frontoffice.php rename to htdocs/core/menus/standard/eldy_frontoffice.php index 7821add41f3..52366e88a9d 100644 --- a/htdocs/includes/menus/standard/eldy_frontoffice.php +++ b/htdocs/core/menus/standard/eldy_frontoffice.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/menus/standard/eldy_frontoffice.php + * \file htdocs/core/menus/standard/eldy_frontoffice.php * \brief Gestionnaire nomme eldy du menu du haut * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: @@ -54,7 +54,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -95,7 +95,7 @@ class MenuLeft { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/includes/menus/standard/eldy.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/includes/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php similarity index 99% rename from htdocs/includes/menus/standard/empty.php rename to htdocs/core/menus/standard/empty.php index 66a93c6ce73..e7ac7d0e6f4 100644 --- a/htdocs/includes/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/menus/standard/empty.php + * \file htdocs/core/menus/standard/empty.php * \brief This is an example of an empty top menu handler */ diff --git a/htdocs/core/menus/standard/index.php b/htdocs/core/menus/standard/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/menus/standard/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/includes/modules/.cvsignore b/htdocs/core/modules/.cvsignore similarity index 100% rename from htdocs/includes/modules/.cvsignore rename to htdocs/core/modules/.cvsignore diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php similarity index 99% rename from htdocs/includes/modules/DolibarrModules.class.php rename to htdocs/core/modules/DolibarrModules.class.php index bb5e7745995..463ae3c172f 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/includes/modules/DolibarrModules.class.php + * \file htdocs/core/modules/DolibarrModules.class.php * \brief Fichier de description et activation des modules Dolibarr */ @@ -492,7 +492,7 @@ abstract class DolibarrModules $error=0; - include_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/admin.lib.php"); $ok = 1; foreach($conf->file->dol_document_root as $dirroot) diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php similarity index 97% rename from htdocs/includes/modules/action/rapport.pdf.php rename to htdocs/core/modules/action/rapport.pdf.php index b4dbcc02486..e056ff1831b 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -19,14 +19,14 @@ */ /** - * \file htdocs/includes/modules/action/rapport.pdf.php + * \file htdocs/core/modules/action/rapport.pdf.php * \ingroup commercial * \brief File to build PDF with events */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** * \class CommActionRapport diff --git a/htdocs/includes/modules/barcode/barcodecoder.modules.php b/htdocs/core/modules/barcode/barcodecoder.modules.php similarity index 97% rename from htdocs/includes/modules/barcode/barcodecoder.modules.php rename to htdocs/core/modules/barcode/barcodecoder.modules.php index 57ea4b4e4a9..025044dc863 100644 --- a/htdocs/includes/modules/barcode/barcodecoder.modules.php +++ b/htdocs/core/modules/barcode/barcodecoder.modules.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/barcode/barcodecoder.modules.php + * \file htdocs/core/modules/barcode/barcodecoder.modules.php * \ingroup barcode * \brief Fichier contenant la classe du modele de generation code barre Barcode Coder */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/barcode/modules_barcode.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/barcode/modules_barcode.php"); /** * \class modBarcodeCoder diff --git a/htdocs/includes/modules/barcode/modules_barcode.php b/htdocs/core/modules/barcode/modules_barcode.php similarity index 91% rename from htdocs/includes/modules/barcode/modules_barcode.php rename to htdocs/core/modules/barcode/modules_barcode.php index 5b3a782adc1..2de96b94599 100644 --- a/htdocs/includes/modules/barcode/modules_barcode.php +++ b/htdocs/core/modules/barcode/modules_barcode.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/includes/modules/barcode/modules_barcode.php + * \file htdocs/core/modules/barcode/modules_barcode.php * \ingroup barcode * \brief Fichier contenant la classe mere de generation des codes barres */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** diff --git a/htdocs/includes/modules/barcode/phpbarcode.modules.php b/htdocs/core/modules/barcode/phpbarcode.modules.php similarity index 96% rename from htdocs/includes/modules/barcode/phpbarcode.modules.php rename to htdocs/core/modules/barcode/phpbarcode.modules.php index 9915fe7723d..7891b12ee93 100644 --- a/htdocs/includes/modules/barcode/phpbarcode.modules.php +++ b/htdocs/core/modules/barcode/phpbarcode.modules.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/barcode/phpbarcode.modules.php + * \file htdocs/core/modules/barcode/phpbarcode.modules.php * \ingroup facture * \brief Fichier contenant la classe du modele de generation code barre phpbarcode */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/barcode/modules_barcode.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/barcode/modules_barcode.php"); /** \class modPhpbarcode * \brief Classe du modele de numerotation de generation code barre phpbarcode diff --git a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php similarity index 94% rename from htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php rename to htdocs/core/modules/cheque/pdf/modules_chequereceipts.php index 0409d6af1a8..9a3fa4c68c8 100644 --- a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php + * \file htdocs/core/modules/cheque/pdf/modules_chequereceipts.php * \ingroup facture * \brief File with parent class of check receipt document generators */ @@ -49,7 +49,7 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator $type='chequereceipt'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); // TODO Remove this to use getListOfModels only $liste = array('blochet'=>'blochet'); @@ -74,7 +74,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs) global $conf,$langs; $langs->load("bills"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/cheque/pdf/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/cheque/pdf/"; // Positionne modele sur le nom du modele a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php similarity index 97% rename from htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php rename to htdocs/core/modules/cheque/pdf/pdf_blochet.class.php index 3acd5771307..3f56674b8b9 100644 --- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php @@ -18,14 +18,14 @@ */ /** - * \file htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php + * \file htdocs/core/modules/cheque/pdf/pdf_blochet.class.php * \ingroup banque * \brief File to build cheque deposit receipts */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/cheque/pdf/modules_chequereceipts.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/cheque/pdf/modules_chequereceipts.php"); /** diff --git a/htdocs/includes/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php similarity index 96% rename from htdocs/includes/modules/commande/mod_commande_marbre.php rename to htdocs/core/modules/commande/mod_commande_marbre.php index 5aedaa3a137..cd060ae4a11 100644 --- a/htdocs/includes/modules/commande/mod_commande_marbre.php +++ b/htdocs/core/modules/commande/mod_commande_marbre.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/commande/mod_commande_marbre.php + * \file htdocs/core/modules/commande/mod_commande_marbre.php * \ingroup commande * \brief File of class to manage customer order numbering rules Marbre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); /** \class mod_commande_marbre * \brief Class to manage customer order numbering rules Marbre diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php similarity index 95% rename from htdocs/includes/modules/commande/mod_commande_saphir.php rename to htdocs/core/modules/commande/mod_commande_saphir.php index b63e4459ccb..dbc5b568b65 100644 --- a/htdocs/includes/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/commande/mod_commande_saphir.php + * \file htdocs/core/modules/commande/mod_commande_saphir.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); /** @@ -105,7 +105,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // We get cursor rule $mask=$conf->global->COMMANDE_SAPHIR_MASK; diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php similarity index 96% rename from htdocs/includes/modules/commande/modules_commande.php rename to htdocs/core/modules/commande/modules_commande.php index 9992255fbb2..b829321b019 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/includes/modules/commande/modules_commande.php + * \file htdocs/core/modules/commande/modules_commande.php * \ingroup commande * \brief Fichier contenant la classe mere de generation des commandes en PDF * et la classe mere de numerotation des commandes @@ -52,7 +52,7 @@ abstract class ModelePDFCommandes extends CommonDocGenerator $type='order'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -155,7 +155,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 global $conf,$user,$langs; $langs->load("orders"); - $dir = "/includes/modules/commande/"; + $dir = "/core/modules/commande/"; $srctemplatepath=''; $modelisok=0; $liste=array(); @@ -203,7 +203,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 $outputlangs->charset_output=$sav_charset_output; // we delete preview files - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); dol_delete_preview($object); // Appel des triggers diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/core/modules/commande/pdf_edison.modules.php similarity index 98% rename from htdocs/includes/modules/commande/pdf_edison.modules.php rename to htdocs/core/modules/commande/pdf_edison.modules.php index 587c5eb490f..e293cae0ae1 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/pdf_edison.modules.php @@ -20,14 +20,14 @@ */ /** - * \file htdocs/includes/modules/commande/pdf_edison.modules.php + * \file htdocs/core/modules/commande/pdf_edison.modules.php * \ingroup commande * \brief Fichier de la classe permettant de generer les commandes au modele Edison */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** * \class pdf_edison diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/core/modules/commande/pdf_einstein.modules.php similarity index 99% rename from htdocs/includes/modules/commande/pdf_einstein.modules.php rename to htdocs/core/modules/commande/pdf_einstein.modules.php index 5fc3d598b4a..b8292177a4f 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/pdf_einstein.modules.php @@ -20,17 +20,17 @@ */ /** - * \file htdocs/includes/modules/commande/pdf_einstein.modules.php + * \file htdocs/core/modules/commande/pdf_einstein.modules.php * \ingroup commande * \brief Fichier de la classe permettant de generer les commandes au modele Einstein * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php similarity index 94% rename from htdocs/includes/modules/contract/mod_contract_magre.php rename to htdocs/core/modules/contract/mod_contract_magre.php index 8d4f3dea896..362ba30ac5a 100755 --- a/htdocs/includes/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/contract/mod_contract_magre.php + * \file htdocs/core/modules/contract/mod_contract_magre.php * \ingroup contract * \brief File of class to manage contract numbering rules Magre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/modules_contract.php"); /** \class mod_commande_magre * \brief Class to manage contract numbering rules Magre @@ -98,7 +98,7 @@ class mod_contract_magre extends ModelNumRefContracts { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); $mask=$conf->global->CONTRACT_MAGRE_MASK; diff --git a/htdocs/includes/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php similarity index 95% rename from htdocs/includes/modules/contract/mod_contract_serpis.php rename to htdocs/core/modules/contract/mod_contract_serpis.php index 51ade8b5d98..9972aeb7f4e 100755 --- a/htdocs/includes/modules/contract/mod_contract_serpis.php +++ b/htdocs/core/modules/contract/mod_contract_serpis.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/modules/contract/mod_contract_serpis.php + * \file htdocs/core/modules/contract/mod_contract_serpis.php * \ingroup contract * \brief File of class to manage contract numbering rules Serpis */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/modules_contract.php"); /** \class mod_commande_serpis * \brief Class to manage contract numbering rules Serpis diff --git a/htdocs/includes/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php similarity index 97% rename from htdocs/includes/modules/contract/modules_contract.php rename to htdocs/core/modules/contract/modules_contract.php index 60eaea341fa..199ca102c5e 100755 --- a/htdocs/includes/modules/contract/modules_contract.php +++ b/htdocs/core/modules/contract/modules_contract.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/includes/modules/contract/modules_contract.php + * \file htdocs/core/modules/contract/modules_contract.php * \ingroup contract * \brief File of class to manage contract numbering */ diff --git a/htdocs/includes/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html similarity index 100% rename from htdocs/includes/modules/dons/html_cerfafr.html rename to htdocs/core/modules/dons/html_cerfafr.html diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php similarity index 94% rename from htdocs/includes/modules/dons/html_cerfafr.modules.php rename to htdocs/core/modules/dons/html_cerfafr.modules.php index 64b8a301101..1a5a06c0ec0 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -17,13 +17,13 @@ */ /** - * \file htdocs/includes/modules/dons/html_cerfafr.modules.php + * \file htdocs/core/modules/dons/html_cerfafr.modules.php * \ingroup don * \brief Formulaire de don */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** @@ -113,7 +113,7 @@ class html_cerfafr extends ModeleDon if (file_exists($dir)) { // Defini contenu - $donmodel=DOL_DOCUMENT_ROOT ."/includes/modules/dons/html_cerfafr.html"; + $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html"; $html = implode('', file($donmodel)); $html = str_replace('__REF__',$id,$html); $html = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$html); diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php similarity index 97% rename from htdocs/includes/modules/dons/modules_don.php rename to htdocs/core/modules/dons/modules_don.php index 3d7d93e93aa..02c25f41f61 100644 --- a/htdocs/includes/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/dons/modules_don.php + * \file htdocs/core/modules/dons/modules_don.php * \ingroup don * \brief File of class to manage donation document generation */ @@ -48,7 +48,7 @@ abstract class ModeleDon extends CommonDocGenerator $type='donation'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -140,7 +140,7 @@ function don_create($db, $id, $message, $modele, $outputlangs) global $conf, $langs; $langs->load("bills"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; // Positionne modele sur le nom du modele � utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/core/modules/expedition/methode_expedition.modules.php similarity index 88% rename from htdocs/includes/modules/expedition/methode_expedition.modules.php rename to htdocs/core/modules/expedition/methode_expedition.modules.php index 5cc284b90e2..f86cd4e8d9f 100644 --- a/htdocs/includes/modules/expedition/methode_expedition.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition.modules.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition.modules.php + * \file htdocs/core/modules/expedition/methode_expedition.modules.php * \ingroup expedition * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** @@ -52,7 +52,7 @@ class ModeleShippingMethod $type='???'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php rename to htdocs/core/modules/expedition/methode_expedition_colsui.modules.php index de45b86b83c..49e1c2542dc 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_colsui.modules.php * \ingroup expedition */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_enl.modules.php rename to htdocs/core/modules/expedition/methode_expedition_enl.modules.php index 69210249661..d59eb771429 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_enl.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_enl.modules.php * \ingroup expedition */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php rename to htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php index 4c01bc47424..d7170ec8764 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php * \ingroup expedition */ diff --git a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php similarity index 93% rename from htdocs/includes/modules/expedition/methode_expedition_trans.modules.php rename to htdocs/core/modules/expedition/methode_expedition_trans.modules.php index 64b8b597271..eb971030ac4 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/includes/modules/expedition/methode_expedition_trans.modules.php + * \file htdocs/core/modules/expedition/methode_expedition_trans.modules.php * \ingroup expedition */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php similarity index 94% rename from htdocs/includes/modules/expedition/mod_expedition_ribera.php rename to htdocs/core/modules/expedition/mod_expedition_ribera.php index a1468c20840..5a8fb13e458 100755 --- a/htdocs/includes/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/expedition/mod_expedition_ribera.php + * \file htdocs/core/modules/expedition/mod_expedition_ribera.php * \ingroup expedition * \brief File of class to manage expedition numbering rules Ribera */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/modules_expedition.php"); /** \class mod_expedition_ribera * \brief Class to manage expedition numbering rules Ribera @@ -98,7 +98,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); $mask=$conf->global->EXPEDITION_RIBERA_MASK; diff --git a/htdocs/includes/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php similarity index 95% rename from htdocs/includes/modules/expedition/mod_expedition_safor.php rename to htdocs/core/modules/expedition/mod_expedition_safor.php index 762890eebc4..502c5f2ac77 100755 --- a/htdocs/includes/modules/expedition/mod_expedition_safor.php +++ b/htdocs/core/modules/expedition/mod_expedition_safor.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/modules/expedition/mod_expedition_safor.php + * \file htdocs/core/modules/expedition/mod_expedition_safor.php * \ingroup expedition * \brief File of class to manage shipments numbering rules Safor */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/modules_expedition.php"); /** \class mod_commande_safor * \brief Class to manage expedition numbering rules Safor diff --git a/htdocs/includes/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php similarity index 97% rename from htdocs/includes/modules/expedition/modules_expedition.php rename to htdocs/core/modules/expedition/modules_expedition.php index 2deef0504d9..c169f90f162 100755 --- a/htdocs/includes/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/includes/modules/expedition/modules_expedition.php + * \file htdocs/core/modules/expedition/modules_expedition.php * \ingroup expedition * \brief File of class to manage expedition numbering */ diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php similarity index 95% rename from htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php rename to htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php index ac0d8d378d9..1a637144546 100644 --- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php +++ b/htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php + * \file htdocs/core/modules/expedition/pdf/ModelePdfExpedition.class.php * \ingroup shipping * \brief Fichier contenant la classe mere de generation des expeditions */ @@ -46,7 +46,7 @@ abstract class ModelePdfExpedition extends CommonDocGenerator $type='shipping'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -67,7 +67,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) global $conf,$langs; $langs->load("sendings"); - $dir = "/includes/modules/expedition/pdf/"; + $dir = "/core/modules/expedition/pdf/"; $modelisok=0; // Positionne modele sur le nom du modele de commande a utiliser diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php similarity index 98% rename from htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php rename to htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php index 24192d52c20..c7159277e89 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -19,15 +19,15 @@ */ /** - * \file htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php + * \file htdocs/core/modules/expedition/pdf/pdf_expedition_merou.modules.php * \ingroup expedition * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Merou */ -require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php similarity index 98% rename from htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php rename to htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php index b3e33b9fedd..85de36612cb 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -19,14 +19,14 @@ */ /** - * \file htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php + * \file htdocs/core/modules/expedition/pdf/pdf_expedition_rouget.modules.php * \ingroup expedition * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Rouget */ -require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php"; +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php similarity index 97% rename from htdocs/includes/modules/export/export_csv.modules.php rename to htdocs/core/modules/export/export_csv.modules.php index f5456218970..8d6939757b7 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/includes/modules/export/export_csv.modules.php + * \file htdocs/core/modules/export/export_csv.modules.php * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/export/modules_export.php"); /** diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php similarity index 98% rename from htdocs/includes/modules/export/export_excel.modules.php rename to htdocs/core/modules/export/export_excel.modules.php index 63864456f8b..494136f13b5 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/includes/modules/export/export_excel.modules.php + * \file htdocs/core/modules/export/export_excel.modules.php * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/export/modules_export.php"); /** diff --git a/htdocs/includes/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php similarity index 98% rename from htdocs/includes/modules/export/export_excel2007.modules.php rename to htdocs/core/modules/export/export_excel2007.modules.php index 8c381d02cd1..e7b1f8c44cf 100755 --- a/htdocs/includes/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -16,14 +16,14 @@ */ /** - * \file htdocs/includes/modules/export/export_excel.modules.php + * \file htdocs/core/modules/export/export_excel.modules.php * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/export_excel.modules.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/export/export_excel.modules.php"); /** diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php similarity index 97% rename from htdocs/includes/modules/export/export_tsv.modules.php rename to htdocs/core/modules/export/export_tsv.modules.php index ffe697a884f..934ed7516f4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/includes/modules/export/export_csv.modules.php + * \file htdocs/core/modules/export/export_csv.modules.php * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/export/modules_export.php"); /** diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php similarity index 96% rename from htdocs/includes/modules/export/modules_export.php rename to htdocs/core/modules/export/modules_export.php index 7aab0370d88..947a7975a3e 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/core/modules/export/modules_export.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/export/modules_export.php + * \file htdocs/core/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules */ @@ -48,7 +48,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac { dol_syslog("ModeleExport::liste_modeles"); - $dir=DOL_DOCUMENT_ROOT."/includes/modules/export/"; + $dir=DOL_DOCUMENT_ROOT."/core/modules/export/"; $handle=opendir($dir); // Recherche des fichiers drivers exports disponibles diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php similarity index 98% rename from htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php rename to htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 969287835d0..29db22df3fd 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -17,17 +17,17 @@ */ /** - * \file htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php + * \file htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php * \ingroup societe * \brief File of class to build ODT documents for third parties * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); /** diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php similarity index 99% rename from htdocs/includes/modules/facture/doc/pdf_crabe.modules.php rename to htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 415d581f330..e1bb598705e 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -20,17 +20,17 @@ */ /** - * \file htdocs/includes/modules/facture/doc/pdf_crabe.modules.php + * \file htdocs/core/modules/facture/doc/pdf_crabe.modules.php * \ingroup facture * \brief File of class to generate invoices from crab model * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php similarity index 99% rename from htdocs/includes/modules/facture/doc/pdf_oursin.modules.php rename to htdocs/core/modules/facture/doc/pdf_oursin.modules.php index f54fb724b64..07a061b5995 100755 --- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -21,16 +21,16 @@ */ /** - * \file htdocs/includes/modules/facture/doc/pdf_oursin.modules.php + * \file htdocs/core/modules/facture/doc/pdf_oursin.modules.php * \ingroup facture * \brief Fichier de la classe permettant de generer les factures au modele oursin * \author Sylvain SCATTOLINI base sur un modele de Laurent Destailleur */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php similarity index 96% rename from htdocs/includes/modules/facture/mod_facture_mercure.php rename to htdocs/core/modules/facture/mod_facture_mercure.php index abdcb71cab5..a2402237dac 100644 --- a/htdocs/includes/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/includes/modules/facture/mod_facture_mercure.php + * \file htdocs/core/modules/facture/mod_facture_mercure.php * \ingroup facture * \brief File containing class for numbering module Mercure */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); /** @@ -113,7 +113,7 @@ class mod_facture_mercure extends ModeleNumRefFactures { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // Get Mask value $mask = ''; diff --git a/htdocs/includes/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php similarity index 97% rename from htdocs/includes/modules/facture/mod_facture_terre.php rename to htdocs/core/modules/facture/mod_facture_terre.php index d690ec746ac..a6f6f09188f 100644 --- a/htdocs/includes/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/facture/mod_facture_terre.php + * \file htdocs/core/modules/facture/mod_facture_terre.php * \ingroup facture * \brief File containing class for numbering module Terre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); /** \class mod_facture_terre * \brief Classe du modele de numerotation de reference de facture Terre diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php similarity index 97% rename from htdocs/includes/modules/facture/modules_facture.php rename to htdocs/core/modules/facture/modules_facture.php index 7a12cb438ad..d50a9ecac1b 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/facture/modules_facture.php + * \file htdocs/core/modules/facture/modules_facture.php * \ingroup facture * \brief Fichier contenant la classe mere de generation des factures en PDF * et la classe mere de numerotation des factures @@ -50,7 +50,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator $type='invoice'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -155,7 +155,7 @@ function facture_pdf_create($db, $object, $message, $modele, $outputlangs, $hide @set_time_limit(120); error_reporting($err); - $dir = "/includes/modules/facture/"; + $dir = "/core/modules/facture/"; $srctemplatepath=''; // Positionne le modele sur le nom du modele a utiliser @@ -306,7 +306,7 @@ function facture_meta_create($db, $facid, $message="") function facture_delete_preview($db, $facid) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $fac = new Facture($db); $fac->fetch($facid); diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php similarity index 95% rename from htdocs/includes/modules/fichinter/mod_arctic.php rename to htdocs/core/modules/fichinter/mod_arctic.php index 85bbb4adba8..e529b110569 100644 --- a/htdocs/includes/modules/fichinter/mod_arctic.php +++ b/htdocs/core/modules/fichinter/mod_arctic.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/includes/modules/fichinter/mod_arctic.php + * \file htdocs/core/modules/fichinter/mod_arctic.php * \ingroup fiche intervention * \brief File with Arctic numbering module for interventions */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/modules_fichinter.php"); /** * \class mod_arctic @@ -109,7 +109,7 @@ class mod_arctic extends ModeleNumRefFicheinter { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On d�fini critere recherche compteur $mask=$conf->global->FICHINTER_ARTIC_MASK; diff --git a/htdocs/includes/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php similarity index 96% rename from htdocs/includes/modules/fichinter/mod_pacific.php rename to htdocs/core/modules/fichinter/mod_pacific.php index 8d98806c26e..6102a682532 100644 --- a/htdocs/includes/modules/fichinter/mod_pacific.php +++ b/htdocs/core/modules/fichinter/mod_pacific.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/fichinter/mod_pacific.php + * \file htdocs/core/modules/fichinter/mod_pacific.php * \ingroup fiche intervention * \brief File with Pacific numbering module for interventions */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/modules_fichinter.php"); /** * \class mod_pacific diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php similarity index 96% rename from htdocs/includes/modules/fichinter/modules_fichinter.php rename to htdocs/core/modules/fichinter/modules_fichinter.php index 337ed19a406..a7b4617f000 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/fichinter/modules_fichinter.php + * \file htdocs/core/modules/fichinter/modules_fichinter.php * \ingroup ficheinter * \brief Fichier contenant la classe mere de generation des fiches interventions en PDF * et la classe mere de numerotation des fiches interventions @@ -48,7 +48,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator $type='ficheinter'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -145,7 +145,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='') global $conf,$langs; $langs->load("ficheinter"); - $dir = "/includes/modules/fichinter/"; + $dir = "/core/modules/fichinter/"; // Positionne modele sur le nom du modele de facture a utiliser if (! dol_strlen($modele)) @@ -206,7 +206,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='') function fichinter_delete_preview($db, $fichinterid, $fichinterref='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$fichinterref) { diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/pdf_soleil.modules.php similarity index 97% rename from htdocs/includes/modules/fichinter/pdf_soleil.modules.php rename to htdocs/core/modules/fichinter/pdf_soleil.modules.php index e7cb9256dcd..4e20b9b5749 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/pdf_soleil.modules.php @@ -20,14 +20,14 @@ */ /** - * \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php + * \file htdocs/core/modules/fichinter/pdf_soleil.modules.php * \ingroup ficheinter * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); /** diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php similarity index 98% rename from htdocs/includes/modules/import/import_csv.modules.php rename to htdocs/core/modules/import/import_csv.modules.php index 691c6412612..5d54d64d03a 100644 --- a/htdocs/includes/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -18,13 +18,13 @@ */ /** - * \file htdocs/includes/modules/import/import_csv.modules.php + * \file htdocs/core/modules/import/import_csv.modules.php * \ingroup import * \brief File to load import files with CSV format * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/import/modules_import.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/import/modules_import.php"); /** diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php similarity index 95% rename from htdocs/includes/modules/import/modules_import.php rename to htdocs/core/modules/import/modules_import.php index 9ff2837fae1..3322c6586ea 100644 --- a/htdocs/includes/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/import/modules_import.php + * \file htdocs/core/modules/import/modules_import.php * \ingroup export * \brief File of parent class for import file readers */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** @@ -56,7 +56,7 @@ class ModeleImports { dol_syslog("ModeleImport::liste_modeles"); - $dir=DOL_DOCUMENT_ROOT."/includes/modules/import/"; + $dir=DOL_DOCUMENT_ROOT."/core/modules/import/"; $handle=opendir($dir); // Recherche des fichiers drivers imports disponibles diff --git a/htdocs/core/modules/index.php b/htdocs/core/modules/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/modules/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/includes/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php similarity index 96% rename from htdocs/includes/modules/livraison/mod_livraison_jade.php rename to htdocs/core/modules/livraison/mod_livraison_jade.php index a6d6accb03e..6783ad6a02a 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_jade.php +++ b/htdocs/core/modules/livraison/mod_livraison_jade.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/livraison/mod_livraison_jade.php + * \file htdocs/core/modules/livraison/mod_livraison_jade.php * \ingroup delivery * \brief Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/modules_livraison.php"); /** diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php similarity index 95% rename from htdocs/includes/modules/livraison/mod_livraison_saphir.php rename to htdocs/core/modules/livraison/mod_livraison_saphir.php index 636494ded07..008cbdc3fd8 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php @@ -19,11 +19,11 @@ */ /** - * \file htdocs/includes/modules/livraison/mod_livraison_saphir.php + * \file htdocs/core/modules/livraison/mod_livraison_saphir.php * \ingroup expedition * \brief Fichier contenant la classe du modele de numerotation de reference de livraison Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/modules_livraison.php"); /** * \class mod_livraison_saphir @@ -103,7 +103,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On d�fini critere recherche compteur $mask=$conf->global->LIVRAISON_SAPHIR_MASK; diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php similarity index 96% rename from htdocs/includes/modules/livraison/modules_livraison.php rename to htdocs/core/modules/livraison/modules_livraison.php index 7c71be292ab..ff3009c9d06 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/livraison/modules_livraison.php + * \file htdocs/core/modules/livraison/modules_livraison.php * \ingroup expedition * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons @@ -48,7 +48,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator $type='delivery'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -141,7 +141,7 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='') global $conf,$langs; $langs->load("deliveries"); - $dir = "/includes/modules/livraison/pdf/"; + $dir = "/core/modules/livraison/pdf/"; // Positionne modele sur le nom du modele de bon de livraison a utiliser if (! dol_strlen($model)) @@ -197,7 +197,7 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='') function delivery_order_delete_preview($db, $deliveryid) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $delivery = new Livraison($db,"",$deliveryid); $delivery->fetch($deliveryid); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php similarity index 98% rename from htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php rename to htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php index 8c469e0c147..fa0f8acaec6 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php @@ -20,14 +20,14 @@ */ /** - * \file htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php + * \file htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php * \ingroup livraison * \brief File of class to manage receving receipts with template Sirocco */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php similarity index 98% rename from htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php rename to htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index 9cf0110f305..e65a12aad2f 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -20,16 +20,16 @@ */ /** - * \file htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php + * \file htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php * \ingroup livraison * \brief File of class to manage receving receipts with template Typhon * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/mailings/.cvsignore b/htdocs/core/modules/mailings/.cvsignore similarity index 100% rename from htdocs/includes/modules/mailings/.cvsignore rename to htdocs/core/modules/mailings/.cvsignore diff --git a/htdocs/includes/modules/mailings/README b/htdocs/core/modules/mailings/README similarity index 93% rename from htdocs/includes/modules/mailings/README rename to htdocs/core/modules/mailings/README index d277105cf58..096f680bd38 100644 --- a/htdocs/includes/modules/mailings/README +++ b/htdocs/core/modules/mailings/README @@ -11,9 +11,9 @@ to add you own email predefined selector: ***** STEP 1 ***** Copy file -htdocs/includes/modules/mailings/example.modules.php +htdocs/core/modules/mailings/example.modules.php into -htdocs/includes/modules/mailings/myselector.modules.php +htdocs/core/modules/mailings/myselector.modules.php You can choose value of your choice instead of "myselector" in name of new file. diff --git a/htdocs/includes/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php similarity index 98% rename from htdocs/includes/modules/mailings/contacts1.modules.php rename to htdocs/core/modules/mailings/contacts1.modules.php index e5210efbe40..5b7b04d95c1 100755 --- a/htdocs/includes/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/mailings/contacts1.modules.php + * \file htdocs/core/modules/mailings/contacts1.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Poire'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/contacts2.modules.php rename to htdocs/core/modules/mailings/contacts2.modules.php index 250e1ece1f1..17a1fd2a217 100755 --- a/htdocs/includes/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/mailings/contacts2.modules.php + * \file htdocs/core/modules/mailings/contacts2.modules.php * \ingroup mailing * \brief Provides a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php similarity index 98% rename from htdocs/includes/modules/mailings/contacts3.modules.php rename to htdocs/core/modules/mailings/contacts3.modules.php index 80ea22a5696..b776bfdb796 100755 --- a/htdocs/includes/modules/mailings/contacts3.modules.php +++ b/htdocs/core/modules/mailings/contacts3.modules.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/mailings/contacts3.modules.php + * \file htdocs/core/modules/mailings/contacts3.modules.php * \ingroup mailing * \brief Provides a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php similarity index 96% rename from htdocs/includes/modules/mailings/example.modules.php rename to htdocs/core/modules/mailings/example.modules.php index 47d7029c8db..d82611174d7 100644 --- a/htdocs/includes/modules/mailings/example.modules.php +++ b/htdocs/core/modules/mailings/example.modules.php @@ -9,12 +9,12 @@ */ /** - * \file htdocs/includes/modules/mailings/example.modules.php + * \file htdocs/core/modules/mailings/example.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; // CHANGE THIS: Class name must be called mailing_xxx with xxx=name of your selector diff --git a/htdocs/includes/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php similarity index 98% rename from htdocs/includes/modules/mailings/fraise.modules.php rename to htdocs/core/modules/mailings/fraise.modules.php index 60a28853844..997522d669e 100644 --- a/htdocs/includes/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/mailings/fraise.modules.php + * \file htdocs/core/modules/mailings/fraise.modules.php * \ingroup mailing * \brief File of class to generate target according to rule Fraise */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; diff --git a/htdocs/includes/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/framboise.modules.php rename to htdocs/core/modules/mailings/framboise.modules.php index 08ffd5e0834..90f2cc77388 100644 --- a/htdocs/includes/modules/mailings/framboise.modules.php +++ b/htdocs/core/modules/mailings/framboise.modules.php @@ -10,12 +10,12 @@ */ /** - * \file htdocs/includes/modules/mailings/framboise.modules.php + * \file htdocs/core/modules/mailings/framboise.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php similarity index 97% rename from htdocs/includes/modules/mailings/modules_mailings.php rename to htdocs/core/modules/mailings/modules_mailings.php index 115ce374c2e..b58b2d94d0e 100644 --- a/htdocs/includes/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -19,11 +19,11 @@ */ /** - * \file htdocs/includes/modules/mailings/modules_mailings.php + * \file htdocs/core/modules/mailings/modules_mailings.php * \ingroup mailing * \brief File with parent class of emailing target selectors modules */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/core/modules/mailings/peche.modules.php similarity index 95% rename from htdocs/includes/modules/mailings/peche.modules.php rename to htdocs/core/modules/mailings/peche.modules.php index d902a13c86a..c0894917e17 100644 --- a/htdocs/includes/modules/mailings/peche.modules.php +++ b/htdocs/core/modules/mailings/peche.modules.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/mailings/peche.modules.php + * \file htdocs/core/modules/mailings/peche.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Peche'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); /** @@ -104,7 +104,7 @@ class mailing_peche extends MailingTargets { global $conf,$langs,$_FILES; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // For compatibility with Unix, MS-Dos or Macintosh ini_set('auto_detect_line_endings', true); diff --git a/htdocs/includes/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/pomme.modules.php rename to htdocs/core/modules/mailings/pomme.modules.php index 2a0674c653e..41dfe8514f3 100644 --- a/htdocs/includes/modules/mailings/pomme.modules.php +++ b/htdocs/core/modules/mailings/pomme.modules.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/mailings/pomme.modules.php + * \file htdocs/core/modules/mailings/pomme.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Pomme'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php similarity index 97% rename from htdocs/includes/modules/mailings/thirdparties.modules.php rename to htdocs/core/modules/mailings/thirdparties.modules.php index 9c5ffbe167b..45b6318272d 100755 --- a/htdocs/includes/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -10,12 +10,12 @@ */ /** - * \file htdocs/includes/modules/mailings/thirdparties.modules.php + * \file htdocs/core/modules/mailings/thirdparties.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; /** diff --git a/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php similarity index 96% rename from htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php rename to htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index 478cfca9dd0..abaee5eeca7 100755 --- a/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -9,12 +9,12 @@ */ /** - * \file htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php + * \file htdocs/core/modules/mailings/thirdparties_services_expired.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'services expired'. */ -include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); /** diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/core/modules/member/cards/modules_cards.php similarity index 92% rename from htdocs/includes/modules/member/cards/modules_cards.php rename to htdocs/core/modules/member/cards/modules_cards.php index 3c82740f53b..119d675f912 100644 --- a/htdocs/includes/modules/member/cards/modules_cards.php +++ b/htdocs/core/modules/member/cards/modules_cards.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/member/cards/modules_cards.php + * \file htdocs/core/modules/member/cards/modules_cards.php * \ingroup member * \brief File of parent class of document generator for members cards. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); @@ -49,7 +49,7 @@ class ModelePDFCards $type='members_card'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -70,7 +70,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs) global $conf,$langs; $langs->load("members"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/member/cards/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/member/cards/"; // Positionne modele sur le nom du modele a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/core/modules/member/cards/pdf_standard.class.php similarity index 98% rename from htdocs/includes/modules/member/cards/pdf_standard.class.php rename to htdocs/core/modules/member/cards/pdf_standard.class.php index 9640abf5da4..b058855a697 100644 --- a/htdocs/includes/modules/member/cards/pdf_standard.class.php +++ b/htdocs/core/modules/member/cards/pdf_standard.class.php @@ -53,7 +53,7 @@ //////////////////////////////////////////////////// /** - * \file htdocs/includes/modules/member/cards/pdf_standard.class.php + * \file htdocs/core/modules/member/cards/pdf_standard.class.php * \ingroup member * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise * \author Steve Dillon @@ -62,8 +62,8 @@ * \author Jean Louis Bergamo. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); /** diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/core/modules/member/labels/modules_labels.php similarity index 92% rename from htdocs/includes/modules/member/labels/modules_labels.php rename to htdocs/core/modules/member/labels/modules_labels.php index 144619964ec..49fd8d06750 100644 --- a/htdocs/includes/modules/member/labels/modules_labels.php +++ b/htdocs/core/modules/member/labels/modules_labels.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/member/labels/modules_labels.php + * \file htdocs/core/modules/member/labels/modules_labels.php * \ingroup member * \brief File of parent class of document generator for members labels sheets. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); @@ -50,7 +50,7 @@ class ModelePDFLabels $type='members_labels'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -72,7 +72,7 @@ function members_label_pdf_create($db, $arrayofmembers, $modele, $outputlangs) global $conf,$langs; $langs->load("members"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/member/labels/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/member/labels/"; // Positionne modele sur le nom du modele a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/core/modules/member/labels/pdf_standardlabel.class.php similarity index 98% rename from htdocs/includes/modules/member/labels/pdf_standardlabel.class.php rename to htdocs/core/modules/member/labels/pdf_standardlabel.class.php index f9d4733722b..85cba5f324a 100644 --- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php +++ b/htdocs/core/modules/member/labels/pdf_standardlabel.class.php @@ -53,7 +53,7 @@ //////////////////////////////////////////////////// /** - * \file htdocs/includes/modules/member/labels/pdf_standardlabel.class.php + * \file htdocs/core/modules/member/labels/pdf_standardlabel.class.php * \ingroup member * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise * \author Steve Dillon @@ -62,8 +62,8 @@ * \author Jean Louis Bergamo. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); /** diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php similarity index 97% rename from htdocs/includes/modules/modAccounting.class.php rename to htdocs/core/modules/modAccounting.class.php index e46f3ba0411..dfa07932052 100644 --- a/htdocs/includes/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -21,12 +21,12 @@ /** * \defgroup accounting Module accounting * \brief Module to include accounting features - * \file htdocs/includes/modules/modAccounting.class.php + * \file htdocs/core/modules/modAccounting.class.php * \ingroup accounting * \brief Fichier de description et activation du module Comptabilite Expert */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php similarity index 98% rename from htdocs/includes/modules/modAdherent.class.php rename to htdocs/core/modules/modAdherent.class.php index b52c26b60ce..0941f24ab19 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -22,12 +22,12 @@ /** * \defgroup member Module foundation * \brief Module to manage members of a foundation - * \file htdocs/includes/modules/modAdherent.class.php + * \file htdocs/core/modules/modAdherent.class.php * \ingroup member * \brief File descriptor or module Member */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modAdherent @@ -205,7 +205,7 @@ class modAdherent extends DolibarrModules $r=0; $now=dol_now(); - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $r++; $this->import_code[$r]=$this->rights_class.'_'.$r; diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php similarity index 99% rename from htdocs/includes/modules/modAgenda.class.php rename to htdocs/core/modules/modAgenda.class.php index 2032fa81379..84c71c08134 100644 --- a/htdocs/includes/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -23,11 +23,11 @@ /** * \defgroup agenda Module agenda * \brief Module pour gerer l'agenda et actions - * \file htdocs/includes/modules/modAgenda.class.php + * \file htdocs/core/modules/modAgenda.class.php * \ingroup agenda * \brief Fichier de description et activation du module agenda */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modAgenda diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php similarity index 98% rename from htdocs/includes/modules/modBanque.class.php rename to htdocs/core/modules/modBanque.class.php index d3bdfc89976..2a5c285c430 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -22,12 +22,12 @@ /** * \defgroup banque Module bank * \brief Module pour gerer la tenue d'un compte bancaire et rapprochements - * \file htdocs/includes/modules/modBanque.class.php + * \file htdocs/core/modules/modBanque.class.php * \ingroup banque * \brief Fichier de description et activation du module Banque */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php similarity index 96% rename from htdocs/includes/modules/modBarcode.class.php rename to htdocs/core/modules/modBarcode.class.php index 94582c37ece..7d50a096163 100644 --- a/htdocs/includes/modules/modBarcode.class.php +++ b/htdocs/core/modules/modBarcode.class.php @@ -20,12 +20,12 @@ /** * \defgroup barcode Module barcode * \brief Module pour gerer les codes barres - * \file htdocs/includes/modules/modBarcode.class.php + * \file htdocs/core/modules/modBarcode.class.php * \ingroup barcode,produit * \brief Fichier de description et activation du module Barcode */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modBarcode diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php similarity index 96% rename from htdocs/includes/modules/modBookmark.class.php rename to htdocs/core/modules/modBookmark.class.php index b02ac6152db..ffd4450cae5 100644 --- a/htdocs/includes/modules/modBookmark.class.php +++ b/htdocs/core/modules/modBookmark.class.php @@ -19,12 +19,12 @@ /** * \defgroup bookmark Module bookmarks * \brief Module to manage Bookmarks - * \file htdocs/includes/modules/modBookmark.class.php + * \file htdocs/core/modules/modBookmark.class.php * \ingroup bookmark * \brief Fichier de description et activation du module Bookmarks */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php similarity index 96% rename from htdocs/includes/modules/modBoutique.class.php rename to htdocs/core/modules/modBoutique.class.php index 3f7c075a246..6c8f33ffd8d 100644 --- a/htdocs/includes/modules/modBoutique.class.php +++ b/htdocs/core/modules/modBoutique.class.php @@ -21,12 +21,12 @@ /** * \defgroup oscommerce Module oscommerce * \brief Module pour gerer une boutique et interface avec OSCommerce - * \file htdocs/includes/modules/modBoutique.class.php + * \file htdocs/core/modules/modBoutique.class.php * \ingroup oscommerce * \brief Fichier de description et activation du module OSCommerce */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php similarity index 97% rename from htdocs/includes/modules/modCashDesk.class.php rename to htdocs/core/modules/modCashDesk.class.php index f7281dabc5a..ab299097588 100644 --- a/htdocs/includes/modules/modCashDesk.class.php +++ b/htdocs/core/modules/modCashDesk.class.php @@ -18,11 +18,11 @@ /** * \defgroup pos Module points of sale * \brief Module to manage points of sale - * \file htdocs/includes/modules/modCashDesk.class.php + * \file htdocs/core/modules/modCashDesk.class.php * \ingroup pos * \brief File to enable/disable module Point Of Sales */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php similarity index 98% rename from htdocs/includes/modules/modCategorie.class.php rename to htdocs/core/modules/modCategorie.class.php index e3e6a8d9759..eff35c10b4a 100644 --- a/htdocs/includes/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -19,11 +19,11 @@ /** * \defgroup category Module categories * \brief Module to manage categories - * \file htdocs/includes/modules/modCategorie.class.php + * \file htdocs/core/modules/modCategorie.class.php * \ingroup category * \brief Fichier de description et activation du module Categorie */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php similarity index 95% rename from htdocs/includes/modules/modClickToDial.class.php rename to htdocs/core/modules/modClickToDial.class.php index 9e990ebf9e5..173961fcc34 100644 --- a/htdocs/includes/modules/modClickToDial.class.php +++ b/htdocs/core/modules/modClickToDial.class.php @@ -19,12 +19,12 @@ /** * \defgroup clicktodial Module clicktodial * \brief Module pour gerer l'appel automatique - * \file htdocs/includes/modules/modClickToDial.class.php + * \file htdocs/core/modules/modClickToDial.class.php * \ingroup clicktodial * \brief Fichier de description et activation du module de click to Dial */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php similarity index 98% rename from htdocs/includes/modules/modCommande.class.php rename to htdocs/core/modules/modCommande.class.php index ed4bc30f242..36b07293dac 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -23,12 +23,12 @@ /** * \defgroup commande Module orders * \brief Module pour gerer le suivi des commandes - * \file htdocs/includes/modules/modCommande.class.php + * \file htdocs/core/modules/modCommande.class.php * \ingroup commande * \brief Fichier de description et activation du module Commande */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php similarity index 96% rename from htdocs/includes/modules/modComptabilite.class.php rename to htdocs/core/modules/modComptabilite.class.php index f7b9143fa14..fd0cb925e1f 100644 --- a/htdocs/includes/modules/modComptabilite.class.php +++ b/htdocs/core/modules/modComptabilite.class.php @@ -21,12 +21,12 @@ /** * \defgroup comptabilite Module comptabilite * \brief Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports) - * \file htdocs/includes/modules/modComptabilite.class.php + * \file htdocs/core/modules/modComptabilite.class.php * \ingroup comptabilite * \brief Fichier de description et activation du module Comptabilite */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php similarity index 96% rename from htdocs/includes/modules/modContrat.class.php rename to htdocs/core/modules/modContrat.class.php index 1b36e2b6524..0de06eb5e6a 100644 --- a/htdocs/includes/modules/modContrat.class.php +++ b/htdocs/core/modules/modContrat.class.php @@ -20,12 +20,12 @@ /** * \defgroup contrat Module contract * \brief Module pour gerer la tenue de contrat de services - * \file htdocs/includes/modules/modContrat.class.php + * \file htdocs/core/modules/modContrat.class.php * \ingroup contrat * \brief Fichier de description et activation du module Contrat */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php similarity index 97% rename from htdocs/includes/modules/modDeplacement.class.php rename to htdocs/core/modules/modDeplacement.class.php index ad338d51724..7803cc623b8 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/core/modules/modDeplacement.class.php @@ -19,11 +19,11 @@ /** * \defgroup deplacement Module trips * \brief Module pour gerer les deplacements et notes de frais - * \file htdocs/includes/modules/modDeplacement.class.php + * \file htdocs/core/modules/modDeplacement.class.php * \ingroup deplacement * \brief Fichier de description et activation du module Deplacement et notes de frais */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modDocument.class.php b/htdocs/core/modules/modDocument.class.php similarity index 96% rename from htdocs/includes/modules/modDocument.class.php rename to htdocs/core/modules/modDocument.class.php index 387079f3148..f20c1a72041 100644 --- a/htdocs/includes/modules/modDocument.class.php +++ b/htdocs/core/modules/modDocument.class.php @@ -20,12 +20,12 @@ /** * \defgroup document Module mass mailings * \brief Module pour gerer des generations de documents - * \file htdocs/includes/modules/modDocument.class.php + * \file htdocs/core/modules/modDocument.class.php * \ingroup document * \brief Fichier de description et activation du module Generation document */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php similarity index 96% rename from htdocs/includes/modules/modDon.class.php rename to htdocs/core/modules/modDon.class.php index afc22ce4cae..e55afc88f89 100644 --- a/htdocs/includes/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -20,12 +20,12 @@ /** * \defgroup don Module donation * \brief Module pour gerer le suivi des dons - * \file htdocs/includes/modules/modDon.class.php + * \file htdocs/core/modules/modDon.class.php * \ingroup don * \brief Fichier de description et activation du module Don */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php similarity index 96% rename from htdocs/includes/modules/modECM.class.php rename to htdocs/core/modules/modECM.class.php index 76dd1bddfa0..feae143c35a 100644 --- a/htdocs/includes/modules/modECM.class.php +++ b/htdocs/core/modules/modECM.class.php @@ -18,12 +18,12 @@ /** \defgroup ecm Module ecm * \brief Module for ECM (Electronic Content Management) - * \file htdocs/includes/modules/modECM.class.php + * \file htdocs/core/modules/modECM.class.php * \ingroup ecm * \brief Description and activation file for module ECM */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modECM @@ -78,7 +78,7 @@ class modECM extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php similarity index 98% rename from htdocs/includes/modules/modExpedition.class.php rename to htdocs/core/modules/modExpedition.class.php index f4e07aa453b..32f419e18d4 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/core/modules/modExpedition.class.php @@ -21,12 +21,12 @@ /** * \defgroup expedition Module shipping * \brief Module pour gerer les expeditions de produits - * \file htdocs/includes/modules/modExpedition.class.php + * \file htdocs/core/modules/modExpedition.class.php * \ingroup expedition * \brief Fichier de description et activation du module Expedition */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php similarity index 95% rename from htdocs/includes/modules/modExport.class.php rename to htdocs/core/modules/modExport.class.php index 00dee4606d9..d3737d89969 100644 --- a/htdocs/includes/modules/modExport.class.php +++ b/htdocs/core/modules/modExport.class.php @@ -19,12 +19,12 @@ /** * \defgroup export Module export * \brief Module generique pour realiser des exports de donnees en base - * \file htdocs/includes/modules/modExport.class.php + * \file htdocs/core/modules/modExport.class.php * \ingroup export * \brief Fichier de description et activation du module export */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modExport diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php similarity index 96% rename from htdocs/includes/modules/modExternalRss.class.php rename to htdocs/core/modules/modExternalRss.class.php index d72158e8597..43e41cbbc1d 100644 --- a/htdocs/includes/modules/modExternalRss.class.php +++ b/htdocs/core/modules/modExternalRss.class.php @@ -19,12 +19,12 @@ /** * \defgroup externalrss Module externalrss * \brief Module pour inclure des informations externes RSS - * \file htdocs/includes/modules/modExternalRss.class.php + * \file htdocs/core/modules/modExternalRss.class.php * \ingroup externalrss * \brief Fichier de description et activation du module externalrss */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modExternalRss diff --git a/htdocs/includes/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php similarity index 95% rename from htdocs/includes/modules/modExternalSite.class.php rename to htdocs/core/modules/modExternalSite.class.php index 271e52f0b0d..004b60a4c49 100644 --- a/htdocs/includes/modules/modExternalSite.class.php +++ b/htdocs/core/modules/modExternalSite.class.php @@ -20,12 +20,12 @@ /** * \defgroup externalsite Module externalsite * \brief Module to include an external web site/tools into Dolibarr menu and into a frame page. - * \file htdocs/includes/modules/modExternalSite.class.php + * \file htdocs/core/modules/modExternalSite.class.php * \ingroup externalsite * \brief Description and activation file for module ExternalSite */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modExternalSite @@ -83,7 +83,7 @@ class modExternalSite extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php similarity index 95% rename from htdocs/includes/modules/modFTP.class.php rename to htdocs/core/modules/modFTP.class.php index c831763f801..dcba440ad40 100644 --- a/htdocs/includes/modules/modFTP.class.php +++ b/htdocs/core/modules/modFTP.class.php @@ -19,12 +19,12 @@ /** * \defgroup ftp Module FTP * \brief Module for FTP client module - * \file htdocs/includes/modules/modFTP.class.php + * \file htdocs/core/modules/modFTP.class.php * \ingroup ftp * \brief Description and activation file for module FTP */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modFTP @@ -82,7 +82,7 @@ class modFTP extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php similarity index 98% rename from htdocs/includes/modules/modFacture.class.php rename to htdocs/core/modules/modFacture.class.php index 48a27f933f4..86f5791dcea 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -22,11 +22,11 @@ /** * \defgroup facture Module invoices * \brief Module pour gerer les factures clients et/ou fournisseurs - * \file htdocs/includes/modules/modFacture.class.php + * \file htdocs/core/modules/modFacture.class.php * \ingroup facture * \brief Fichier de la classe de description et activation du module Facture */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** @@ -214,7 +214,7 @@ class modFacture extends DolibarrModules // Remove permissions and default values $this->remove($options); - require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $dirodt=DOL_DATA_ROOT.'/doctemplates/invoices'; create_exdir($dirodt); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0); diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php similarity index 96% rename from htdocs/includes/modules/modFckeditor.class.php rename to htdocs/core/modules/modFckeditor.class.php index fbdc67e2199..24a07aabaab 100644 --- a/htdocs/includes/modules/modFckeditor.class.php +++ b/htdocs/core/modules/modFckeditor.class.php @@ -20,12 +20,12 @@ /** * \defgroup fckeditor Module fckeditor * \brief Module pour mettre en page les zones de saisie de texte - * \file htdocs/includes/modules/modFckeditor.class.php + * \file htdocs/core/modules/modFckeditor.class.php * \ingroup fckeditor * \brief Fichier de description et activation du module Fckeditor */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php similarity index 98% rename from htdocs/includes/modules/modFicheinter.class.php rename to htdocs/core/modules/modFicheinter.class.php index 1ecfda9cbcf..f5f823851a1 100644 --- a/htdocs/includes/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -23,12 +23,12 @@ /** * \defgroup ficheinter Module intervention cards * \brief Module to manage intervention cards - * \file htdocs/includes/modules/modFicheinter.class.php + * \file htdocs/core/modules/modFicheinter.class.php * \ingroup ficheinter * \brief Fichier de description et activation du module Ficheinter */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php similarity index 99% rename from htdocs/includes/modules/modFournisseur.class.php rename to htdocs/core/modules/modFournisseur.class.php index de6b78c6fc4..1cf445502fd 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -20,11 +20,11 @@ /** * \defgroup fournisseur Module suppliers * \brief Module pour gerer des societes et contacts de type fournisseurs - * \file htdocs/includes/modules/modFournisseur.class.php + * \file htdocs/core/modules/modFournisseur.class.php * \ingroup fournisseur * \brief Fichier de description et activation du module Fournisseur */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php similarity index 96% rename from htdocs/includes/modules/modGeoIPMaxmind.class.php rename to htdocs/core/modules/modGeoIPMaxmind.class.php index 5e3ae85b0a0..0acfc0790ad 100644 --- a/htdocs/includes/modules/modGeoIPMaxmind.class.php +++ b/htdocs/core/modules/modGeoIPMaxmind.class.php @@ -18,12 +18,12 @@ /** * \defgroup geoip Module GeoIP * \brief Module to make geoip conversions - * \file htdocs/includes/modules/modGeoIPMaxmind.class.php + * \file htdocs/core/modules/modGeoIPMaxmind.class.php * \ingroup geoip * \brief File of geoipmaxmind module descriptor */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modGeoIPMaxmind diff --git a/htdocs/includes/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php similarity index 98% rename from htdocs/includes/modules/modGravatar.class.php rename to htdocs/core/modules/modGravatar.class.php index f8730a86d6a..fcf51da987d 100644 --- a/htdocs/includes/modules/modGravatar.class.php +++ b/htdocs/core/modules/modGravatar.class.php @@ -19,11 +19,11 @@ /** * \defgroup gravatar Module gravatar * \brief Module to use Gravatar to show photo of users - * \file htdocs/includes/modules/modGravatar.class.php + * \file htdocs/core/modules/modGravatar.class.php * \ingroup gravatar * \brief Description and activation file for module Gravatar */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modGravatar @@ -94,7 +94,7 @@ class modGravatar extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php similarity index 96% rename from htdocs/includes/modules/modImport.class.php rename to htdocs/core/modules/modImport.class.php index 88a0f350015..613f25d6800 100644 --- a/htdocs/includes/modules/modImport.class.php +++ b/htdocs/core/modules/modImport.class.php @@ -19,12 +19,12 @@ /** * \defgroup import Module import * \brief Module to make generic import of data into dolibarr database - * \file htdocs/includes/modules/modImport.class.php + * \file htdocs/core/modules/modImport.class.php * \ingroup import * \brief Fichier de description et activation du module Import */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modImport diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php similarity index 96% rename from htdocs/includes/modules/modLabel.class.php rename to htdocs/core/modules/modLabel.class.php index dc59b0320ec..0d1a123c1d3 100644 --- a/htdocs/includes/modules/modLabel.class.php +++ b/htdocs/core/modules/modLabel.class.php @@ -19,12 +19,12 @@ /** * \defgroup label Module labels * \brief Module pour gerer les formats d'impression des etiquettes - * \file htdocs/includes/modules/modLabel.class.php + * \file htdocs/core/modules/modLabel.class.php * \ingroup other * \brief Fichier de description et activation du module Label */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php similarity index 96% rename from htdocs/includes/modules/modLdap.class.php rename to htdocs/core/modules/modLdap.class.php index d9b314be602..9334d648e77 100644 --- a/htdocs/includes/modules/modLdap.class.php +++ b/htdocs/core/modules/modLdap.class.php @@ -20,11 +20,11 @@ /** * \defgroup ldap Module ldap * \brief Module to manage LDAP interfaces with contacts or users - * \file htdocs/includes/modules/modLdap.class.php + * \file htdocs/core/modules/modLdap.class.php * \ingroup ldap * \brief File to describe and activate Ldap module */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php similarity index 96% rename from htdocs/includes/modules/modMailing.class.php rename to htdocs/core/modules/modMailing.class.php index 30e1ee96fc3..a6ed37f1f88 100644 --- a/htdocs/includes/modules/modMailing.class.php +++ b/htdocs/core/modules/modMailing.class.php @@ -20,12 +20,12 @@ /** * \defgroup mailing Module emailing * \brief Module to manage EMailings - * \file htdocs/includes/modules/modMailing.class.php + * \file htdocs/core/modules/modMailing.class.php * \ingroup mailing * \brief Fichier de description et activation du module Mailing */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php similarity index 95% rename from htdocs/includes/modules/modNotification.class.php rename to htdocs/core/modules/modNotification.class.php index efb3cfb5038..ca430eab2da 100644 --- a/htdocs/includes/modules/modNotification.class.php +++ b/htdocs/core/modules/modNotification.class.php @@ -19,12 +19,12 @@ /** * \defgroup notification Module email notification * \brief Module pour gerer les notifications (par mail ou autre) - * \file htdocs/includes/modules/modNotification.class.php + * \file htdocs/core/modules/modNotification.class.php * \ingroup notification * \brief Fichier de description et activation du module Notification */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modNotification diff --git a/htdocs/includes/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php similarity index 98% rename from htdocs/includes/modules/modPaybox.class.php rename to htdocs/core/modules/modPaybox.class.php index 059c30fb70b..92299a5b82f 100644 --- a/htdocs/includes/modules/modPaybox.class.php +++ b/htdocs/core/modules/modPaybox.class.php @@ -19,11 +19,11 @@ /** * \defgroup paybox Module paybox * \brief Add integration with Paybox online payment system. - * \file htdocs/includes/modules/modPaybox.class.php + * \file htdocs/core/modules/modPaybox.class.php * \ingroup paybox * \brief Description and activation file for module Paybox */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modPayBox @@ -93,7 +93,7 @@ class modPayBox extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php similarity index 97% rename from htdocs/includes/modules/modPaypal.class.php rename to htdocs/core/modules/modPaypal.class.php index 31abc711e94..b9589227a2e 100644 --- a/htdocs/includes/modules/modPaypal.class.php +++ b/htdocs/core/modules/modPaypal.class.php @@ -20,11 +20,11 @@ /** * \defgroup paypal Module paypal * \brief Add integration with Paypal online payment system. - * \file htdocs/includes/modules/modPaypal.class.php + * \file htdocs/core/modules/modPaypal.class.php * \ingroup paypal * \brief Description and activation file for module Paypal */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modPaypal @@ -94,7 +94,7 @@ class modPaypal extends DolibarrModules $this->boxes = array(); // List of boxes $r=0; - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. + // Add here list of php file(s) stored in core/boxes that contains class to show a box. // Example: //$this->boxes[$r][1] = "myboxa.php"; //$r++; diff --git a/htdocs/includes/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php similarity index 96% rename from htdocs/includes/modules/modPrelevement.class.php rename to htdocs/core/modules/modPrelevement.class.php index 2a71750dfaf..87198e9641c 100644 --- a/htdocs/includes/modules/modPrelevement.class.php +++ b/htdocs/core/modules/modPrelevement.class.php @@ -21,12 +21,12 @@ /** * \defgroup prelevement Module prelevement * \brief Module de gestion des prelevements bancaires - * \file htdocs/includes/modules/modPrelevement.class.php + * \file htdocs/core/modules/modPrelevement.class.php * \ingroup prelevement * \brief Fichier de description et activation du module Prelevement */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php similarity index 98% rename from htdocs/includes/modules/modProduct.class.php rename to htdocs/core/modules/modProduct.class.php index 76ce02a7055..c0510190c50 100644 --- a/htdocs/includes/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -22,12 +22,12 @@ /** * \defgroup produit Module products * \brief Module pour gerer le suivi de produits predefinis - * \file htdocs/includes/modules/modProduct.class.php + * \file htdocs/core/modules/modProduct.class.php * \ingroup produit * \brief Fichier de description et activation du module Produit */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php similarity index 97% rename from htdocs/includes/modules/modProjet.class.php rename to htdocs/core/modules/modProjet.class.php index 0da0ba4dc31..a00d3d4b826 100644 --- a/htdocs/includes/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -22,12 +22,12 @@ /** * \defgroup projet Module project * \brief Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks. - * \file htdocs/includes/modules/modProjet.class.php + * \file htdocs/core/modules/modProjet.class.php * \ingroup projet * \brief Fichier de description et activation du module Projet */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php similarity index 98% rename from htdocs/includes/modules/modPropale.class.php rename to htdocs/core/modules/modPropale.class.php index c3f5d9cb7ad..3d67b95afa7 100644 --- a/htdocs/includes/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -22,12 +22,12 @@ /** * \defgroup propale Module commercial proposals * \brief Module pour gerer la tenue de propositions commerciales - * \file htdocs/includes/modules/modPropale.class.php + * \file htdocs/core/modules/modPropale.class.php * \ingroup propale * \brief Fichier de description et activation du module Propale */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/core/modules/modService.class.php similarity index 97% rename from htdocs/includes/modules/modService.class.php rename to htdocs/core/modules/modService.class.php index 7ea8a47d8a1..7a24697eb1a 100644 --- a/htdocs/includes/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -23,12 +23,12 @@ /** * \defgroup service Module services * \brief Module pour gerer le suivi de services predefinis - * \file htdocs/includes/modules/modService.class.php + * \file htdocs/core/modules/modService.class.php * \ingroup service * \brief Fichier de description et activation du module Service */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** \class modService diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php similarity index 98% rename from htdocs/includes/modules/modSociete.class.php rename to htdocs/core/modules/modSociete.class.php index d02511f7cdf..43946280014 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -22,12 +22,12 @@ /** * \defgroup societe Module societe * \brief Module to manage third parties (customers, prospects) - * \file htdocs/includes/modules/modSociete.class.php + * \file htdocs/core/modules/modSociete.class.php * \ingroup societe * \brief Fichier de description et activation du module Societe */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** @@ -305,7 +305,7 @@ class modSociete extends DolibarrModules // We disable this to prevent pb of modules not correctly disabled //$this->remove($options); - require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $dirodt=DOL_DATA_ROOT.'/doctemplates/thirdparties'; create_exdir($dirodt); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0); diff --git a/htdocs/includes/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php similarity index 97% rename from htdocs/includes/modules/modStock.class.php rename to htdocs/core/modules/modStock.class.php index debff8f49a0..f1a5d89f0eb 100644 --- a/htdocs/includes/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -20,12 +20,12 @@ /** * \defgroup stock Module stocks * \brief Module pour gerer la tenue de stocks produits - * \file htdocs/includes/modules/modStock.class.php + * \file htdocs/core/modules/modStock.class.php * \ingroup stock * \brief Fichier de description et activation du module Stock */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php similarity index 96% rename from htdocs/includes/modules/modSyslog.class.php rename to htdocs/core/modules/modSyslog.class.php index 1a362f43079..2a2c726fad4 100644 --- a/htdocs/includes/modules/modSyslog.class.php +++ b/htdocs/core/modules/modSyslog.class.php @@ -19,12 +19,12 @@ /** * \defgroup syslog Module syslog * \brief Module pour gerer les messages d'erreur dans syslog - * \file htdocs/includes/modules/modSyslog.class.php + * \file htdocs/core/modules/modSyslog.class.php * \ingroup syslog * \brief Fichier de description et activation du module de syslog */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modSyslog diff --git a/htdocs/includes/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php similarity index 94% rename from htdocs/includes/modules/modTax.class.php rename to htdocs/core/modules/modTax.class.php index 85ac5c20fba..cc18764e2a6 100644 --- a/htdocs/includes/modules/modTax.class.php +++ b/htdocs/core/modules/modTax.class.php @@ -23,12 +23,12 @@ /** * \defgroup tax Module taxes * \brief Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales - * \file htdocs/includes/modules/modTax.class.php + * \file htdocs/core/modules/modTax.class.php * \ingroup tax * \brief Fichier de description et activation du module Taxe */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php similarity index 98% rename from htdocs/includes/modules/modUser.class.php rename to htdocs/core/modules/modUser.class.php index c6e4d87b3e0..952efb9f25f 100644 --- a/htdocs/includes/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -20,12 +20,12 @@ /** * \defgroup user Module user management * \brief Module pour gerer les utilisateurs - * \file htdocs/includes/modules/modUser.class.php + * \file htdocs/core/modules/modUser.class.php * \ingroup user * \brief Fichier de description et activation du module Utilisateur */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modUser diff --git a/htdocs/includes/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php similarity index 96% rename from htdocs/includes/modules/modWebServices.class.php rename to htdocs/core/modules/modWebServices.class.php index 8915922e100..6b0cdf0d347 100644 --- a/htdocs/includes/modules/modWebServices.class.php +++ b/htdocs/core/modules/modWebServices.class.php @@ -18,12 +18,12 @@ /** * \defgroup webservices Module webservices * \brief Module to enable the Dolibarr server of web services - * \file htdocs/includes/modules/modWebServices.class.php + * \file htdocs/core/modules/modWebServices.class.php * \ingroup webservices * \brief File to describe webservices module */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** * \class modWebServices diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php similarity index 96% rename from htdocs/includes/modules/modWorkflow.class.php rename to htdocs/core/modules/modWorkflow.class.php index 3391e6a7986..e4d66941ee0 100644 --- a/htdocs/includes/modules/modWorkflow.class.php +++ b/htdocs/core/modules/modWorkflow.class.php @@ -19,12 +19,12 @@ /** * \defgroup workflow Module workflow * \brief Workflow management - * \file htdocs/includes/modules/modWorkflow.class.php + * \file htdocs/core/modules/modWorkflow.class.php * \ingroup workflow * \brief File to describe and activate module Workflow */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); +include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** @@ -65,7 +65,7 @@ class modWorkflow extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='technic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/core/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php similarity index 96% rename from htdocs/includes/modules/project/mod_project_simple.php rename to htdocs/core/modules/project/mod_project_simple.php index e92cb1c5518..4547fb3a8a9 100644 --- a/htdocs/includes/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/project/mod_project_simple.php + * \file htdocs/core/modules/project/mod_project_simple.php * \ingroup project * \brief File with class to manage the numbering module Simple for project references */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/modules_project.php"); /** diff --git a/htdocs/includes/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php similarity index 95% rename from htdocs/includes/modules/project/mod_project_universal.php rename to htdocs/core/modules/project/mod_project_universal.php index 77a155ef305..a8564be3091 100644 --- a/htdocs/includes/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/project/mod_project_universal.php + * \file htdocs/core/modules/project/mod_project_universal.php * \ingroup project * \brief Fichier contenant la classe du modele de numerotation de reference de projet Universal */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/modules_project.php"); /** @@ -106,7 +106,7 @@ class mod_project_universal extends ModeleNumRefProjects { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On defini critere recherche compteur $mask=$conf->global->PROJECT_UNIVERSAL_MASK; diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php similarity index 95% rename from htdocs/includes/modules/project/modules_project.php rename to htdocs/core/modules/project/modules_project.php index 3702c6333cb..a61b6301931 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/project/modules_project.php + * \file htdocs/core/modules/project/modules_project.php * \ingroup project * \brief File that contain parent class for projects models * and parent class for projects numbering models @@ -45,7 +45,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator $type='project'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -143,7 +143,7 @@ function project_pdf_create($db, $object, $model,$outputlangs) global $conf,$langs; $langs->load("projects"); - $dir = DOL_DOCUMENT_ROOT."/includes/modules/project/pdf/"; + $dir = DOL_DOCUMENT_ROOT."/core/modules/project/pdf/"; // Positionne modele sur le nom du modele de projet a utiliser if (! dol_strlen($model)) @@ -205,7 +205,7 @@ function project_pdf_create($db, $object, $model,$outputlangs) function project_delete_preview($db, $objectid) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $project = new Project($db); $project->fetch($objectid); diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php similarity index 98% rename from htdocs/includes/modules/project/pdf/pdf_baleine.modules.php rename to htdocs/core/modules/project/pdf/pdf_baleine.modules.php index a5ef42508a5..d5c163c12c6 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php @@ -17,17 +17,17 @@ */ /** - * \file htdocs/includes/modules/project/pdf/pdf_baleine.modules.php + * \file htdocs/core/modules/project/pdf/pdf_baleine.modules.php * \ingroup project * \brief Fichier de la classe permettant de generer les projets au modele Baleine * \author Regis Houssin */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/project/modules_project.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php similarity index 96% rename from htdocs/includes/modules/propale/mod_propale_marbre.php rename to htdocs/core/modules/propale/mod_propale_marbre.php index 1fbf784d874..7a0bad694c4 100644 --- a/htdocs/includes/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/propale/mod_propale_marbre.php + * \file htdocs/core/modules/propale/mod_propale_marbre.php * \ingroup propale * \brief File of class to manage commercial proposal numbering rules Marbre */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/modules_propale.php"); /** \class mod_propale_marbre diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php similarity index 94% rename from htdocs/includes/modules/propale/mod_propale_saphir.php rename to htdocs/core/modules/propale/mod_propale_saphir.php index 5bc97f28988..956827dd523 100644 --- a/htdocs/includes/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/propale/mod_propale_saphir.php + * \file htdocs/core/modules/propale/mod_propale_saphir.php * \ingroup propale * \brief File that contains the numbering module rules Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/modules_propale.php"); /** @@ -105,7 +105,7 @@ class mod_propale_saphir extends ModeleNumRefPropales { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On defini critere recherche compteur $mask=$conf->global->PROPALE_SAPHIR_MASK; diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php similarity index 97% rename from htdocs/includes/modules/propale/modules_propale.php rename to htdocs/core/modules/propale/modules_propale.php index 1abb4dfc622..10480c1d3d9 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/includes/modules/propale/modules_propale.php + * \file htdocs/core/modules/propale/modules_propale.php * \ingroup propale * \brief Fichier contenant la classe mere de generation des propales en PDF * et la classe mere de numerotation des propales @@ -49,7 +49,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator $type='propal'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -145,7 +145,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, global $conf,$user,$langs; $langs->load("propale"); - $dir = "/includes/modules/propale/"; + $dir = "/core/modules/propale/"; $srctemplatepath=''; $modelisok=0; @@ -248,7 +248,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, function propale_delete_preview($db, $propalid, $propalref='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$propalref) { diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/core/modules/propale/pdf_propale_azur.modules.php similarity index 99% rename from htdocs/includes/modules/propale/pdf_propale_azur.modules.php rename to htdocs/core/modules/propale/pdf_propale_azur.modules.php index f07b2b13dc2..34b41f44e52 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/core/modules/propale/pdf_propale_azur.modules.php @@ -20,16 +20,16 @@ */ /** - * \file htdocs/includes/modules/propale/pdf_propale_azur.modules.php + * \file htdocs/core/modules/propale/pdf_propale_azur.modules.php * \ingroup propale * \brief Fichier de la classe permettant de generer les propales au modele Azur * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/core/modules/propale/pdf_propale_jaune.modules.php similarity index 99% rename from htdocs/includes/modules/propale/pdf_propale_jaune.modules.php rename to htdocs/core/modules/propale/pdf_propale_jaune.modules.php index e03dffeae5d..92acc9a56c6 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/core/modules/propale/pdf_propale_jaune.modules.php @@ -20,16 +20,16 @@ */ /** - * \file htdocs/includes/modules/propale/pdf_propale_jaune.modules.php + * \file htdocs/core/modules/propale/pdf_propale_jaune.modules.php * \ingroup propale * \brief Fichier de la classe permettant de generer les propales au modele Jaune * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php similarity index 97% rename from htdocs/includes/modules/rapport/pdf_paiement.class.php rename to htdocs/core/modules/rapport/pdf_paiement.class.php index 8b05950d414..238655ab18c 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/rapport/pdf_paiement.class.php + * \file htdocs/core/modules/rapport/pdf_paiement.class.php * \ingroup banque * \brief File to build payment reports */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** @@ -74,7 +74,7 @@ class pdf_paiement */ function write_file($_dir, $month, $year, $outputlangs) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); global $user,$langs,$conf; diff --git a/htdocs/includes/modules/security/generate/README b/htdocs/core/modules/security/generate/README similarity index 89% rename from htdocs/includes/modules/security/generate/README rename to htdocs/core/modules/security/generate/README index 15aa41188ba..c47cee09469 100755 --- a/htdocs/includes/modules/security/generate/README +++ b/htdocs/core/modules/security/generate/README @@ -11,9 +11,9 @@ to add you own password generator: ***** STEP 1 ***** Copy file -htdocs/includes/modules/security/modGeneratePassNone.class.php +htdocs/core/modules/security/modGeneratePassNone.class.php into -htdocs/includes/modules/mailings/modMyGenerator.class.php +htdocs/core/modules/mailings/modMyGenerator.class.php You can choose value of your choice instead of "myGenerator" in name of new file. diff --git a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php similarity index 92% rename from htdocs/includes/modules/security/generate/modGeneratePassNone.class.php rename to htdocs/core/modules/security/generate/modGeneratePassNone.class.php index 8e909ec0cb1..95debcd7058 100644 --- a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/security/generate/modGeneratePassNone.class.php + * \file htdocs/core/modules/security/generate/modGeneratePassNone.class.php * \ingroup core * \brief File to manage no password generation. */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/security/generate/modules_genpassword.php"); /** diff --git a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php similarity index 93% rename from htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php rename to htdocs/core/modules/security/generate/modGeneratePassStandard.class.php index 17687b914a9..76ec32db477 100644 --- a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php @@ -17,12 +17,12 @@ */ /** - * \file htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php + * \file htdocs/core/modules/security/generate/modGeneratePassStandard.class.php * \ingroup core * \brief File to manage password generation according to standard rule */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/security/generate/modules_genpassword.php"); /** diff --git a/htdocs/includes/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php similarity index 93% rename from htdocs/includes/modules/security/generate/modules_genpassword.php rename to htdocs/core/modules/security/generate/modules_genpassword.php index e462a76e850..82022024572 100644 --- a/htdocs/includes/modules/security/generate/modules_genpassword.php +++ b/htdocs/core/modules/security/generate/modules_genpassword.php @@ -17,11 +17,11 @@ */ /** - * \file htdocs/includes/modules/security/generate/modules_genpassword.php + * \file htdocs/core/modules/security/generate/modules_genpassword.php * \ingroup core * \brief File with parent class for password generating classes */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php similarity index 97% rename from htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php rename to htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index d5445f970c9..76fb65db8c7 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -17,16 +17,16 @@ */ /** - * \file htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php + * \file htdocs/core/modules/societe/doc/doc_generic_odt.modules.php * \ingroup societe * \brief File of class to build ODT documents for third parties * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php similarity index 96% rename from htdocs/includes/modules/societe/mod_codeclient_elephant.php rename to htdocs/core/modules/societe/mod_codeclient_elephant.php index f89e743fc15..9f1728a594e 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -20,12 +20,12 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codeclient_elephant.php + * \file htdocs/core/modules/societe/mod_codeclient_elephant.php * \ingroup societe * \brief File of class to manage third party code with elephant rule */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** @@ -158,7 +158,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // Get Mask value $mask = ''; @@ -227,7 +227,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { global $conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); $result=0; $code = strtoupper(trim($code)); diff --git a/htdocs/includes/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php similarity index 95% rename from htdocs/includes/modules/societe/mod_codeclient_leopard.php rename to htdocs/core/modules/societe/mod_codeclient_leopard.php index 8a425a929ad..40fd8752585 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codeclient_leopard.php + * \file htdocs/core/modules/societe/mod_codeclient_leopard.php * \ingroup societe * \brief Fichier de la classe des gestion leopard des codes clients */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php similarity index 97% rename from htdocs/includes/modules/societe/mod_codeclient_monkey.php rename to htdocs/core/modules/societe/mod_codeclient_monkey.php index 4dff34fb761..293b924be26 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codeclient_monkey.php + * \file htdocs/core/modules/societe/mod_codeclient_monkey.php * \ingroup societe * \brief Fichier de la classe des gestion lion des codes clients */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php similarity index 97% rename from htdocs/includes/modules/societe/mod_codecompta_aquarium.php rename to htdocs/core/modules/societe/mod_codecompta_aquarium.php index 3ca26693809..e4b94e0b75a 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -19,11 +19,11 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codecompta_aquarium.php + * \file htdocs/core/modules/societe/mod_codecompta_aquarium.php * \ingroup societe * \brief File of class to manage accountancy code of thirdparties with Panicum rules */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php similarity index 93% rename from htdocs/includes/modules/societe/mod_codecompta_panicum.php rename to htdocs/core/modules/societe/mod_codecompta_panicum.php index a4c57c41dee..06ad0d17a78 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php @@ -18,11 +18,11 @@ */ /** - * \file htdocs/includes/modules/societe/mod_codecompta_panicum.php + * \file htdocs/core/modules/societe/mod_codecompta_panicum.php * \ingroup societe * \brief File of class to manage accountancy code of thirdparties with Panicum rules */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); /** diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php similarity index 98% rename from htdocs/includes/modules/societe/modules_societe.class.php rename to htdocs/core/modules/societe/modules_societe.class.php index 847ce2be69f..f674b4fb11f 100644 --- a/htdocs/includes/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/includes/modules/societe/modules_societe.class.php + * \file htdocs/core/modules/societe/modules_societe.class.php * \ingroup societe * \brief File with parent class of submodules to manage numbering and document generation */ @@ -47,7 +47,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator $type='company'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -364,7 +364,7 @@ function thirdparty_doc_create($db, $id, $message, $modele, $outputlangs) global $conf,$langs; $langs->load("bills"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/societe/doc"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/societe/doc"; $srctemplatepath=''; // Positionne modele sur le nom du modele a utiliser diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php similarity index 93% rename from htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php rename to htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index 387d4b3bb05..aab5c6b2d9e 100755 --- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php + * \file htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php * \ingroup facture fourniseur * \brief File that contain parent class for supplier invoices models */ @@ -45,7 +45,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator $type='invoice_supplier'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -68,7 +68,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs) $langs->load("suppliers"); - $dir = DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/pdf/"; + $dir = DOL_DOCUMENT_ROOT."/core/modules/supplier_invoice/pdf/"; // Positionne modele sur le nom du modele de invoice fournisseur a utiliser if (! dol_strlen($model)) @@ -128,7 +128,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs) function supplier_invoice_delete_preview($db, $objectid) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $comfourn = new FactureFournisseur($db); $comfourn->fetch($objectid); diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php similarity index 99% rename from htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php rename to htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 73ea0760690..c80ad2266e4 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -18,16 +18,16 @@ */ /** - * \file htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php + * \file htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php * \ingroup fournisseur * \brief Class file to generate the supplier invoices with the canelle model */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_facturefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/supplier_invoice/modules_facturefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php similarity index 95% rename from htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php rename to htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php index 61f3da21f35..ed6bc8e7f17 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php + * \file htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/supplier_order/modules_commandefournisseur.php"); /** \class mod_commande_fournisseur_muguet diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php similarity index 94% rename from htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php rename to htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php index 2ed2b3ebb5a..a8b0e1f0720 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -19,12 +19,12 @@ */ /** - * \file htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php + * \file htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/modules/supplier_order/modules_commandefournisseur.php"); /** @@ -105,7 +105,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On defini critere recherche compteur $mask=$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK; diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php similarity index 96% rename from htdocs/includes/modules/supplier_order/modules_commandefournisseur.php rename to htdocs/core/modules/supplier_order/modules_commandefournisseur.php index 001439747ee..e7d06c4192a 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/includes/modules/supplier_order/modules_commandefournisseur.php + * \file htdocs/core/modules/supplier_order/modules_commandefournisseur.php * \ingroup commande * \brief File that contain parent class for supplier orders models * and parent class for supplier orders numbering models @@ -51,7 +51,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator $type='order_supplier'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; @@ -153,7 +153,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta global $conf,$langs; $langs->load("suppliers"); - $dir = "/includes/modules/supplier_order/pdf/"; + $dir = "/core/modules/supplier_order/pdf/"; $srctemplatepath=''; $modelisok=0; $liste=array(); @@ -235,7 +235,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta function supplier_order_delete_preview($db, $comfournid, $comfournref='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$comfournref) { diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php similarity index 98% rename from htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php rename to htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 108acd8e506..625dbdee60c 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -20,16 +20,16 @@ */ /** - * \file htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php + * \file htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php * \ingroup fournisseur * \brief Fichier de la classe permettant de generer les commandes fournisseurs au modele Muscadet */ -require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/supplier_order/modules_commandefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 01b7887f2ec..fbde981779c 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -34,8 +34,8 @@ //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); $langs->load("products"); @@ -130,7 +130,7 @@ if ($_POST["action"] == 'confirm_crop') * View */ -llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/lib/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css')); +llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css')); print_fiche_titre($langs->trans("ImageEditor")); diff --git a/htdocs/core/tpl/ajaxeditinplace.tpl.php b/htdocs/core/tpl/ajaxeditinplace.tpl.php new file mode 100644 index 00000000000..89c8ff27fe2 --- /dev/null +++ b/htdocs/core/tpl/ajaxeditinplace.tpl.php @@ -0,0 +1,45 @@ + + * + * 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 2 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 . + * + */ +?> + + + + \ No newline at end of file diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php index ef15dd62a04..ca7dee493b2 100644 --- a/htdocs/core/tpl/ajaxrow.tpl.php +++ b/htdocs/core/tpl/ajaxrow.tpl.php @@ -36,7 +36,7 @@ jQuery(document).ready(function(){ var table_element_line = "table_element_line; ?>"; var fk_element = "fk_element; ?>"; var element_id = "id; ?>"; - jQuery.get("/core/ajaxrow.php", + jQuery.get("/core/ajax/row.php", { roworder: roworder, table_element_line: table_element_line, diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index 8f8a4c8c68b..92b2d03868c 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -53,7 +53,7 @@ } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php index a17b510fc21..666d9945ccf 100644 --- a/htdocs/core/tpl/freeproductline_edit.tpl.php +++ b/htdocs/core/tpl/freeproductline_edit.tpl.php @@ -47,7 +47,7 @@ // editeur wysiwyg $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor->Create(); ?> diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 912ea58e1c0..b035f3af6e9 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -131,7 +131,7 @@ jQuery(document).ready(function () {
'; - print ''."\n"; + print ''."\n"; print ''."\n"; + print ''."\n"; } else { @@ -157,15 +157,15 @@ function displayBox($selectedDate,$month,$year){
<< ','','','defaultlang ?>')">< ','','defaultlang ?>')"> ','','','defaultlang ?>')">> >>
trans("ShortSunday") ?>'; print $langs->trans("ActionsAskedBy"); print '  '; - print $form->select_users($filtera,'userasked',1,'',!$canedit); + print $form->select_dolusers($filtera,'userasked',1,'',!$canedit); print '
'; print $langs->trans("or").' '.$langs->trans("ActionsToDoBy"); print '  '; - print $form->select_users($filtert,'usertodo',1,'',!$canedit); + print $form->select_dolusers($filtert,'usertodo',1,'',!$canedit); print '
'; print $langs->trans("or").' '.$langs->trans("ActionsDoneBy"); print '  '; - print $form->select_users($filterd,'userdone',1,'',!$canedit); + print $form->select_dolusers($filterd,'userdone',1,'',!$canedit); + print '
'; + print $langs->trans("Type"); + print '  '; + print $htmlactions->select_type_actions(GETPOST('actioncode'), "actioncode"); print '
- +
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 49a68a6af6f..ca0159dc4bd 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -94,7 +94,7 @@ function donnefocus() { - +
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index 4660a93589d..cbef00b611d 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -60,7 +60,7 @@ } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php index d417c6bb36d..f80c927aba9 100644 --- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.php @@ -57,7 +57,7 @@ // editeur wysiwyg $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor->Create(); ?> diff --git a/htdocs/includes/triggers/README b/htdocs/core/triggers/README similarity index 88% rename from htdocs/includes/triggers/README rename to htdocs/core/triggers/README index a5e9bda9f17..b54c3809ab1 100644 --- a/htdocs/includes/triggers/README +++ b/htdocs/core/triggers/README @@ -6,7 +6,7 @@ Trigger file name syntax is: > interface_modModule_Mytrigger.php[-NORUN] where: -> modModule is part of module descriptor file name found in includes/modules +> modModule is part of module descriptor file name found in core/modules directory or value 'all' if not enabled by a particular module. > Mytrigger is name of the trigger. The PHP class inside the trigger file would be named InterfaceMytrigger. diff --git a/htdocs/includes/triggers/README-FR b/htdocs/core/triggers/README-FR similarity index 90% rename from htdocs/includes/triggers/README-FR rename to htdocs/core/triggers/README-FR index 10aecb080b7..b0522f1d086 100644 --- a/htdocs/includes/triggers/README-FR +++ b/htdocs/core/triggers/README-FR @@ -7,7 +7,7 @@ La syntaxe d'un fichier Trigger est: où: > modModule est la partie du nom du descripteur de module trouvé dans le - répertoire includes/modules pour lequel le trigger doit être. + répertoire core/modules pour lequel le trigger doit être. actif ou la valeur 'all' si ne doit pas être actif pour un module particulier. > Mytrigger est le nom du trigger. La classe PHP dans le fichier trigger diff --git a/htdocs/core/triggers/index.php b/htdocs/core/triggers/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/triggers/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_all_Demo.class.php-NORUN similarity index 99% rename from htdocs/includes/triggers/interface_all_Demo.class.php-NORUN rename to htdocs/core/triggers/interface_all_Demo.class.php-NORUN index 1a83196a930..0c79524f3da 100644 --- a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_all_Demo.class.php-NORUN @@ -17,13 +17,13 @@ */ /** - * \file htdocs/includes/triggers/interface_all_Demo.class.php + * \file htdocs/core/triggers/interface_all_Demo.class.php * \ingroup core * \brief Fichier de demo de personalisation des actions du workflow * \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci: * - Le nom du fichier doit etre: interface_modMymodule_Mytrigger.class.php * ou: interface_all_Mytrigger.class.php - * - Le fichier doit rester stocke dans includes/triggers + * - Le fichier doit rester stocke dans core/triggers * - Le nom de la classe doit etre InterfaceMytrigger * - Le nom de la methode constructeur doit etre InterfaceMytrigger * - Le nom de la propriete name doit etre Mytrigger @@ -90,7 +90,7 @@ class InterfaceDemo /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Code de l'evenement * @param object Objet concerne * @param user Objet user diff --git a/htdocs/includes/triggers/interface_all_Logevents.class.php b/htdocs/core/triggers/interface_all_Logevents.class.php similarity index 98% rename from htdocs/includes/triggers/interface_all_Logevents.class.php rename to htdocs/core/triggers/interface_all_Logevents.class.php index 1f78001cd64..bba2794b177 100644 --- a/htdocs/includes/triggers/interface_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_all_Logevents.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/triggers/interface_all_Logevents.class.php + * \file htdocs/core/triggers/interface_all_Logevents.class.php * \ingroup core * \brief Trigger file for */ @@ -87,7 +87,7 @@ class InterfaceLogevents /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Code de l'evenement * @param object Objet concerne * @param user Objet user diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php similarity index 99% rename from htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php rename to htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php index a3eb22bea44..2551fba0731 100644 --- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php + * \file htdocs/core/triggers/interface_modAgenda_ActionsAuto.class.php * \ingroup agenda * \brief Trigger file for agenda module */ @@ -88,7 +88,7 @@ class InterfaceActionsAuto /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * * Following properties must be filled: * $object->actiontypecode (translation action code: AC_OTH, ...) diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php similarity index 97% rename from htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php rename to htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php index d1bd3e3fffc..f8e22bf722d 100644 --- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php +++ b/htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php @@ -16,11 +16,11 @@ */ /** - * \file htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php + * \file htdocs/core/triggers/interface_modLdap_Ldapsynchro.class.php * \ingroup core * \brief Fichier de gestion des triggers LDAP */ -require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); /** @@ -83,7 +83,7 @@ class InterfaceLdapsynchro /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Event code (COMPANY_CREATE, PROPAL_VALIDATE, ...) * @param object Object action is done on * @param user Object user @@ -217,7 +217,11 @@ class InterfaceLdapsynchro $info=$object->_load_ldap_info(); $dn=$object->_load_ldap_dn($info); - + + // Get a gid number for objectclass PosixGroup + if(in_array('posixGroup',$info['objectclass'])) + $info['gidNumber'] = $ldap->getNextGroupGid(); + $result=$ldap->add($dn,$info,$user); if ($result < 0) { diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/core/triggers/interface_modNotification_Notification.class.php similarity index 98% rename from htdocs/includes/triggers/interface_modNotification_Notification.class.php rename to htdocs/core/triggers/interface_modNotification_Notification.class.php index 2e0687e3cf3..eff1ded2345 100644 --- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_modNotification_Notification.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/triggers/interface_modNotification_Notification.class.php + * \file htdocs/core/triggers/interface_modNotification_Notification.class.php * \ingroup notification * \brief File of class of triggers for notification module */ @@ -83,7 +83,7 @@ class InterfaceNotification /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * @param action Event code (COMPANY_CREATE, PROPAL_VALIDATE, ...) * @param object Object action is done on * @param user Object user diff --git a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php similarity index 92% rename from htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php rename to htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php index ec458302c71..370d47305b3 100644 --- a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php +++ b/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php @@ -16,7 +16,7 @@ */ /** - * \file /htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php + * \file /htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php * \ingroup paypal * \brief Trigger file for paypal workflow */ @@ -82,7 +82,7 @@ class InterfacePaypalWorkflow /** * \brief Fonction appelee lors du declenchement d'un evenement Dolibarr. - * D'autres fonctions run_trigger peuvent etre presentes dans includes/triggers + * D'autres fonctions run_trigger peuvent etre presentes dans core/triggers * \param action Code de l'evenement * \param object Objet concerne * \param user Objet user @@ -123,10 +123,10 @@ class InterfacePaypalWorkflow if ($ret < 0) return -1; // Add payer id - $soc->updateObjectField('societe', $obj->socid, 'ref_int', $object->payerID); + $soc->setValueFrom('societe', $obj->socid, 'ref_int', $object->payerID); // Add transaction id - $obj->updateObjectField($obj->table_element,$obj->id,'ref_int',$object->resArray["TRANSACTIONID"]); + $obj->setValueFrom($obj->table_element,$obj->id,'ref_int',$object->resArray["TRANSACTIONID"]); } diff --git a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php similarity index 97% rename from htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php rename to htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php index 374096d4fb0..a123bd63842 100755 --- a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php + * \file htdocs/core/triggers/interface_modWorkflow_WorkflowManager.class.php * \ingroup core * \brief Trigger file for workflows */ @@ -84,7 +84,7 @@ class InterfaceWorkflowManager /** * Function called when a Dolibarrr business event is done. - * All functions "run_trigger" are triggered if file is inside directory htdocs/includes/triggers + * All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers * * @param action Event code (COMPANY_CREATE, PROPAL_VALIDATE, ...) * @param object Object action is done on diff --git a/htdocs/document.php b/htdocs/document.php index 8c06ea3078c..6a96f4c97e5 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -47,7 +47,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); function llxHeader() { } require("./main.inc.php"); // Load $user and permissions -require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $encoding = ''; $action = GETPOST("action"); diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index ac8429d0c0d..31adb1bca7c 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -322,7 +322,7 @@ class EcmDirectory // extends CommonObject function delete($user) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $relativepath=$this->getRelativePath(1); // Ex: dir1/dir2/dir3 @@ -643,7 +643,7 @@ class EcmDirectory // extends CommonObject function refreshcachenboffile($all=0) { global $conf; - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $dir=$conf->ecm->dir_output.'/'.$this->getRelativePath(); $filelist=dol_dir_list($dir,'files',0,'','\.meta$'); diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php index feb37ef27f7..ec851c6e2fa 100644 --- a/htdocs/ecm/docfile.php +++ b/htdocs/ecm/docfile.php @@ -25,8 +25,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); // Load traductions files $langs->load("ecm"); diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index 2fd20a9ed26..c0ffe1aa7dd 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -26,8 +26,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); // Load traductions files @@ -83,7 +83,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; // Upload file if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (create_exdir($upload_dir) >= 0) { diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php index 1d98e484af1..973ee2a4e4a 100644 --- a/htdocs/ecm/docother.php +++ b/htdocs/ecm/docother.php @@ -11,7 +11,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Load traductions files $langs->load("ecm"); @@ -46,7 +46,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section; // Envoie fichier if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (create_exdir($upload_dir) >= 0) { diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index a2adc93b229..2609e5eb723 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -27,9 +27,9 @@ if (! defined('REQUIRE_JQUERY_LAYOUT')) define('REQUIRE_JQUERY_LAYOUT','1'); require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); // Load traductions files diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 2536ba75aa5..f3e0016ee9d 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -25,9 +25,9 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); // Load traductions files diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index cb9da1f7989..e7e74f33063 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -101,7 +101,7 @@ class Expedition extends CommonObject global $db, $langs, $conf; $langs->load("sendings"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/expedition"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/expedition"; if (empty($conf->global->EXPEDITION_ADDON_NUMBER)) { @@ -421,7 +421,7 @@ class Expedition extends CommonObject { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); dol_syslog("Expedition::valid"); @@ -770,7 +770,7 @@ class Expedition extends CommonObject { global $conf, $langs, $user; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $this->db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet"; @@ -1151,9 +1151,9 @@ class Expedition extends CommonObject $classname = "methode_expedition_".strtolower($code); $url=''; - if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number)) + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number)) { - require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_".strtolower($code).".modules.php"); + require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php"); $shipmethod = new $classname(); $url = $shipmethod->provider_url_status($this->tracking_number); } diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 75a697ec93a..5fba4f64bb9 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -29,11 +29,11 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); @@ -252,7 +252,7 @@ if ($action == 'settrackingnumber' || $action == 'settrackingurl' */ if ($action == 'builddoc') // En get ou en post { - require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php"); // Sauvegarde le dernier modele choisi pour generer un document $shipment = new Expedition($db); @@ -287,7 +287,7 @@ if ($action == 'builddoc') // En get ou en post */ if ($_POST['addfile']) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -303,7 +303,7 @@ if ($_POST['addfile']) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -387,7 +387,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 1e0050ba792..9b37eb076b4 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -28,8 +28,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index e062ccb67e3..c5ddf7eb96e 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -76,7 +76,7 @@ class Export foreach ($conf->file->dol_document_root as $type => $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; + $modulesdir[] = $dirroot . "/core/modules/"; if ($type == 'alt') { @@ -87,9 +87,9 @@ class Export { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + if (is_dir($dirroot . '/' . $file . '/core/modules/')) { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + $modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; } } } @@ -263,7 +263,7 @@ class Export } // Creation de la classe d'export du model ExportXXX - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/export/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/"; $file = "export_".$model.".modules.php"; $classname = "Export".$model; require_once($dir.$file); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 380854ddbf3..f01e40c607d 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -26,7 +26,7 @@ require_once("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/exports/class/export.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); $langs->load("exports"); diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index de92fbcdb11..264c62e2af9 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -64,7 +64,7 @@ print ''.$langs->trans("LibraryShort").''; print ''.$langs->trans("LibraryVersion").''; print ''; -include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); +include_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); $model=new ModeleExports(); $liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index ea6a948f0e4..45fdf290314 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); if (!$user->admin) diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index b58b40c9e3e..7fe564aa948 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -24,8 +24,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 6d240bfb31d..1a3afead912 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -462,7 +462,7 @@ class Fichinter extends CommonObject global $conf, $db, $langs; $langs->load("interventions"); - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/fichinter/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/fichinter/"; if (! empty($conf->global->FICHEINTER_ADDON)) { @@ -555,7 +555,7 @@ class Fichinter extends CommonObject function delete($user) { global $conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 77c2aa75d98..a5893d6f419 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("interventions"); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index d55461e5fc2..872d191cd1f 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -28,8 +28,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("other"); @@ -69,7 +69,7 @@ $modulepart='fichinter'; */ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (create_exdir($upload_dir) >= 0) { diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 7c804b30c2d..0415b741b2a 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -27,17 +27,17 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/modules/fichinter/modules_fichinter.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); } -if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php")) +if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"); + require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"); } $langs->load("companies"); @@ -249,8 +249,20 @@ if ($action == 'setdescription') // Add line if ($action == "addline" && $user->rights->ficheinter->creer) { - if ($_POST['np_desc'] && ($_POST['durationhour'] || $_POST['durationmin'])) + if (empty($_POST['np_desc'])) { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'
'; + $error++; + } + if (empty($_POST['durationhour']) && empty($_POST['durationmin'])) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'
'; + $error++; + } + if (! $error) + { + $db->begin(); + $object = new Fichinter($db); $ret=$object->fetch($_POST['fichinterid']); $object->fetch_thirdparty(); @@ -259,11 +271,11 @@ if ($action == "addline" && $user->rights->ficheinter->creer) $date_intervention = dol_mktime($_POST["dihour"], $_POST["dimin"], 0, $_POST["dimonth"], $_POST["diday"], $_POST["diyear"]); $duration = ConvertTime2Seconds($_POST['durationhour'],$_POST['durationmin']); - $object->addline( - $_POST['fichinterid'], - $desc, - $date_intervention, - $duration + $result=$object->addline( + $_POST['fichinterid'], + $desc, + $date_intervention, + $duration ); // Define output language @@ -276,9 +288,20 @@ if ($action == "addline" && $user->rights->ficheinter->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - fichinter_create($db, $object, $object->modelpdf, $outputlangs); - Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_POST['fichinterid']); - exit; + + if ($result >= 0) + { + $db->commit(); + + fichinter_create($db, $object, $object->modelpdf, $outputlangs); + Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_POST['fichinterid']); + exit; + } + else + { + $mesg=$object->error; + $db->rollback(); + } } } @@ -448,7 +471,7 @@ if ($action == 'down' && $user->rights->ficheinter->creer) */ if ($_POST['addfile']) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -464,7 +487,7 @@ if ($_POST['addfile']) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -548,7 +571,7 @@ if ($action == 'send' && ! $_POST['cancel'] && (empty($conf->global->MAIN_USE_AD $mimetype = $attachedfiles['mimes']; // Envoi de la propal - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -682,7 +705,7 @@ if ($action == 'create') print ''; print ''; - print ''; + print ''; print ''; @@ -730,7 +753,7 @@ if ($action == 'create') { print ''; print '
'.$langs->trans("Company").''.$societe->getNomUrl(1).'
'.$langs->trans("Thirdparty").''.$societe->getNomUrl(1).'
'; - print ''; print '
'.$langs->trans("Company").''; + print '
'.$langs->trans("Thirdparty").''; $html->select_societes('','socid','',1,1); print '
'; @@ -966,7 +989,7 @@ elseif ($fichinterid) print ''; // ancre pour retourner sur la ligne // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); $doleditor->Create(); print ''; @@ -994,7 +1017,7 @@ elseif ($fichinterid) $db->free($resql); /* - * Ajouter une ligne + * Add line */ if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline') { @@ -1021,7 +1044,7 @@ elseif ($fichinterid) print '\n"; print ''; // editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); $doleditor->Create(); print ''; @@ -1029,13 +1052,14 @@ elseif ($fichinterid) // Date intervention print ''; $timearray=dol_getdate(mktime()); - $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); + if (empty($_POST['diday'])) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); + else $timewithnohour=dol_mktime($_POST['dihour'],$_POST['dimin'],$_POST['disec'],$_POST['dimonth'],$_POST['diday'],$_POST['diyear']); $html->select_date($timewithnohour,'di',1,1,0,"addinter"); print ''; // Duration print ''; - $html->select_duration('duration',3600); + $html->select_duration('duration',(empty($_POST["durationhour"]) && empty($_POST["durationmin"]))?3600:(60*60*$_POST["durationhour"]+60*$_POST["durationmin"])); print ''; print ''; diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 08d151f7031..05c74544d24 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -24,9 +24,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); $langs->load('companies'); $langs->load("interventions"); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 1599895b62c..52d07817a06 100755 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); $langs->load("interventions"); diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 65a6b9c6e47..764e02bba0b 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); $langs->load('companies'); $langs->load("interventions"); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 258839b2673..8695e9d6004 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -205,15 +205,15 @@ if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset( if (! defined('ADODB_DATE_VERSION')) include_once(ADODB_PATH.'adodb-time.inc.php'); -if (! file_exists(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php")) +if (! file_exists(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php")) { print "Error: Dolibarr config file content seems to be not correctly defined.
\n"; print "Please run dolibarr setup by calling page /install.
\n"; exit; } -include_once(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2) -include_once(DOL_DOCUMENT_ROOT ."/lib/security.lib.php"); // Include by default +include_once(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2) +include_once(DOL_DOCUMENT_ROOT ."/core/lib/security.lib.php"); // Include by default // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index f92cd5b2f00..9c306ea7c86 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -272,7 +272,7 @@ class CommandeFournisseur extends Commande function valid($user) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -569,7 +569,7 @@ class CommandeFournisseur extends Commande global $db, $langs, $conf; $langs->load("orders"); - $dir = DOL_DOCUMENT_ROOT .'/includes/modules/supplier_order/'; + $dir = DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/'; if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON)) { @@ -933,7 +933,7 @@ class CommandeFournisseur extends Commande global $langs,$mysoc; dol_syslog("FournisseurCommande::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (! $qty) $qty=1; @@ -1565,7 +1565,7 @@ class CommandeFournisseur extends Commande function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0) { dol_syslog("CommandeFournisseur::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); if ($this->brouillon) { diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index f407958435a..9247057f4ed 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -928,7 +928,7 @@ class FactureFournisseur extends Facture function addline($desc, $pu, $txtva, $txlocaltax1=0, $txlocaltax2=0, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0) { dol_syslog("FactureFourn::Addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if ($txtva == '') $txtva=0; @@ -988,7 +988,7 @@ class FactureFournisseur extends Facture */ function updateline($id, $label, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0) { - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); $pu = price2num($pu); $qty = price2num($qty); diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 8a7cc08aa50..08f6244a93c 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"; require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("facture"); diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 0bb534d89e2..32474ba8af8 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -27,9 +27,9 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index d28530f1348..31d2ef5749a 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -25,9 +25,9 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"; @@ -74,7 +74,7 @@ if ($commande->fetch($_GET['id'],$_GET['ref']) < 0) // Envoi fichier if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index d8cc040b2e6..a29212fa4c7 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -30,12 +30,12 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"; require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"; require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; -require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"; +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); $langs->load('orders'); @@ -524,7 +524,7 @@ if ($action == 'builddoc') // En get ou en post // Delete file in doc form if ($action=='remove_file') { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($object->fetch($id)) { @@ -574,7 +574,7 @@ if ($action == 'create') */ if ($_POST['addfile']) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -590,7 +590,7 @@ if ($_POST['addfile']) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -674,7 +674,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -1165,7 +1165,7 @@ if ($id > 0 || ! empty($ref)) } // Description - Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1218,7 +1218,7 @@ if ($id > 0 || ! empty($ref)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '
'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1269,7 +1269,7 @@ if ($id > 0 || ! empty($ref)) if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '
'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index 98b64f2d185..a28f3ee4b0d 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); $langs->load("orders"); diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index d0bd737f374..efef39c24b7 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); $langs->load("orders"); diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index d05b29d7888..25274ccf72d 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("bills"); diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index fd7b4de18c5..b0c0ab10a2e 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -27,8 +27,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('bills'); @@ -62,7 +62,7 @@ if (! $sortfield) $sortfield="name"; // Envoi fichier if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $facture = new FactureFournisseur($db); if ($facture->fetch($facid)) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 5218b2e8aa0..daf4c2ce3a9 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -29,10 +29,10 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_invoice/modules_facturefournisseur.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); @@ -620,7 +620,7 @@ if ($action == 'reopen' && $user->rights->fournisseur->facture->creer) */ if ($_POST['addfile']) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -636,7 +636,7 @@ if ($_POST['addfile']) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -719,7 +719,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -838,7 +838,7 @@ if ($action == 'builddoc') // Delete file in doc form if ($action == 'remove_file') { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($object->fetch($id)) { @@ -1459,7 +1459,7 @@ else } // Description - Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('label',$fac->lines[$i]->description,'',128,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1589,7 +1589,7 @@ else || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '
'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('label',GETPOST("label"),'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 74403679d83..0fe0af9422c 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->rights->fournisseur->facture->lire) accessforbidden(); diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 8b755976cb3..71daf72ec81 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -26,8 +26,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); $langs->load('bills'); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index e8af8fe7fc1..ea40e32c645 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index a8b19441f90..a9a45f3c432 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $langs->load('suppliers'); diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 26242eddcef..95d1bc0a0ea 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); $langs->load("bills"); diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 8d63eaa3f18..78b9f4fa290 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); $langs->load("companies"); diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index ce26f3f3ab2..353714bc5bb 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("ftp"); diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 63a0da727bf..0ea5c62a2d7 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -25,8 +25,8 @@ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); // Load traductions files $langs->load("ftp"); @@ -82,7 +82,7 @@ $conn_id=0; // FTP connection ID // Envoie fichier if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $result=$ecmdir->fetch($_REQUEST["section"]); if (! $result > 0) diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index af0ae64074a..fa9fdf20df7 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -67,10 +67,10 @@ class Import $var=true; $i=0; - //$dir=DOL_DOCUMENT_ROOT."/includes/modules"; + //$dir=DOL_DOCUMENT_ROOT."/core/modules"; foreach($conf->file->dol_document_root as $dirroot) { - $dir = $dirroot.'/includes/modules'; + $dir = $dirroot.'/core/modules'; // Search available exports $handle=@opendir(dol_osencode($dir)); @@ -182,7 +182,7 @@ class Import dol_syslog(get_class($this)."::build_example_file ".$model); // Creation de la classe d'import du model Import_XXX - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".$model; require_once($dir.$file); diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php index 1421d116343..c65791568da 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.php @@ -33,9 +33,9 @@ function llxHeader() { print 'Build an import example file< function llxFooter() { print ''; } require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); $langs->load("exports"); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 25d1e087bd1..1f14a967de8 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -26,9 +26,9 @@ require_once("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/import.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/import.lib.php"); $langs->load("exports"); $langs->load("errors"); @@ -191,7 +191,7 @@ if ($action == 'add_import_model') if ($step == 3 && $datatoimport) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { @@ -574,7 +574,7 @@ if ($step == 4 && $datatoimport) $liste=$objmodelimport->liste_modeles($db); // Create classe to use for import - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); require_once($dir.$file); @@ -1026,7 +1026,7 @@ if ($step == 5 && $datatoimport) $liste=$objmodelimport->liste_modeles($db); // Create classe to use for import - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); require_once($dir.$file); @@ -1353,7 +1353,7 @@ if ($step == 6 && $datatoimport) // Create classe to use for import - $dir = DOL_DOCUMENT_ROOT . "/includes/modules/import/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); require_once($dir.$file); diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index d5f2396b4e4..d24a8eb1854 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -61,7 +61,7 @@ print ''.$langs->trans("LibraryShort").''; print ''.$langs->trans("LibraryVersion").''; print ''; -include_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); +include_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); $model=new ModeleImports(); $liste=$model->liste_modeles($db); diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php index 5c4de42efc2..d4435dbe8b7 100644 --- a/htdocs/includes/barcode/html.formbarcode.class.php +++ b/htdocs/includes/barcode/html.formbarcode.class.php @@ -24,9 +24,9 @@ /** - \class Form - \brief Classe permettant la generation de composants html -*/ + * \class Form + * \brief Classe permettant la generation de composants html + */ class FormBarCode { var $db; @@ -34,12 +34,13 @@ class FormBarCode /** - \brief Constructeur - \param DB handler d'acc�s base de donn�e - */ - function FormBarCode($DB) + * Constructor + * + * @param DoliDB $db Database handler + */ + function FormBarCode($db) { - $this->db = $DB; + $this->db = $db; return 1; } diff --git a/htdocs/includes/index.php b/htdocs/includes/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/includes/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png index 9d149b1c61f..9fb564f8d0a 100644 Binary files a/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png and b/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png differ diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png index 0cdbda36a55..81ecc362d50 100644 Binary files a/htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png and b/htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png differ diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png index ca1736e45b6..6f4bd87c041 100644 Binary files a/htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png and b/htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png differ diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png index 9f3eafaab0f..3d6f567f4d3 100644 Binary files a/htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png and b/htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png differ diff --git a/htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.css b/htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.css index 49dc0abfe6b..a315859dd77 100644 --- a/htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.css +++ b/htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.css @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.14 + * jQuery UI CSS Framework 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -42,7 +42,7 @@ /* - * jQuery UI CSS Framework 1.8.14 + * jQuery UI CSS Framework 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -288,7 +288,7 @@ /* Overlays */ .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* - * jQuery UI Resizable 1.8.14 + * jQuery UI Resizable 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -307,7 +307,7 @@ .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* - * jQuery UI Selectable 1.8.14 + * jQuery UI Selectable 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -317,7 +317,7 @@ */ .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } /* - * jQuery UI Accordion 1.8.14 + * jQuery UI Accordion 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -336,7 +336,7 @@ .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } .ui-accordion .ui-accordion-content-active { display: block; } /* - * jQuery UI Autocomplete 1.8.14 + * jQuery UI Autocomplete 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -350,7 +350,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.14 + * jQuery UI Menu 1.8.16 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -389,7 +389,7 @@ margin: -1px; } /* - * jQuery UI Button 1.8.14 + * jQuery UI Button 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -427,7 +427,7 @@ input.ui-button { padding: .4em 1em; } /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ /* - * jQuery UI Dialog 1.8.14 + * jQuery UI Dialog 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -448,7 +448,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-draggable .ui-dialog-titlebar { cursor: move; } /* - * jQuery UI Slider 1.8.14 + * jQuery UI Slider 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -471,7 +471,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } .ui-slider-vertical .ui-slider-range-min { bottom: 0; } .ui-slider-vertical .ui-slider-range-max { top: 0; }/* - * jQuery UI Tabs 1.8.14 + * jQuery UI Tabs 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -489,7 +489,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } .ui-tabs .ui-tabs-hide { display: none !important; } /* - * jQuery UI Datepicker 1.8.14 + * jQuery UI Datepicker 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -556,7 +556,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad width: 200px; /*must have*/ height: 200px; /*must have*/ }/* - * jQuery UI Progressbar 1.8.14 + * jQuery UI Progressbar 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png b/htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png index 09d1cdc856c..84defe6e8ab 100644 Binary files a/htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png and b/htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png differ diff --git a/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css b/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css index ad212daefd7..0f1a7e770e8 100644 --- a/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css +++ b/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.14 + * jQuery UI CSS Framework 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -42,7 +42,7 @@ /* - * jQuery UI CSS Framework 1.8.14 + * jQuery UI CSS Framework 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -288,7 +288,7 @@ /* Overlays */ .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* - * jQuery UI Resizable 1.8.14 + * jQuery UI Resizable 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -307,7 +307,7 @@ .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* - * jQuery UI Selectable 1.8.14 + * jQuery UI Selectable 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -317,7 +317,7 @@ */ .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } /* - * jQuery UI Accordion 1.8.14 + * jQuery UI Accordion 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -336,7 +336,7 @@ .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } .ui-accordion .ui-accordion-content-active { display: block; } /* - * jQuery UI Autocomplete 1.8.14 + * jQuery UI Autocomplete 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -350,7 +350,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.14 + * jQuery UI Menu 1.8.16 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -389,7 +389,7 @@ margin: -1px; } /* - * jQuery UI Button 1.8.14 + * jQuery UI Button 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -427,7 +427,7 @@ input.ui-button { padding: .4em 1em; } /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ /* - * jQuery UI Dialog 1.8.14 + * jQuery UI Dialog 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -448,7 +448,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-draggable .ui-dialog-titlebar { cursor: move; } /* - * jQuery UI Slider 1.8.14 + * jQuery UI Slider 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -471,7 +471,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } .ui-slider-vertical .ui-slider-range-min { bottom: 0; } .ui-slider-vertical .ui-slider-range-max { top: 0; }/* - * jQuery UI Tabs 1.8.14 + * jQuery UI Tabs 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -489,7 +489,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } .ui-tabs .ui-tabs-hide { display: none !important; } /* - * jQuery UI Datepicker 1.8.14 + * jQuery UI Datepicker 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -556,7 +556,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad width: 200px; /*must have*/ height: 200px; /*must have*/ }/* - * jQuery UI Progressbar 1.8.14 + * jQuery UI Progressbar 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png new file mode 100644 index 00000000000..954e22dbd99 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png new file mode 100644 index 00000000000..64ece5707d9 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png new file mode 100644 index 00000000000..abdc01082bf Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png new file mode 100644 index 00000000000..9b383f4d2ea Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png new file mode 100644 index 00000000000..a23baad25b1 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png new file mode 100644 index 00000000000..42ccba269b6 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png new file mode 100644 index 00000000000..39d5824d6af Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png new file mode 100644 index 00000000000..f1273672d25 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png new file mode 100644 index 00000000000..359397acffd Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png new file mode 100644 index 00000000000..b273ff111d2 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png new file mode 100644 index 00000000000..a641a371afa Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png new file mode 100644 index 00000000000..85e63e9f604 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png new file mode 100644 index 00000000000..e117effa3dc Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png new file mode 100644 index 00000000000..42f8f992c72 Binary files /dev/null and b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png differ diff --git a/htdocs/includes/jquery/css/ui-lightness/jquery-ui-latest.custom.css b/htdocs/includes/jquery/css/ui-lightness/jquery-ui-latest.custom.css new file mode 100644 index 00000000000..5547c7b9dda --- /dev/null +++ b/htdocs/includes/jquery/css/ui-lightness/jquery-ui-latest.custom.css @@ -0,0 +1,568 @@ +/* + * jQuery UI CSS Framework 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; } +.ui-widget-content a { color: #333333; } +.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } +.ui-widget-header a { color: #ffffff; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; } +.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); } +.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/* + * jQuery UI Resizable 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Resizable#theming + */ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; } +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* + * jQuery UI Selectable 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Selectable#theming + */ +.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } +/* + * jQuery UI Accordion 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Accordion#theming + */ +/* IE/Win - Fix animation bug - #4615 */ +.ui-accordion { width: 100%; } +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } +.ui-accordion .ui-accordion-li-fix { display: inline; } +.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } +.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; } +.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } +.ui-accordion .ui-accordion-content-active { display: block; } +/* + * jQuery UI Autocomplete 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Autocomplete#theming + */ +.ui-autocomplete { position: absolute; cursor: default; } + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +/* + * jQuery UI Menu 1.8.16 + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Menu#theming + */ +.ui-menu { + list-style:none; + padding: 2px; + margin: 0; + display:block; + float: left; +} +.ui-menu .ui-menu { + margin-top: -3px; +} +.ui-menu .ui-menu-item { + margin:0; + padding: 0; + zoom: 1; + float: left; + clear: left; + width: 100%; +} +.ui-menu .ui-menu-item a { + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; +} +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} +/* + * jQuery UI Button 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Button#theming + */ +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } +.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } + +/*button sets*/ +.ui-buttonset { margin-right: 7px; } +.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } + +/* workarounds */ +button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ +/* + * jQuery UI Dialog 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Dialog#theming + */ +.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } +.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } +.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } +/* + * jQuery UI Slider 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Slider#theming + */ +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* + * jQuery UI Tabs 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Tabs#theming + */ +.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ +.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } +.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; } +.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } +.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } +.ui-tabs .ui-tabs-hide { display: none !important; } +/* + * jQuery UI Datepicker 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker#theming + */ +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +}/* + * jQuery UI Progressbar 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Progressbar#theming + */ +.ui-progressbar { height:2em; text-align: left; } +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file diff --git a/htdocs/includes/jquery/js/jquery-latest.min.jgz b/htdocs/includes/jquery/js/jquery-latest.min.jgz index ca8ee1644d8..b6ec62ed5cd 100644 Binary files a/htdocs/includes/jquery/js/jquery-latest.min.jgz and b/htdocs/includes/jquery/js/jquery-latest.min.jgz differ diff --git a/htdocs/includes/jquery/js/jquery-latest.min.js b/htdocs/includes/jquery/js/jquery-latest.min.js index b2ac1747f3c..628ed9b3160 100644 --- a/htdocs/includes/jquery/js/jquery-latest.min.js +++ b/htdocs/includes/jquery/js/jquery-latest.min.js @@ -1,18 +1,4 @@ -/*! - * jQuery JavaScript Library v1.6.1 - * http://jquery.com/ - * - * Copyright 2011, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2011, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Thu May 12 15:04:36 2011 -0400 - */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!cj[a]){var b=f("<"+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),c.body.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write("");b=cl.createElement(a),cl.body.appendChild(b),d=f.css(b,"display"),c.body.removeChild(ck)}cj[a]=d}return cj[a]}function cu(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function ct(){cq=b}function cs(){setTimeout(ct,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g=0===c})}function W(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function O(a,b){return(a&&a!=="*"?a+".":"")+b.replace(A,"`").replace(B,"&")}function N(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function L(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function F(){return!0}function E(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function H(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(H,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=d.userAgent,x,y,z,A=Object.prototype.toString,B=Object.prototype.hasOwnProperty,C=Array.prototype.push,D=Array.prototype.slice,E=String.prototype.trim,F=Array.prototype.indexOf,G={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.1",length:0,size:function(){return this.length},toArray:function(){return D.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?C.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(D.apply(this,arguments),"slice",D.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:C,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;y.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!y){y=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",z,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",z),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&H()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):G[A.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!B.call(a,"constructor")&&!B.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||B.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};f=c.createElement("select"),g=f.appendChild(c.createElement("option")),h=a.getElementsByTagName("input")[0],j={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},h.checked=!0,j.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,j.optDisabled=!g.disabled;try{delete a.test}catch(s){j.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function b(){j.noCloneEvent=!1,a.detachEvent("onclick",b)}),a.cloneNode(!0).fireEvent("onclick")),h=c.createElement("input"),h.value="t",h.setAttribute("type","radio"),j.radioValue=h.value==="t",h.setAttribute("checked","checked"),a.appendChild(h),k=c.createDocumentFragment(),k.appendChild(a.firstChild),j.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",l=c.createElement("body"),m={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"};for(q in m)l.style[q]=m[q];l.appendChild(a),b.insertBefore(l,b.firstChild),j.appendChecked=h.checked,j.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,j.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",j.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
",n=a.getElementsByTagName("td"),r=n[0].offsetHeight===0,n[0].style.display="",n[1].style.display="none",j.reliableHiddenOffsets=r&&n[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(i=c.createElement("div"),i.style.width="0",i.style.marginRight="0",a.appendChild(i),j.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(i,null)||{marginRight:0}).marginRight,10)||0)===0),l.innerHTML="",b.removeChild(l);if(a.attachEvent)for(q in{submit:1,change:1,focusin:1})p="on"+q,r=p in a,r||(a.setAttribute(p,"return;"),r=typeof a[p]=="function"),j[q+"Bubbles"]=r;return j}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;return(e.value||"").replace(p,"")}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);c=j&&f.attrFix[c]||c,i=f.attrHooks[c],i||(!t.test(c)||typeof d!="boolean"&&d!==b&&d.toLowerCase()!==c.toLowerCase()?v&&(f.nodeName(a,"form")||u.test(c))&&(i=v):i=w);if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j)return i.get(a,c);h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);c=i&&f.propFix[c]||c,h=f.propHooks[c];return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return a[f.propFix[c]||c]?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=b),a.setAttribute(c,c.toLowerCase()));return c}},f.attrHooks.value={get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return a.value},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=Object.prototype.hasOwnProperty,y=/\.(.*)$/,z=/^(?:textarea|input|select)$/i,A=/\./g,B=/ /g,C=/[^\w\s.|`]/g,D=function(a){return a.replace(C,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=E;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=E);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),D).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem -)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},K=function(c){var d=c.target,e,g;if(!!z.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=J(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:K,beforedeactivate:K,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&K.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&K.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",J(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in I)f.event.add(this,c+".specialChange",I[c]);return z.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return z.test(this.nodeName)}},I=f.event.special.change.filters,I.focus=I.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=U.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(W(c[0])||W(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=T.call(arguments);P.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!V[a]?f.unique(e):e,(this.length>1||R.test(d))&&Q.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y=/ jQuery\d+="(?:\d+|null)"/g,Z=/^\s+/,$=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,_=/<([\w:]+)/,ba=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Y,""):null;if(typeof a=="string"&&!bc.test(a)&&(f.support.leadingWhitespace||!Z.test(a))&&!bg[(_.exec(a)||["",""])[1].toLowerCase()]){a=a.replace($,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bj(a,d),e=bk(a),g=bk(d);for(h=0;e[h];++h)bj(e[h],g[h])}if(b){bi(a,d);if(c){e=bk(a),g=bk(d);for(h=0;e[h];++h)bi(e[h],g[h])}}return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument|| -b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bb.test(k))k=b.createTextNode(k);else{k=k.replace($,"<$1>");var l=(_.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=ba.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Z.test(k)&&o.insertBefore(b.createTextNode(Z.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bp.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bo.test(g)?g.replace(bo,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,c){var d,e,g;c=c.replace(br,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bs.test(d)&&bt.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bE=/%20/g,bF=/\[\]$/,bG=/\r?\n/g,bH=/#.*$/,bI=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bJ=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bK=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bL=/^(?:GET|HEAD)$/,bM=/^\/\//,bN=/\?/,bO=/)<[^<]*)*<\/script>/gi,bP=/^(?:select|textarea)/i,bQ=/\s+/,bR=/([?&])_=[^&]*/,bS=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bT=f.fn.load,bU={},bV={},bW,bX;try{bW=e.href}catch(bY){bW=c.createElement("a"),bW.href="",bW=bW.href}bX=bS.exec(bW.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bT)return bT.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bO,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bP.test(this.nodeName)||bJ.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bG,"\r\n")}}):{name:b.name,value:c.replace(bG,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bW,isLocal:bK.test(bX[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bZ(bU),ajaxTransport:bZ(bV),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?ca(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=cb(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bI.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bH,"").replace(bM,bX[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bQ),d.crossDomain==null&&(r=bS.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bX[1]&&r[2]==bX[2]&&(r[3]||(r[1]==="http:"?80:443))==(bX[3]||(bX[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bU,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bL.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bN.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bR,"$1_="+x);d.url=y+(y===d.url?(bN.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bV,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bE,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq,cr=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){return this[0]?parseFloat(f.css(this[0],d,"padding")):null},f.fn["outer"+c]=function(a){return this[0]?parseFloat(f.css(this[0],d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); \ No newline at end of file +/*! jQuery v1.6.4 http://jquery.com/ | http://jquery.org/license */ +(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.4",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/)<[^<]*)*<\/script>/gi,bK=/^(?:select|textarea)/i,bL=/\s+/,bM=/([?&])_=[^&]*/,bN=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bO=f.fn.load,bP={},bQ={},bR,bS,bT=["*/"]+["*"];try{bR=e.href}catch(bU){bR=c.createElement("a"),bR.href="",bR=bR.href}bS=bN.exec(bR.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bO)return bO.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bJ,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bK.test(this.nodeName)||bE.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bB,"\r\n")}}):{name:b.name,value:c.replace(bB,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?bX(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),bX(a,b);return a},ajaxSettings:{url:bR,isLocal:bF.test(bS[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bT},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bV(bP),ajaxTransport:bV(bQ),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?bZ(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=b$(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bD.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bC,"").replace(bH,bS[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bL),d.crossDomain==null&&(r=bN.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bS[1]&&r[2]==bS[2]&&(r[3]||(r[1]==="http:"?80:443))==(bS[3]||(bS[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bW(bP,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bG.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bI.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bM,"$1_="+x);d.url=y+(y===d.url?(bI.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bT+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bW(bQ,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bz,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cq("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=ct.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!ct.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cu(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cu(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNaN(j)?i:j}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); \ No newline at end of file diff --git a/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.jgz b/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.jgz index df0980a1a1c..63799eb091d 100644 Binary files a/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.jgz and b/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.jgz differ diff --git a/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.js b/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.js index f9e4f1e8400..14c9064f7f2 100644 --- a/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.js +++ b/htdocs/includes/jquery/js/jquery-ui-latest.custom.min.js @@ -1,5 +1,5 @@ /*! - * jQuery UI 1.8.14 + * jQuery UI 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -7,16 +7,17 @@ * * http://docs.jquery.com/UI */ -(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.14", -keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus(); -b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this, -"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection", -function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth, -outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b); -return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e= -0;e0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&& +a.element[0].parentNode)for(var e=0;e0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=d * * http://docs.jquery.com/UI/Widget */ -(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h, -a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h; -e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options, -this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")}, -widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this}, -enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery); +(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]= +function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)): +d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options= +b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+ +"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled", +c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery); ;/*! - * jQuery UI Mouse 1.8.14 + * jQuery UI Mouse 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -42,13 +43,13 @@ enable:function(){return this._setOption("disabled",false)},disable:function(){r * Depends: * jquery.ui.widget.js */ -(function(b){var d=false;b(document).mousedown(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+ -this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=this._mouseStart(a)!== -false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&& +(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+ +this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted= +this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&& !(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted= false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery); ;/* - * jQuery UI Position 1.8.14 + * jQuery UI Position 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -64,7 +65,7 @@ d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a) a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b), g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery); ;/* - * jQuery UI Draggable 1.8.14 + * jQuery UI Draggable 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -79,8 +80,8 @@ g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"lef */ (function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper== "original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b= -this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('
').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;this.helper= -this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}); +this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;if(b.iframeFix)d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('
').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options; +this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}); this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true}, _mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b= false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration, @@ -98,7 +99,7 @@ this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser if(a.pageY-this.offset.click.topg[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.topg[3])?h:!(h-this.offset.click.topg[2])?e:!(e-this.offset.click.left=j&&f<=l||h>=j&&h<=l||fl)&&(e>= i&&e<=k||g>=i&&g<=k||ek);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f
');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+ a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+ c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]); -b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.14"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(), +b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.16"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(), 10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top- f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType? e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a= @@ -190,7 +191,7 @@ display:"block",position:"relative",height:c.height,width:c.width,margin:0,left: e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height= d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery); ;/* - * jQuery UI Selectable 1.8.14 + * jQuery UI Selectable 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -210,9 +211,9 @@ c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){va this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.righti||a.bottomb&&a.rightg&&a.bottom=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this, this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop", a,this._uiHash());for(e=0;e").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&& @@ -334,7 +335,7 @@ this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.act this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active|| this.first()?":last":":first"))},hasScroll:function(){return this.element.height()").addClass("ui-button-text").html(this.options.label).appendTo(a.empty()).text(),e=this.options.icons,f=e.primary&&e.secondary,d=[];if(e.primary||e.secondary){if(this.options.text)d.push("ui-button-text-icon"+(f?"s":e.primary?"-primary":"-secondary"));e.primary&&a.prepend("");e.secondary&&a.append("");if(!this.options.text){d.push(f?"ui-button-icons-only": "ui-button-icon-only");this.hasTitle||a.attr("title",c)}}else d.push("ui-button-text-only");a.addClass(d.join(" "))}}});b.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(a,c){a==="disabled"&&this.buttons.button("option",a,c);b.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var a=this.element.css("direction")=== "ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(a?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(a?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy"); b.Widget.prototype.destroy.call(this)}})})(jQuery); ;/* - * jQuery UI Dialog 1.8.14 + * jQuery UI Dialog 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -380,12 +381,12 @@ b.Widget.prototype.destroy.call(this)}})})(jQuery); */ (function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false, position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||" ",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("
")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+ -b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("
")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g), +b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&!i.isDefaultPrevented()&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("
")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g), h=c('').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("").addClass("ui-dialog-title").attr("id", e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"); a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!== -b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+= -1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target=== +b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()};c.ui.dialog.maxZ+=1; +d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target=== f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("
").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("
").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a, function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close", handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition, @@ -395,13 +396,13 @@ f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"): e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||" "));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a= this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height- -b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.14",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "), -create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()
").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(), -height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight); -b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&& +c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(a.range==="min"||a.range==="max"?" ui-slider-range-"+a.range:""))}for(var j=c.length;j"); -this.handles=c.add(d(e.join("")).appendTo(b.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle", -g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!b.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");i=b._start(g,l);if(i===false)return}break}m=b.options.step;i=b.options.values&&b.options.values.length? -(h=b.values(l)):(h=b.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=b._valueMin();break;case d.ui.keyCode.END:h=b._valueMax();break;case d.ui.keyCode.PAGE_UP:h=b._trimAlignValue(i+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=b._trimAlignValue(i-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===b._valueMax())return;h=b._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===b._valueMin())return;h=b._trimAlignValue(i- -m);break}b._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(g,k);b._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy(); -return this},_mouseCapture:function(b){var a=this.options,c,f,e,j,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(a.range===true&&this.values(1)===a.min){g+=1;e=d(this.handles[g])}if(this._start(b,g)===false)return false; -this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();a=e.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-e.width()/2,top:b.pageY-a.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(b){var a= -this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a;if(this.orientation==="horizontal"){a= -this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a); -c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var f;if(this.options.values&&this.options.values.length){f=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>f||a===1&&c1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max}, -_refreshValue:function(){var b=this.options.range,a=this.options,c=this,f=!this._animateOff?a.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},a.animate); -if(h===1)c.range[f?"animate":"css"]({width:e-g+"%"},{queue:false,duration:a.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},a.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:a.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1, -1)[f?"animate":"css"]({width:e+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.14"})})(jQuery); +(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+ +this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("
").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j"); +this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle", +g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length? +(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i- +m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy(); +return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false; +this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b= +this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b= +this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b); +c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a= +this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e- +g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"}, +b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery); ;/* - * jQuery UI Tabs 1.8.14 + * jQuery UI Tabs 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -466,10 +467,10 @@ if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1'))}function N(a){return a.bind("mouseout",function(b){b= -d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");b.addClass("ui-state-hover"); -b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.14"}});var A=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){H(this._defaults, -a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0, -selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('
'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]= -h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d(''+c+"");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c= -this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('').addClass(this._triggerClass).html(f==""?c:d("").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a, -"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;gh){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker", -function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput); -a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left", -this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus", -this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b= -b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5", -cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a); -d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c= -d.datepicker._get(b,"beforeShow");H(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c= -{left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover"); -if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv); -J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"); -a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]|| -c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+ -i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b= -this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute", -left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&& -d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth= -b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear= -!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a); -a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a)); -d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()% -100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=B+1-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y", -TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+112?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay= -a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(), -b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n= -this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&nn;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?''+n+"":f?"":''+n+"";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?''+s+"":f?"":''+s+"";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'":"";e=e?'
'+(c?h:"")+(this._isInRange(a,s)?'":"")+(c?"":h)+"
":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),B= -this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right": -"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='
'+(/all|left/.test(t)&&x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,B,v)+'
';var z=j?'": -"";for(t=0;t<7;t++){var r=(t+h)%7;z+="=5?' class="ui-datepicker-week-end"':"")+'>'+q[r]+""}y+=z+"";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q";var R=!j?"":'";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&ro;R+='";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+""}g++;if(g>11){g=0;m++}y+="
'+this._get(a,"weekHeader")+"
'+ -this._get(a,"calculateWeek")(r)+""+(F&&!D?" ":L?''+r.getDate()+"":''+ -r.getDate()+"")+"
"+(l?""+(i[0]>0&&G==i[1]-1?'
':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'':"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"), -l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='
',o="";if(h||!j)o+=''+i[b]+"";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='"}u||(k+=o+(h||!(j&&l)?" ":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+=''+c+"";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()): -g;for(a.yearshtml+='";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?" ":"")+o;k+="
";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c== -"Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&ba?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear"); -if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a); -c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a, -"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker= -function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker, -[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.14";window["DP_jQuery_"+A]=d})(jQuery); +minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('
'))}function N(a){return a.bind("mouseout", +function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"); +b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv}, +setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g, +"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('
'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker", +function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d(''+c+"");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c== +"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('').addClass(this._triggerClass).html(f==""?c:d("").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker(): +d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;gh){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a, +b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+= +1;this._dialogInput=d('');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/ +2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b= +d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e= +a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a, +"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f== +a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input", +a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value= +"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b); +c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing= +true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}); +a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&& +!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(), +h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b= +this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b); +this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")}, +_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"): +0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"? +"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a); +this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField"); +if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"? +b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd", +COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames: +null)||this._defaults.monthNames;var i=function(o){(o=k+1 +12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&& +a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay? +new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&nn;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a)); +n=this._canAdjustMonth(a,-1,m,g)?''+n+"":f?"":''+n+"";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m, +g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?''+s+"":f?"":''+s+"";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&& +a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'":"";e=e?'
'+(c?h:"")+(this._isInRange(a,s)?'":"")+(c?"":h)+"
":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='
'+(/all|left/.test(t)&& +x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'
';var z=j?'":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="=5?' class="ui-datepicker-week-end"':"")+'>'+q[r]+""}y+=z+"";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay, +z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q";var R=!j?"":'";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&ro;R+='";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+""}g++;if(g>11){g=0;m++}y+="
'+this._get(a,"weekHeader")+"
'+this._get(a,"calculateWeek")(r)+""+(F&&!D?" ":L?''+ +r.getDate()+"":''+r.getDate()+"")+"
"+(l?""+(i[0]>0&&G==i[1]-1?'
':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'': +"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='
',o="";if(h||!j)o+=''+i[b]+"";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='"}u||(k+=o+(h||!(j&&l)?" ":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+=''+c+"";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b, +e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?" ":"")+o;k+="
";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+ +(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&ba?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input? +a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c, +e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a, +"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this; +if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a== +"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery); ;/* - * jQuery UI Progressbar 1.8.14 + * jQuery UI Progressbar 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -566,9 +567,9 @@ function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document */ (function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("
").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"); this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100* -this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.14"})})(jQuery); +this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.16"})})(jQuery); ;/* - * jQuery UI Effects 1.8.14 + * jQuery UI Effects 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -585,20 +586,21 @@ a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number 211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b, d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})}; f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this, -[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.14",save:function(c,a){for(var b=0;b").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}); -c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c, -a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments); -a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%", -"pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d* -((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/= -e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/= -e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}), +d=document.activeElement;c.wrap(b);if(c[0]===d||f.contains(c[0],d))f(d).focus();b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(e,g){a[g]=c.css(g);if(isNaN(parseInt(a[g],10)))a[g]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){var a,b=document.activeElement; +if(c.parent().is(".ui-effects-wrapper")){a=c.parent().replaceWith(c);if(c[0]===b||f.contains(c[0],b))f(b).focus();return a}return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)}); +return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this, +arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/ +2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b, +d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c, +a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b, +d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+ e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery); ;/* - * jQuery UI Effects Fade 1.8.14 + * jQuery UI Effects Fade 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -683,7 +685,7 @@ e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.m */ (function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery); ;/* - * jQuery UI Effects Fold 1.8.14 + * jQuery UI Effects Fold 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -697,7 +699,7 @@ e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.m (function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1], 10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery); ;/* - * jQuery UI Effects Highlight 1.8.14 + * jQuery UI Effects Highlight 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -711,7 +713,7 @@ e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.m (function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&& this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery); ;/* - * jQuery UI Effects Pulsate 1.8.14 + * jQuery UI Effects Pulsate 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -725,7 +727,7 @@ this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments (function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c*{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{display:block}.ui-page .ui-header,.ui-page .ui-footer{position:relative}.ui-header .ui-btn-left{position:absolute;left:10px;top:.4em}.ui-header .ui-btn-right{position:absolute;right:10px;top:.4em}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 90px .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-page-fullscreen .ui-content{padding:0}.ui-icon{width:18px;height:18px}.ui-fullscreen img{max-width:100%}.ui-nojs{position:absolute;left:-9999px}.spin{-webkit-transform:rotate(360deg);-webkit-animation-name:spin;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite}@-webkit-keyframes spin{from{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(360deg)}}.in,.out{-webkit-animation-timing-function:ease-in-out;-webkit-animation-duration:350ms}.slide.in{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromright}.slide.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft}.slide.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromleft}.slide.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;z-index:10}.slideup.out{-webkit-animation-name:dontmove;z-index:0}.slideup.out.reverse{-webkit-transform:translateY(100%);z-index:10;-webkit-animation-name:slideouttobottom}.slideup.in.reverse{z-index:0;-webkit-animation-name:dontmove}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;z-index:10}.slidedown.out{-webkit-animation-name:dontmove;z-index:0}.slidedown.out.reverse{-webkit-transform:translateY(-100%);z-index:10;-webkit-animation-name:slideouttotop}.slidedown.in.reverse{z-index:0;-webkit-animation-name:dontmove}@-webkit-keyframes slideinfromright{from{-webkit-transform:translateX(100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translateX(-100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(100%)}}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.in{opacity:1;z-index:10;-webkit-animation-name:fadein}.fade.out{z-index:0;-webkit-animation-name:fadeout}.viewport-flip{-webkit-perspective:1000;position:absolute}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden}.flip{-webkit-animation-duration:.65s;-webkit-backface-visibility:hidden;-webkit-transform:translateX(0)}.flip.in{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromleft}.flip.out{-webkit-transform:rotateY(-180deg) scale(.8);-webkit-animation-name:flipouttoleft}.flip.in.reverse{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromright}.flip.out.reverse{-webkit-transform:rotateY(180deg) scale(.8);-webkit-animation-name:flipouttoright}@-webkit-keyframes flipinfromright{from{-webkit-transform:rotateY(-180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipinfromleft{from{-webkit-transform:rotateY(180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(-180deg) scale(.8)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(180deg) scale(.8)}}@-webkit-keyframes dontmove{from{opacity:1}to{opacity:1}}.pop{-webkit-transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);opacity:1;-webkit-animation-name:popin;z-index:10}.pop.out.reverse{-webkit-transform:scale(.2);opacity:0;-webkit-animation-name:popout;z-index:10}.pop.in.reverse{z-index:0;-webkit-animation-name:dontmove}@-webkit-keyframes popin{from{-webkit-transform:scale(.2);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.2);opacity:0}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px}.ui-grid-solo .ui-block-a{width:100%;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:50%}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.333%}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:25%}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:20%}.ui-grid-d .ui-block-a{clear:left}.ui-header,.ui-footer,.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{position:absolute;overflow:hidden;width:100%;border-left-width:0;border-right-width:0}.ui-header-fixed,.ui-footer-fixed{z-index:1000;-webkit-transform:translateZ(0)}.ui-footer-duplicate,.ui-page-fullscreen .ui-fixed-inline{display:none}.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{opacity:.9}.ui-navbar{overflow:hidden}.ui-navbar ul,.ui-navbar-expanded ul{list-style:none;padding:0;margin:0;position:relative;display:block;border:0}.ui-navbar-collapsed ul{float:left;width:75%;margin-right:-2px}.ui-navbar-collapsed .ui-navbar-toggle{float:left;width:25%}.ui-navbar li.ui-navbar-truncate{position:absolute;left:-9999px;top:-9999px}.ui-navbar li .ui-btn,.ui-navbar .ui-navbar-toggle .ui-btn{display:block;font-size:12px;text-align:center;margin:0;border-right-width:0}.ui-navbar li .ui-btn{margin-right:-1px}.ui-navbar li .ui-btn:last-child{margin-right:0}.ui-header .ui-navbar li .ui-btn,.ui-header .ui-navbar .ui-navbar-toggle .ui-btn,.ui-footer .ui-navbar li .ui-btn,.ui-footer .ui-navbar .ui-navbar-toggle .ui-btn{border-top-width:0;border-bottom-width:0}.ui-navbar .ui-btn-inner{padding-left:2px;padding-right:2px}.ui-navbar-noicons li .ui-btn .ui-btn-inner,.ui-navbar-noicons .ui-navbar-toggle .ui-btn-inner{padding-top:.8em;padding-bottom:.9em}.ui-navbar-expanded .ui-btn{margin:0;font-size:14px}.ui-navbar-expanded .ui-btn-inner{padding-left:5px;padding-right:5px}.ui-navbar-expanded .ui-btn-icon-top .ui-btn-inner{padding:45px 5px 15px;text-align:center}.ui-navbar-expanded .ui-btn-icon-top .ui-icon{top:15px}.ui-navbar-expanded .ui-btn-icon-bottom .ui-btn-inner{padding:15px 5px 45px;text-align:center}.ui-navbar-expanded .ui-btn-icon-bottom .ui-icon{bottom:15px}.ui-navbar-expanded li .ui-btn .ui-btn-inner{min-height:2.5em}.ui-navbar-expanded .ui-navbar-noicons .ui-btn .ui-btn-inner{padding-top:1.8em;padding-bottom:1.9em}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 5px;padding:0}.ui-btn:focus,.ui-btn:active{outline:0}.ui-header .ui-btn,.ui-footer .ui-btn,.ui-bar .ui-btn{display:inline-block;font-size:13px;margin:0}.ui-btn-inline{display:inline-block}.ui-btn-inner{padding:.6em 25px;display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;position:relative}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-bar .ui-btn-inner{padding:.4em 8px .5em}.ui-btn-icon-notext{display:inline-block;width:20px;height:20px;padding:2px 1px 2px 3px;text-indent:-9999px}.ui-btn-icon-notext .ui-btn-inner{padding:0}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-999px}.ui-btn-icon-left .ui-btn-inner{padding-left:33px}.ui-header .ui-btn-icon-left .ui-btn-inner,.ui-footer .ui-btn-icon-left .ui-btn-inner,.ui-bar .ui-btn-icon-left .ui-btn-inner{padding-left:27px}.ui-btn-icon-right .ui-btn-inner{padding-right:33px}.ui-header .ui-btn-icon-right .ui-btn-inner,.ui-footer .ui-btn-icon-right .ui-btn-inner,.ui-bar .ui-btn-icon-right .ui-btn-inner{padding-right:27px}.ui-btn-icon-top .ui-btn-inner{padding-top:33px}.ui-header .ui-btn-icon-top .ui-btn-inner,.ui-footer .ui-btn-icon-top .ui-btn-inner,.ui-bar .ui-btn-icon-top .ui-btn-inner{padding-top:27px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:33px}.ui-header .ui-btn-icon-bottom .ui-btn-inner,.ui-footer .ui-btn-icon-bottom .ui-btn-inner,.ui-bar .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:27px}.ui-btn-icon-notext .ui-icon{display:block}.ui-btn-icon-left .ui-icon,.ui-btn-icon-right .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-icon,.ui-btn-icon-bottom .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-header .ui-btn-icon-left .ui-icon,.ui-footer .ui-btn-icon-left .ui-icon,.ui-bar .ui-btn-icon-left .ui-icon{left:4px}.ui-header .ui-btn-icon-right .ui-icon,.ui-footer .ui-btn-icon-right .ui-icon,.ui-bar .ui-btn-icon-right .ui-icon{right:4px}.ui-header .ui-btn-icon-top .ui-icon,.ui-footer .ui-btn-icon-top .ui-icon,.ui-bar .ui-btn-icon-top .ui-icon{top:4px}.ui-header .ui-btn-icon-bottom .ui-icon,.ui-footer .ui-btn-icon-bottom .ui-icon,.ui-bar .ui-btn-icon-bottom .ui-icon{bottom:4px}.ui-btn-icon-top .ui-icon{top:5px}.ui-btn-icon-bottom .ui-icon{bottom:5px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:button;opacity:0;cursor:pointer;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);background:transparent}.ui-collapsible-contain{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -8px;padding:0;border-width:0 0 1px 0;position:relative}.ui-collapsible-heading a{text-align:left;margin:0}.ui-collapsible-heading a .ui-btn-inner{padding-left:40px}.ui-collapsible-heading a span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading a span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading a span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:absolute;left:-9999px}.ui-collapsible-content{display:block;padding:10px 0 10px 8px}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible-contain{margin:-1px 0 0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0 1em}.ui-bar .ui-controlgroup{margin:0 .3em}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em}.ui-controlgroup-controls{display:block;width:95%}.ui-controlgroup li{list-style:none}.ui-controlgroup-vertical .ui-btn,.ui-controlgroup-vertical .ui-checkbox,.ui-controlgroup-vertical .ui-radio{margin:0;border-bottom-width:0}.ui-controlgroup-vertical .ui-controlgroup-last{border-bottom-width:1px}.ui-controlgroup-horizontal{padding:0}.ui-controlgroup-horizontal .ui-btn,.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{display:inline-block;margin:0 -5px 0 0}.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{display:inline}.ui-controlgroup-horizontal .ui-checkbox .ui-btn,.ui-controlgroup-horizontal .ui-radio .ui-btn,.ui-controlgroup-horizontal .ui-checkbox:last-child,.ui-controlgroup-horizontal .ui-radio:last-child{margin-right:0}.ui-controlgroup-horizontal .ui-controlgroup-last{margin-right:0}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}@media all and (min-width:450px){.ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-controlgroup-controls{width:60%;display:inline-block}}.ui-dialog{min-height:480px}.ui-dialog .ui-header,.ui-dialog .ui-content,.ui-dialog .ui-footer{margin:15px;position:relative}.ui-dialog .ui-header,.ui-dialog .ui-footer{z-index:10;width:auto}.ui-dialog .ui-content,.ui-dialog .ui-footer{margin-top:-15px}.ui-checkbox,.ui-radio{position:relative;margin:.2em 0 .5em;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{margin:0;text-align:left;z-index:2}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain{background:0;padding:1.5em 0;margin:0;border-bottom-width:1px;overflow:visible}.ui-field-contain:first-child{border-top-width:0}@media all and (min-width:450px){.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{overflow:hidden}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:button;left:0;top:0;width:100%;height:100%;opacity:0;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0)}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:.0001}}.ui-select .ui-btn select.ui-select-nativeonly{opacity:1;text-indent:0}.ui-select .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}label.ui-select{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:inline-block;min-height:1em}.ui-select .ui-btn-text{text-overflow:ellipsis;overflow:hidden;display:block}.ui-selectmenu{position:absolute;padding:0;z-index:100!important;width:80%;max-width:350px;padding:6px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-selectmenu-hidden{top:-9999px;left:-9999px}.ui-selectmenu-screen{position:absolute;top:0;left:0;width:100%;height:100%;z-index:99}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header .ui-title{margin:.6em 46px .8em}@media all and (min-width:450px){label.ui-select{display:inline-block;width:20%;margin:0 2% 0 0}.ui-select{width:60%;display:inline-block}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em;line-height:1.4;font-size:16px;display:block;width:95%}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}.ui-input-search{padding:0 30px;width:77%;background-position:8px 50%;background-repeat:no-repeat;position:relative}.ui-input-search input.ui-input-text{border:0;width:98%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-14px}.ui-input-search .ui-input-clear-hidden{display:none}@media all and (min-width:450px){label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}input.ui-input-text,textarea.ui-input-text,.ui-input-search{width:60%;display:inline-block}.ui-input-search{width:50%}.ui-input-search input.ui-input-text{width:98%}}.ui-listview{margin:0;counter-reset:listnumbering}.ui-content .ui-listview{margin:-15px}.ui-content .ui-listview-inset{margin:1em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-divider,.ui-li-static{padding:.5em 15px;font-size:14px;font-weight:bold}.ui-li-divider{counter-reset:listnumbering}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:normal;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li:last-child,.ui-li.ui-field-contain:last-child{border-bottom-width:1px}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 75px .7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:60px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-heading{font-size:16px;font-weight:bold;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:normal;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-thumb,.ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-li-icon{max-height:40px;max-width:40px;left:10px;top:.9em}.ui-li-thumb,.ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:95px}.ui-li-count{position:absolute;font-size:11px;font-weight:bold;padding:.2em .5em;top:50%;margin-top:-.9em;right:38px}.ui-li-divider .ui-li-count,.ui-li-static .ui-li-count{right:10px}.ui-li-has-alt .ui-li-count{right:55px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-11px 0 0 0;border-bottom-width:1px}.ui-li-link-alt .ui-btn-inner{padding:0;position:static}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-listview-filter-inset{margin:-15px -5px -15px -5px;background:transparent}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{display:block}input.ui-slider-input{display:inline-block;width:50px}select.ui-slider-switch{display:none}div.ui-slider{position:relative;display:inline-block;overflow:visible;height:15px;padding:0;margin:0 2% 0 20px;top:4px;width:66%}a.ui-slider-handle{position:absolute;z-index:10;top:50%;width:28px;height:28px;margin-top:-15px;margin-left:-15px}a.ui-slider-handle .ui-btn-inner{padding-left:0;padding-right:0}@media all and (min-width:480px){label.ui-slider{display:inline-block;width:20%;margin:0 2% 0 0}div.ui-slider{width:45%}}div.ui-slider-switch{height:32px;overflow:hidden;margin-left:0}div.ui-slider-inneroffset{margin-left:50%;position:absolute;top:1px;height:100%;width:50%}div.ui-slider-handle-snapping{-webkit-transition:left 100ms linear}div.ui-slider-labelbg{position:absolute;top:0;margin:0;border-width:0}div.ui-slider-switch div.ui-slider-labelbg-a{width:60%;height:100%;left:0}div.ui-slider-switch div.ui-slider-labelbg-b{width:60%;height:100%;right:0}.ui-slider-switch-a div.ui-slider-labelbg-a,.ui-slider-switch-b div.ui-slider-labelbg-b{z-index:-1}.ui-slider-switch-a div.ui-slider-labelbg-b,.ui-slider-switch-b div.ui-slider-labelbg-a{z-index:0}div.ui-slider-switch a.ui-slider-handle{z-index:20;width:101%;height:32px;margin-top:-18px;margin-left:-101%}span.ui-slider-label{width:100%;position:absolute;height:32px;font-size:16px;text-align:center;line-height:2;background:0;border-color:transparent}span.ui-slider-label-a{left:-100%;margin-right:-1px}span.ui-slider-label-b{right:-100%;margin-left:-1px} \ No newline at end of file + *//*! +* jQuery Mobile Framework +* Copyright (c) jQuery Project +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. +*/.ui-bar-a{border:1px solid #2a2a2a;background:#111;color:#fff;font-weight:bold;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#111));background-image:-webkit-linear-gradient(top,#3c3c3c,#111);background-image:-moz-linear-gradient(top,#3c3c3c,#111);background-image:-ms-linear-gradient(top,#3c3c3c,#111);background-image:-o-linear-gradient(top,#3c3c3c,#111);background-image:linear-gradient(top,#3c3c3c,#111)}.ui-bar-a,.ui-bar-a input,.ui-bar-a select,.ui-bar-a textarea,.ui-bar-a button{font-family:Helvetica,Arial,sans-serif}.ui-bar-a .ui-link-inherit{color:#fff}.ui-bar-a .ui-link{color:#7cc4e7;font-weight:bold}.ui-bar-a .ui-link:hover{color:#2489ce}.ui-bar-a .ui-link:active{color:#2489ce}.ui-bar-a .ui-link:visited{color:#2489ce}.ui-body-a{border:1px solid #2a2a2a;background:#222;color:#fff;text-shadow:0 1px 0 #000;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#222));background-image:-webkit-linear-gradient(top,#666,#222);background-image:-moz-linear-gradient(top,#666,#222);background-image:-ms-linear-gradient(top,#666,#222);background-image:-o-linear-gradient(top,#666,#222);background-image:linear-gradient(top,#666,#222)}.ui-body-a,.ui-body-a input,.ui-body-a select,.ui-body-a textarea,.ui-body-a button{font-family:Helvetica,Arial,sans-serif}.ui-body-a .ui-link-inherit{color:#fff}.ui-body-a .ui-link{color:#2489ce;font-weight:bold}.ui-body-a .ui-link:hover{color:#2489ce}.ui-body-a .ui-link:active{color:#2489ce}.ui-body-a .ui-link:visited{color:#2489ce}.ui-br{border-bottom:#828282;border-bottom:rgba(130,130,130,.3);border-bottom-width:1px;border-bottom-style:solid}.ui-btn-up-a{border:1px solid #222;background:#333;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));background-image:-webkit-linear-gradient(top,#555,#333);background-image:-moz-linear-gradient(top,#555,#333);background-image:-ms-linear-gradient(top,#555,#333);background-image:-o-linear-gradient(top,#555,#333);background-image:linear-gradient(top,#555,#333)}.ui-btn-up-a a.ui-link-inherit{color:#fff}.ui-btn-hover-a{border:1px solid #000;background:#444;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#444));background-image:-webkit-linear-gradient(top,#666,#444);background-image:-moz-linear-gradient(top,#666,#444);background-image:-ms-linear-gradient(top,#666,#444);background-image:-o-linear-gradient(top,#666,#444);background-image:linear-gradient(top,#666,#444)}.ui-btn-hover-a a.ui-link-inherit{color:#fff}.ui-btn-down-a{border:1px solid #000;background:#3d3d3d;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#333),to(#5a5a5a));background-image:-webkit-linear-gradient(top,#333,#5a5a5a);background-image:-moz-linear-gradient(top,#333,#5a5a5a);background-image:-ms-linear-gradient(top,#333,#5a5a5a);background-image:-o-linear-gradient(top,#333,#5a5a5a);background-image:linear-gradient(top,#333,#5a5a5a)}.ui-btn-down-a a.ui-link-inherit{color:#fff}.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-b{border:1px solid #456f9a;background:#5e87b0;color:#fff;font-weight:bold;text-shadow:0 -1px 1px #254f7a;background-image:-webkit-gradient(linear,left top,left bottom,from(#81a8ce),to(#5e87b0));background-image:-webkit-linear-gradient(top,#81a8ce,#5e87b0);background-image:-moz-linear-gradient(top,#81a8ce,#5e87b0);background-image:-ms-linear-gradient(top,#81a8ce,#5e87b0);background-image:-o-linear-gradient(top,#81a8ce,#5e87b0);background-image:linear-gradient(top,#81a8ce,#5e87b0)}.ui-bar-b,.ui-bar-b input,.ui-bar-b select,.ui-bar-b textarea,.ui-bar-b button{font-family:Helvetica,Arial,sans-serif}.ui-bar-b .ui-link-inherit{color:#fff}.ui-bar-b .ui-link{color:#ddf0f8;font-weight:bold}.ui-bar-b .ui-link:hover{color:#ddf0f8}.ui-bar-b .ui-link:active{color:#ddf0f8}.ui-bar-b .ui-link:visited{color:#ddf0f8}.ui-body-b{border:1px solid #c6c6c6;background:#ccc;color:#333;text-shadow:0 1px 0 #fff;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#e6e6e6),to(#ccc));background-image:-webkit-linear-gradient(top,#e6e6e6,#ccc);background-image:-moz-linear-gradient(top,#e6e6e6,#ccc);background-image:-ms-linear-gradient(top,#e6e6e6,#ccc);background-image:-o-linear-gradient(top,#e6e6e6,#ccc);background-image:linear-gradient(top,#e6e6e6,#ccc)}.ui-body-b,.ui-body-b input,.ui-body-b select,.ui-body-b textarea,.ui-body-b button{font-family:Helvetica,Arial,sans-serif}.ui-body-b .ui-link-inherit{color:#333}.ui-body-b .ui-link{color:#2489ce;font-weight:bold}.ui-body-b .ui-link:hover{color:#2489ce}.ui-body-b .ui-link:active{color:#2489ce}.ui-body-b .ui-link:visited{color:#2489ce}.ui-btn-up-b{border:1px solid #145072;background:#2567ab;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #145072;background-image:-webkit-gradient(linear,left top,left bottom,from(#5f9cc5),to(#396b9e));background-image:-webkit-linear-gradient(top,#5f9cc5,#396b9e);background-image:-moz-linear-gradient(top,#5f9cc5,#396b9e);background-image:-ms-linear-gradient(top,#5f9cc5,#396b9e);background-image:-o-linear-gradient(top,#5f9cc5,#396b9e);background-image:linear-gradient(top,#5f9cc5,#396b9e)}.ui-btn-up-b a.ui-link-inherit{color:#fff}.ui-btn-hover-b{border:1px solid #00516e;background:#4b88b6;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #014d68;background-image:-webkit-gradient(linear,left top,left bottom,from(#72b0d4),to(#4b88b6));background-image:-webkit-linear-gradient(top,#72b0d4,#4b88b6);background-image:-moz-linear-gradient(top,#72b0d4,#4b88b6);background-image:-ms-linear-gradient(top,#72b0d4,#4b88b6);background-image:-o-linear-gradient(top,#72b0d4,#4b88b6);background-image:linear-gradient(top,#72b0d4,#4b88b6)}.ui-btn-hover-b a.ui-link-inherit{color:#fff}.ui-btn-down-b{border:1px solid #225377;background:#4e89c5;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #225377;background-image:-webkit-gradient(linear,left top,left bottom,from(#396b9e),to(#4e89c5));background-image:-webkit-linear-gradient(top,#396b9e,#4e89c5);background-image:-moz-linear-gradient(top,#396b9e,#4e89c5);background-image:-ms-linear-gradient(top,#396b9e,#4e89c5);background-image:-o-linear-gradient(top,#396b9e,#4e89c5);background-image:linear-gradient(top,#396b9e,#4e89c5)}.ui-btn-down-b a.ui-link-inherit{color:#fff}.ui-btn-up-b,.ui-btn-hover-b,.ui-btn-down-b{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-c{border:1px solid #b3b3b3;background:#e9eaeb;color:#3e3e3e;font-weight:bold;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f0f0f0),to(#e9eaeb));background-image:-webkit-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-moz-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-ms-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-o-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:linear-gradient(top,#f0f0f0,#e9eaeb)}.ui-bar-c .ui-link-inherit{color:#3e3e3e}.ui-bar-c .ui-link{color:#7cc4e7;font-weight:bold}.ui-bar-c .ui-link:hover{color:#2489ce}.ui-bar-c .ui-link:active{color:#2489ce}.ui-bar-c .ui-link:visited{color:#2489ce}.ui-bar-c,.ui-bar-c input,.ui-bar-c select,.ui-bar-c textarea,.ui-bar-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c{border:1px solid #b3b3b3;color:#333;text-shadow:0 1px 0 #fff;background:#f0f0f0;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));background-image:-webkit-linear-gradient(top,#eee,#ddd);background-image:-moz-linear-gradient(top,#eee,#ddd);background-image:-ms-linear-gradient(top,#eee,#ddd);background-image:-o-linear-gradient(top,#eee,#ddd);background-image:linear-gradient(top,#eee,#ddd)}.ui-body-c,.ui-body-c input,.ui-body-c select,.ui-body-c textarea,.ui-body-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c .ui-link-inherit{color:#333}.ui-body-c .ui-link{color:#2489ce;font-weight:bold}.ui-body-c .ui-link:hover{color:#2489ce}.ui-body-c .ui-link:active{color:#2489ce}.ui-body-c .ui-link:visited{color:#2489ce}.ui-btn-up-c{border:1px solid #ccc;background:#eee;font-weight:bold;color:#444;text-shadow:0 1px 1px #f6f6f6;background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);background-image:-moz-linear-gradient(top,#fdfdfd,#eee);background-image:-ms-linear-gradient(top,#fdfdfd,#eee);background-image:-o-linear-gradient(top,#fdfdfd,#eee);background-image:linear-gradient(top,#fdfdfd,#eee)}.ui-btn-up-c a.ui-link-inherit{color:#2f3e46}.ui-btn-hover-c{border:1px solid #bbb;background:#dadada;font-weight:bold;color:#101010;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#ededed),to(#dadada));background-image:-webkit-linear-gradient(top,#ededed,#dadada);background-image:-moz-linear-gradient(top,#ededed,#dadada);background-image:-ms-linear-gradient(top,#ededed,#dadada);background-image:-o-linear-gradient(top,#ededed,#dadada);background-image:linear-gradient(top,#ededed,#dadada)}.ui-btn-hover-c a.ui-link-inherit{color:#2f3e46}.ui-btn-down-c{border:1px solid #808080;background:#fdfdfd;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fdfdfd));background-image:-webkit-linear-gradient(top,#eee,#fdfdfd);background-image:-moz-linear-gradient(top,#eee,#fdfdfd);background-image:-ms-linear-gradient(top,#eee,#fdfdfd);background-image:-o-linear-gradient(top,#eee,#fdfdfd);background-image:linear-gradient(top,#eee,#fdfdfd)}.ui-btn-down-c a.ui-link-inherit{color:#2f3e46}.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-d{border:1px solid #ccc;background:#bbb;color:#333;text-shadow:0 1px 0 #eee;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddd),to(#bbb));background-image:-webkit-linear-gradient(top,#ddd,#bbb);background-image:-moz-linear-gradient(top,#ddd,#bbb);background-image:-ms-linear-gradient(top,#ddd,#bbb);background-image:-o-linear-gradient(top,#ddd,#bbb);background-image:linear-gradient(top,#ddd,#bbb)}.ui-bar-d,.ui-bar-d input,.ui-bar-d select,.ui-bar-d textarea,.ui-bar-d button{font-family:Helvetica,Arial,sans-serif}.ui-bar-d .ui-link-inherit{color:#333}.ui-bar-d .ui-link{color:#2489ce;font-weight:bold}.ui-bar-d .ui-link:hover{color:#2489ce}.ui-bar-d .ui-link:active{color:#2489ce}.ui-bar-d .ui-link:visited{color:#2489ce}.ui-body-d{border:1px solid #ccc;color:#333;text-shadow:0 1px 0 #fff;background:#fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#fff));background-image:-webkit-linear-gradient(top,#fff,#fff);background-image:-moz-linear-gradient(top,#fff,#fff);background-image:-ms-linear-gradient(top,#fff,#fff);background-image:-o-linear-gradient(top,#fff,#fff);background-image:linear-gradient(top,#fff,#fff)}.ui-body-d,.ui-body-d input,.ui-body-d select,.ui-body-d textarea,.ui-body-d button{font-family:Helvetica,Arial,sans-serif}.ui-body-d .ui-link-inherit{color:#333}.ui-body-d .ui-link{color:#2489ce;font-weight:bold}.ui-body-d .ui-link:hover{color:#2489ce}.ui-body-d .ui-link:active{color:#2489ce}.ui-body-d .ui-link:visited{color:#2489ce}.ui-btn-up-d{border:1px solid #ccc;background:#fff;font-weight:bold;color:#444;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#fff));background-image:-webkit-linear-gradient(top,#fff,#fff);background-image:-moz-linear-gradient(top,#fff,#fff);background-image:-ms-linear-gradient(top,#fff,#fff);background-image:-o-linear-gradient(top,#fff,#fff);background-image:linear-gradient(top,#fff,#fff)}.ui-btn-up-d a.ui-link-inherit{color:#333}.ui-btn-hover-d{border:1px solid #aaa;background:#eee;font-weight:bold;color:#222;cursor:pointer;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);background-image:-moz-linear-gradient(top,#fdfdfd,#eee);background-image:-ms-linear-gradient(top,#fdfdfd,#eee);background-image:-o-linear-gradient(top,#fdfdfd,#eee);background-image:linear-gradient(top,#fdfdfd,#eee)}.ui-btn-hover-d a.ui-link-inherit{color:#222}.ui-btn-down-d{border:1px solid #aaa;background:#fff;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fff));background-image:-webkit-linear-gradient(top,#eee,#fff);background-image:-moz-linear-gradient(top,#eee,#fff);background-image:-ms-linear-gradient(top,#eee,#fff);background-image:-o-linear-gradient(top,#eee,#fff);background-image:linear-gradient(top,#eee,#fff)}.ui-btn-down-d a.ui-link-inherit{color:#111}.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-e{border:1px solid #f7c942;background:#fadb4e;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fadb4e));background-image:-webkit-linear-gradient(top,#fceda7,#fadb4e);background-image:-moz-linear-gradient(top,#fceda7,#fadb4e);background-image:-ms-linear-gradient(top,#fceda7,#fadb4e);background-image:-o-linear-gradient(top,#fceda7,#fadb4e);background-image:linear-gradient(top,#fceda7,#fadb4e)}.ui-bar-e,.ui-bar-e input,.ui-bar-e select,.ui-bar-e textarea,.ui-bar-e button{font-family:Helvetica,Arial,sans-serif}.ui-bar-e .ui-link-inherit{color:#333}.ui-bar-e .ui-link{color:#2489ce;font-weight:bold}.ui-bar-e .ui-link:hover{color:#2489ce}.ui-bar-e .ui-link:active{color:#2489ce}.ui-bar-e .ui-link:visited{color:#2489ce}.ui-body-e{border:1px solid #f7c942;color:#333;text-shadow:0 1px 0 #fff;background:#faeb9e;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#faeb9e));background-image:-webkit-linear-gradient(top,#fff,#faeb9e);background-image:-moz-linear-gradient(top,#fff,#faeb9e);background-image:-ms-linear-gradient(top,#fff,#faeb9e);background-image:-o-linear-gradient(top,#fff,#faeb9e);background-image:linear-gradient(top,#fff,#faeb9e)}.ui-body-e,.ui-body-e input,.ui-body-e select,.ui-body-e textarea,.ui-body-e button{font-family:Helvetica,Arial,sans-serif}.ui-body-e .ui-link-inherit{color:#333}.ui-body-e .ui-link{color:#2489ce;font-weight:bold}.ui-body-e .ui-link:hover{color:#2489ce}.ui-body-e .ui-link:active{color:#2489ce}.ui-body-e .ui-link:visited{color:#2489ce}.ui-btn-up-e{border:1px solid #f7c942;background:#fadb4e;font-weight:bold;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fadb4e));background-image:-webkit-linear-gradient(top,#fceda7,#fadb4e);background-image:-moz-linear-gradient(top,#fceda7,#fadb4e);background-image:-ms-linear-gradient(top,#fceda7,#fadb4e);background-image:-o-linear-gradient(top,#fceda7,#fadb4e);background-image:linear-gradient(top,#fceda7,#fadb4e)}.ui-btn-up-e a.ui-link-inherit{color:#333}.ui-btn-hover-e{border:1px solid #e79952;background:#fbe26f;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf0b5),to(#fbe26f));background-image:-webkit-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-moz-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-ms-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-o-linear-gradient(top,#fcf0b5,#fbe26f);background-image:linear-gradient(top,#fcf0b5,#fbe26f)}.ui-btn-hover-e a.ui-link-inherit{color:#333}.ui-btn-down-e{border:1px solid #f7c942;background:#fceda7;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fadb4e),to(#fceda7));background-image:-webkit-linear-gradient(top,#fadb4e,#fceda7);background-image:-moz-linear-gradient(top,#fadb4e,#fceda7);background-image:-ms-linear-gradient(top,#fadb4e,#fceda7);background-image:-o-linear-gradient(top,#fadb4e,#fceda7);background-image:linear-gradient(top,#fadb4e,#fceda7)}.ui-btn-down-e a.ui-link-inherit{color:#333}.ui-btn-up-e,.ui-btn-hover-e,.ui-btn-down-e{font-family:Helvetica,Arial,sans-serif;text-decoration:none}a.ui-link-inherit{text-decoration:none!important}.ui-btn-active{border:1px solid #155678;background:#4596ce;font-weight:bold;color:#fff;cursor:pointer;text-shadow:0 -1px 1px #145072;text-decoration:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#85bae4),to(#5393c5));background-image:-webkit-linear-gradient(top,#85bae4,#5393c5);background-image:-moz-linear-gradient(top,#85bae4,#5393c5);background-image:-ms-linear-gradient(top,#85bae4,#5393c5);background-image:-o-linear-gradient(top,#85bae4,#5393c5);background-image:linear-gradient(top,#85bae4,#5393c5);font-family:Helvetica,Arial,sans-serif}.ui-btn-active a.ui-link-inherit{color:#fff}.ui-btn-inner{border-top:1px solid #fff;border-color:rgba(255,255,255,.3)}.ui-corner-tl{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em}.ui-corner-tr{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bl{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-br{-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-top{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bottom{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-right{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-left{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-all{-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.ui-corner-none{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.ui-disabled{opacity:.3}.ui-disabled,.ui-disabled a{pointer-events:none;cursor:default}.ui-icon,.ui-icon-searchfield:after{background:#666;background:rgba(0,0,0,.4);background-image:url(images/icons-18-white.png);background-repeat:no-repeat;-moz-border-radius:9px;-webkit-border-radius:9px;border-radius:9px}.ui-icon-alt{background:#fff;background:rgba(255,255,255,.3);background-image:url(images/icons-18-black.png);background-repeat:no-repeat}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min--moz-device-pixel-ratio:1.5),only screen and (min-resolution:240dpi){.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-search,.ui-icon-searchfield:after,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on{background-image:url(images/icons-36-white.png);-moz-background-size:776px 18px;-o-background-size:776px 18px;-webkit-background-size:776px 18px;background-size:776px 18px}.ui-icon-alt{background-image:url(images/icons-36-black.png)}}.ui-icon-plus{background-position:-0 50%}.ui-icon-minus{background-position:-36px 50%}.ui-icon-delete{background-position:-72px 50%}.ui-icon-arrow-r{background-position:-108px 50%}.ui-icon-arrow-l{background-position:-144px 50%}.ui-icon-arrow-u{background-position:-180px 50%}.ui-icon-arrow-d{background-position:-216px 50%}.ui-icon-check{background-position:-252px 50%}.ui-icon-gear{background-position:-288px 50%}.ui-icon-refresh{background-position:-324px 50%}.ui-icon-forward{background-position:-360px 50%}.ui-icon-back{background-position:-396px 50%}.ui-icon-grid{background-position:-432px 50%}.ui-icon-star{background-position:-468px 50%}.ui-icon-alert{background-position:-504px 50%}.ui-icon-info{background-position:-540px 50%}.ui-icon-home{background-position:-576px 50%}.ui-icon-search,.ui-icon-searchfield:after{background-position:-612px 50%}.ui-icon-checkbox-off{background-position:-684px 50%}.ui-icon-checkbox-on{background-position:-648px 50%}.ui-icon-radio-off{background-position:-756px 50%}.ui-icon-radio-on{background-position:-720px 50%}.ui-checkbox .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.ui-icon-checkbox-off,.ui-icon-radio-off{background-color:transparent}.ui-checkbox-on .ui-icon,.ui-radio-on .ui-icon{background-color:#4596ce}.ui-icon-loading{background-image:url(images/ajax-loader.png);width:40px;height:40px;-moz-border-radius:20px;-webkit-border-radius:20px;border-radius:20px;background-size:35px 35px}.ui-btn-corner-tl{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em}.ui-btn-corner-tr{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bl{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-br{-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-top{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bottom{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-right{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-left{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-all{-moz-border-radius:1em;-webkit-border-radius:1em;border-radius:1em}.ui-corner-tl,.ui-corner-tr,.ui-corner-bl,.ui-corner-br,.ui-corner-top,.ui-corner-bottom,.ui-corner-right,.ui-corner-left,.ui-corner-all,.ui-btn-corner-tl,.ui-btn-corner-tr,.ui-btn-corner-bl,.ui-btn-corner-br,.ui-btn-corner-top,.ui-btn-corner-bottom,.ui-btn-corner-right,.ui-btn-corner-left,.ui-btn-corner-all{-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.ui-overlay{background:#666;opacity:.5;filter:Alpha(Opacity=50);position:absolute;width:100%;height:100%}.ui-overlay-shadow{-moz-box-shadow:0 0 12px rgba(0,0,0,.6);-webkit-box-shadow:0 0 12px rgba(0,0,0,.6);box-shadow:0 0 12px rgba(0,0,0,.6)}.ui-shadow{-moz-box-shadow:0 1px 4px rgba(0,0,0,.3);-webkit-box-shadow:0 1px 4px rgba(0,0,0,.3);box-shadow:0 1px 4px rgba(0,0,0,.3)}.ui-bar-a .ui-shadow,.ui-bar-b .ui-shadow,.ui-bar-c .ui-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.ui-shadow-inset{-moz-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);box-shadow:inset 0 1px 4px rgba(0,0,0,.2)}.ui-icon-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.4);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.4);box-shadow:0 1px 0 rgba(255,255,255,.4)}.ui-focus{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe}.ui-mobile-nosupport-boxshadow *{-moz-box-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}.ui-mobile-nosupport-boxshadow .ui-focus{outline-width:2px}.ui-mobile,.ui-mobile body{height:100%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border:0}.ui-mobile-viewport{margin:0;overflow-x:hidden;-webkit-text-size-adjust:none;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-mobile .ui-page-active{display:block;overflow:visible}.ui-page{outline:0}@media screen and (orientation:portrait){.ui-mobile,.ui-mobile .ui-page{min-height:420px}}@media screen and (orientation:landscape){.ui-mobile,.ui-mobile .ui-page{min-height:300px}}.ui-page.ui-mobile-touch-overflow,.ui-mobile-touch-overflow.ui-native-fixed .ui-content{overflow:auto;height:100%;-webkit-overflow-scrolling:touch;-moz-overflow-scrolling:touch;-o-overflow-scrolling:touch;-ms-overflow-scrolling:touch;overflow-scrolling:touch}.ui-page.ui-mobile-touch-overflow,.ui-page.ui-mobile-touch-overflow *{-webkit-transform:rotateY(0)}.ui-page.ui-mobile-pre-transition{display:block}.ui-loading .ui-mobile-viewport{overflow:hidden!important}.ui-loading .ui-loader{display:block}.ui-loading .ui-page{overflow:hidden}.ui-loader{display:none;position:absolute;opacity:.85;z-index:100;left:50%;width:200px;margin-left:-130px;margin-top:-35px;padding:10px 30px}.ui-loader h1{font-size:15px;text-align:center}.ui-loader .ui-icon{position:static;display:block;opacity:.9;margin:0 auto;width:35px;height:35px;background-color:transparent}.ui-mobile-rendering>*{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{display:block}.ui-page .ui-header,.ui-page .ui-footer{position:relative}.ui-header .ui-btn-left{position:absolute;left:10px;top:.4em}.ui-header .ui-btn-right{position:absolute;right:10px;top:.4em}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 90px .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-footer .ui-title{margin:.6em 15px .8em}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-page-fullscreen .ui-content{padding:0}.ui-mobile-touch-overflow.ui-page.ui-native-fixed,.ui-mobile-touch-overflow.ui-page.ui-native-fullscreen{overflow:visible}.ui-mobile-touch-overflow.ui-native-fixed .ui-header,.ui-mobile-touch-overflow.ui-native-fixed .ui-footer{position:fixed;left:0;right:0;top:0;z-index:200}.ui-mobile-touch-overflow.ui-page.ui-native-fixed .ui-footer{top:auto;bottom:0}.ui-mobile-touch-overflow.ui-native-fixed .ui-content{padding-top:2.5em;padding-bottom:3em;top:0;bottom:0;height:auto;position:absolute}.ui-mobile-touch-overflow.ui-native-fullscreen .ui-content{padding-top:0;padding-bottom:0}.ui-mobile-touch-overflow.ui-native-fullscreen .ui-header,.ui-mobile-touch-overflow.ui-native-fullscreen .ui-footer{opacity:.9}.ui-native-bars-hidden{display:none}.ui-icon{width:18px;height:18px}.ui-fullscreen img{max-width:100%}.ui-nojs{position:absolute;left:-9999px}.ui-hide-label label,.ui-hidden-accessible{position:absolute!important;left:-9999px;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}.spin{-webkit-transform:rotate(360deg);-webkit-animation-name:spin;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear}@-webkit-keyframes spin{from{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(360deg)}}.in,.out{-webkit-animation-timing-function:ease-in-out;-webkit-animation-duration:350ms}.slide.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft}.slide.in{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromright}.slide.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright}.slide.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromleft}.slideup.out{-webkit-animation-name:dontmove;z-index:0}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;z-index:10}.slideup.in.reverse{z-index:0;-webkit-animation-name:dontmove}.slideup.out.reverse{-webkit-transform:translateY(100%);z-index:10;-webkit-animation-name:slideouttobottom}.slidedown.out{-webkit-animation-name:dontmove;z-index:0}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;z-index:10}.slidedown.in.reverse{z-index:0;-webkit-animation-name:dontmove}.slidedown.out.reverse{-webkit-transform:translateY(-100%);z-index:10;-webkit-animation-name:slideouttotop}@-webkit-keyframes slideinfromright{from{-webkit-transform:translateX(100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translateX(-100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(100%)}}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.out{z-index:0;-webkit-animation-name:fadeout}.fade.in{opacity:1;z-index:10;-webkit-animation-name:fadein}.viewport-flip{-webkit-perspective:1000;position:absolute}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden}.flip{-webkit-animation-duration:.65s;-webkit-backface-visibility:hidden;-webkit-transform:translateX(0)}.flip.out{-webkit-transform:rotateY(-180deg) scale(.8);-webkit-animation-name:flipouttoleft}.flip.in{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromleft}.flip.out.reverse{-webkit-transform:rotateY(180deg) scale(.8);-webkit-animation-name:flipouttoright}.flip.in.reverse{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromright}@-webkit-keyframes flipinfromright{from{-webkit-transform:rotateY(-180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipinfromleft{from{-webkit-transform:rotateY(180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(-180deg) scale(.8)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(180deg) scale(.8)}}@-webkit-keyframes dontmove{from{opacity:1}to{opacity:1}}.pop{-webkit-transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);opacity:1;-webkit-animation-name:popin;z-index:10}.pop.in.reverse{z-index:0;-webkit-animation-name:dontmove}.pop.out.reverse{-webkit-transform:scale(.2);opacity:0;-webkit-animation-name:popout;z-index:10}@-webkit-keyframes popin{from{-webkit-transform:scale(.2);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.2);opacity:0}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px}.ui-grid-solo .ui-block-a{width:100%;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:50%}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.333%}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:25%}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:20%}.ui-grid-d .ui-block-a{clear:left}.ui-header,.ui-footer,.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{position:absolute;overflow:hidden;width:100%;border-left-width:0;border-right-width:0}.ui-header-fixed,.ui-footer-fixed{z-index:1000;-webkit-transform:translateZ(0)}.ui-footer-duplicate,.ui-page-fullscreen .ui-fixed-inline{display:none}.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{opacity:.9}.ui-navbar{overflow:hidden}.ui-navbar ul,.ui-navbar-expanded ul{list-style:none;padding:0;margin:0;position:relative;display:block;border:0}.ui-navbar-collapsed ul{float:left;width:75%;margin-right:-2px}.ui-navbar-collapsed .ui-navbar-toggle{float:left;width:25%}.ui-navbar li.ui-navbar-truncate{position:absolute;left:-9999px;top:-9999px}.ui-navbar li .ui-btn,.ui-navbar .ui-navbar-toggle .ui-btn{display:block;font-size:12px;text-align:center;margin:0;border-right-width:0}.ui-navbar li .ui-btn{margin-right:-1px}.ui-navbar li .ui-btn:last-child{margin-right:0}.ui-header .ui-navbar li .ui-btn,.ui-header .ui-navbar .ui-navbar-toggle .ui-btn,.ui-footer .ui-navbar li .ui-btn,.ui-footer .ui-navbar .ui-navbar-toggle .ui-btn{border-top-width:0;border-bottom-width:0}.ui-navbar .ui-btn-inner{padding-left:2px;padding-right:2px}.ui-navbar-noicons li .ui-btn .ui-btn-inner,.ui-navbar-noicons .ui-navbar-toggle .ui-btn-inner{padding-top:.8em;padding-bottom:.9em}.ui-navbar-expanded .ui-btn{margin:0;font-size:14px}.ui-navbar-expanded .ui-btn-inner{padding-left:5px;padding-right:5px}.ui-navbar-expanded .ui-btn-icon-top .ui-btn-inner{padding:45px 5px 15px;text-align:center}.ui-navbar-expanded .ui-btn-icon-top .ui-icon{top:15px}.ui-navbar-expanded .ui-btn-icon-bottom .ui-btn-inner{padding:15px 5px 45px;text-align:center}.ui-navbar-expanded .ui-btn-icon-bottom .ui-icon{bottom:15px}.ui-navbar-expanded li .ui-btn .ui-btn-inner{min-height:2.5em}.ui-navbar-expanded .ui-navbar-noicons .ui-btn .ui-btn-inner{padding-top:1.8em;padding-bottom:1.9em}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 5px;padding:0}.ui-header .ui-btn,.ui-footer .ui-btn,.ui-bar .ui-btn{display:inline-block;font-size:13px;margin:0}.ui-btn-inline{display:inline-block}.ui-btn-inner{padding:.6em 25px;display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;position:relative;zoom:1}.ui-btn input,.ui-btn button{z-index:2}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-bar .ui-btn-inner{padding:.4em 8px .5em}.ui-btn-icon-notext{width:24px;height:24px}.ui-btn-icon-notext .ui-btn-inner{padding:2px 1px 2px 3px}.ui-btn-text{position:relative;z-index:1}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-9999px}.ui-btn-icon-left .ui-btn-inner{padding-left:33px}.ui-header .ui-btn-icon-left .ui-btn-inner,.ui-footer .ui-btn-icon-left .ui-btn-inner,.ui-bar .ui-btn-icon-left .ui-btn-inner{padding-left:27px}.ui-btn-icon-right .ui-btn-inner{padding-right:33px}.ui-header .ui-btn-icon-right .ui-btn-inner,.ui-footer .ui-btn-icon-right .ui-btn-inner,.ui-bar .ui-btn-icon-right .ui-btn-inner{padding-right:27px}.ui-btn-icon-top .ui-btn-inner{padding-top:33px}.ui-header .ui-btn-icon-top .ui-btn-inner,.ui-footer .ui-btn-icon-top .ui-btn-inner,.ui-bar .ui-btn-icon-top .ui-btn-inner{padding-top:27px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:33px}.ui-header .ui-btn-icon-bottom .ui-btn-inner,.ui-footer .ui-btn-icon-bottom .ui-btn-inner,.ui-bar .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:27px}.ui-btn-icon-notext .ui-icon{display:block;z-index:0}.ui-btn-icon-left .ui-icon,.ui-btn-icon-right .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-icon,.ui-btn-icon-bottom .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-btn-icon-top .ui-icon{top:10px}.ui-btn-icon-bottom .ui-icon{bottom:10px}.ui-header .ui-btn-icon-left .ui-icon,.ui-footer .ui-btn-icon-left .ui-icon,.ui-bar .ui-btn-icon-left .ui-icon{left:4px}.ui-header .ui-btn-icon-right .ui-icon,.ui-footer .ui-btn-icon-right .ui-icon,.ui-bar .ui-btn-icon-right .ui-icon{right:4px}.ui-header .ui-btn-icon-top .ui-icon,.ui-footer .ui-btn-icon-top .ui-icon,.ui-bar .ui-btn-icon-top .ui-icon{top:4px}.ui-header .ui-btn-icon-bottom .ui-icon,.ui-footer .ui-btn-icon-bottom .ui-icon,.ui-bar .ui-btn-icon-bottom .ui-icon{bottom:4px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:button;opacity:.1;cursor:pointer;background:transparent;font-size:1px;border:0;line-height:999px}.ui-collapsible{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -8px;padding:0;border-width:0 0 1px 0;position:relative}.ui-collapsible-heading a{text-align:left;margin:0}.ui-collapsible-heading a .ui-btn-inner{padding-left:40px}.ui-collapsible-heading a span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading a span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading a span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:fixed;left:-9999px}.ui-collapsible-content{display:block;margin:0 -8px;padding:10px 16px;border-top:0;background-image:none;font-weight:normal}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible{margin:-1px 0 0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0 1em}.ui-bar .ui-controlgroup{margin:0 .3em}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em}.ui-controlgroup-controls{display:block;width:100%}.ui-controlgroup li{list-style:none}.ui-controlgroup-vertical .ui-btn,.ui-controlgroup-vertical .ui-checkbox,.ui-controlgroup-vertical .ui-radio{margin:0;border-bottom-width:0}.ui-controlgroup-controls label.ui-select{position:absolute;left:-9999px}.ui-controlgroup-vertical .ui-controlgroup-last{border-bottom-width:1px}.ui-controlgroup-horizontal{padding:0}.ui-controlgroup-horizontal .ui-btn,.ui-controlgroup-horizontal .ui-select{display:inline-block;margin:0 -5px 0 0}.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{float:left;margin:0 -1px 0 0}.ui-controlgroup-horizontal .ui-checkbox .ui-btn,.ui-controlgroup-horizontal .ui-radio .ui-btn,.ui-controlgroup-horizontal .ui-checkbox:last-child,.ui-controlgroup-horizontal .ui-radio:last-child{margin-right:0}.ui-controlgroup-horizontal .ui-controlgroup-last{margin-right:0}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}@media all and (min-width:450px){.ui-field-contain .ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-controlgroup-controls{width:60%;display:inline-block}.ui-field-contain .ui-controlgroup .ui-select{width:100%}.ui-field-contain .ui-controlgroup-horizontal .ui-select{width:auto}}.ui-dialog{min-height:480px}.ui-dialog .ui-header,.ui-dialog .ui-content,.ui-dialog .ui-footer{max-width:500px;margin:10% auto 0 auto;padding:15px;width:85%;position:relative}.ui-dialog .ui-header{padding:0 15px}.ui-dialog .ui-header,.ui-dialog .ui-footer{z-index:10}.ui-dialog .ui-content,.ui-dialog .ui-footer{margin-top:-15px}.ui-checkbox,.ui-radio{position:relative;margin:.2em 0 .5em;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{margin:0;text-align:left;z-index:2}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain{padding:1.5em 0;margin:0;border-bottom-width:1px;overflow:visible}.ui-field-contain:first-child{border-top-width:0}@media all and (min-width:450px){.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{overflow:hidden}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:button;left:0;top:0;width:100%;min-height:1.5em;min-height:100%;height:3em;max-height:100%;opacity:0;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);z-index:2}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:.0001}}.ui-select .ui-btn select.ui-select-nativeonly{opacity:1;text-indent:0}.ui-select .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}label.ui-select{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:block;min-height:1em;overflow:hidden}.ui-select .ui-btn-text{text-overflow:ellipsis}.ui-selectmenu{position:absolute;padding:0;z-index:100!important;width:80%;max-width:350px;padding:6px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-selectmenu-hidden{top:-9999px;left:-9999px}.ui-selectmenu-screen{position:absolute;top:0;left:0;width:100%;height:100%;z-index:99}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header .ui-title{margin:.6em 46px .8em}@media all and (min-width:450px){.ui-field-contain label.ui-select{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-select{width:60%;display:inline-block}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em 1.5%;line-height:1.4;font-size:16px;display:block;width:97%}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}.ui-input-search{padding:0 30px;background-image:none;position:relative}.ui-icon-searchfield:after{position:absolute;left:7px;top:50%;margin-top:-9px;content:"";width:18px;height:18px;opacity:.5}.ui-input-search input.ui-input-text{border:0;width:98%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-13px}.ui-input-search .ui-input-clear-hidden{display:none}@media all and (min-width:450px){.ui-field-contain label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text,.ui-field-contain .ui-input-search{width:60%;display:inline-block}.ui-field-contain .ui-input-search{width:50%}.ui-hide-label input.ui-input-text,.ui-hide-label textarea.ui-input-text,.ui-hide-label .ui-input-search{padding:.4em 1.5%;width:97%}.ui-input-search input.ui-input-text{width:98%}}.ui-listview{margin:0;counter-reset:listnumbering}.ui-content .ui-listview{margin:-15px}.ui-content .ui-listview-inset{margin:1em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-divider,.ui-li-static{padding:.5em 15px;font-size:14px;font-weight:bold}.ui-li-divider{counter-reset:listnumbering}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:normal;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li:last-child,.ui-li.ui-field-contain:last-child{border-bottom-width:1px}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 15px .7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:60px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-count{padding-right:45px}.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow{padding-right:30px}.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow.ui-li-has-count{padding-right:75px}.ui-li-has-count .ui-btn-text{padding-right:15px}.ui-li-heading{font-size:16px;font-weight:bold;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:normal;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-thumb,.ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-li-icon{max-height:40px;max-width:40px;left:10px;top:.9em}.ui-li-thumb,.ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:95px}.ui-li-has-count .ui-li-count{position:absolute;font-size:11px;font-weight:bold;padding:.2em .5em;top:50%;margin-top:-.9em;right:38px}.ui-li-divider .ui-li-count,.ui-li-static .ui-li-count{right:10px}.ui-li-has-alt .ui-li-count{right:55px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0;z-index:2}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-11px 0 0 0;border-bottom-width:1px;z-index:-1}.ui-li-link-alt .ui-btn-inner{padding:0;height:100%;position:absolute;width:100%;top:0;left:0}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-listview * .ui-btn-inner>.ui-btn>.ui-btn-inner{border-top:0}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-listview-filter-inset{margin:-15px -5px -15px -5px;background:transparent}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}input.ui-slider-input,.ui-field-contain input.ui-slider-input{display:inline-block;width:50px}select.ui-slider-switch{display:none}div.ui-slider{position:relative;display:inline-block;overflow:visible;height:15px;padding:0;margin:0 2% 0 20px;top:4px;width:66%}div.ui-slider-switch{width:99.8%}a.ui-slider-handle{position:absolute;z-index:10;top:50%;width:28px;height:28px;margin-top:-15px;margin-left:-15px}a.ui-slider-handle .ui-btn-inner{padding-left:0;padding-right:0}@media all and (min-width:480px){.ui-field-contain label.ui-slider{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain div.ui-slider{width:43%}}div.ui-slider-switch{height:32px;overflow:hidden;margin-left:0}div.ui-slider-inneroffset{margin-left:50%;position:absolute;top:1px;height:100%;width:50%}a.ui-slider-handle-snapping{-webkit-transition:left 100ms linear}div.ui-slider-labelbg{position:absolute;top:0;margin:0;border-width:0}div.ui-slider-switch div.ui-slider-labelbg-a{width:60%;height:100%;left:0}div.ui-slider-switch div.ui-slider-labelbg-b{width:60%;height:100%;right:0}.ui-slider-switch-a div.ui-slider-labelbg-a,.ui-slider-switch-b div.ui-slider-labelbg-b{z-index:-1}.ui-slider-switch-a div.ui-slider-labelbg-b,.ui-slider-switch-b div.ui-slider-labelbg-a{z-index:0}div.ui-slider-switch a.ui-slider-handle{z-index:20;width:101%;height:32px;margin-top:-18px;margin-left:-101%}span.ui-slider-label{width:100%;position:absolute;height:32px;font-size:16px;text-align:center;line-height:2;background:0;border-color:transparent}span.ui-slider-label-a{left:-100%;margin-right:-1px}span.ui-slider-label-b{right:-100%;margin-left:-1px} \ No newline at end of file diff --git a/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.jgz b/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.jgz index c689a9187f0..43f8746af6c 100644 Binary files a/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.jgz and b/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.jgz differ diff --git a/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.js b/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.js index 771115fee24..a99df190355 100644 --- a/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.js +++ b/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.js @@ -1,146 +1,175 @@ /*! - * jQuery Mobile v1.0b1 + * jQuery Mobile v1.0rc2 * http://jquerymobile.com/ * * Copyright 2010, jQuery Project * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license */ -(function(a,d){if(a.cleanData){var c=a.cleanData;a.cleanData=function(e){for(var b=0,d;(d=e[b])!=null;b++)a(d).triggerHandler("remove");c(e)}}else{var b=a.fn.remove;a.fn.remove=function(e,c){return this.each(function(){c||(!e||a.filter(e,[this]).length)&&a("*",this).add([this]).each(function(){a(this).triggerHandler("remove")});return b.call(a(this),e,c)})}}a.widget=function(e,b,c){var d=e.split(".")[0],h,e=e.split(".")[1];h=d+"-"+e;if(!c)c=b,b=a.Widget;a.expr[":"][h]=function(b){return!!a.data(b, -e)};a[d]=a[d]||{};a[d][e]=function(a,e){arguments.length&&this._createWidget(a,e)};b=new b;b.options=a.extend(!0,{},b.options);a[d][e].prototype=a.extend(!0,b,{namespace:d,widgetName:e,widgetEventPrefix:a[d][e].prototype.widgetEventPrefix||e,widgetBaseClass:h},c);a.widget.bridge(e,a[d][e])};a.widget.bridge=function(e,b){a.fn[e]=function(c){var i=typeof c==="string",h=Array.prototype.slice.call(arguments,1),l=this,c=!i&&h.length?a.extend.apply(null,[!0,c].concat(h)):c;if(i&&c.charAt(0)==="_")return l; -i?this.each(function(){var b=a.data(this,e);if(!b)throw"cannot call methods on "+e+" prior to initialization; attempted to call method '"+c+"'";if(!a.isFunction(b[c]))throw"no such method '"+c+"' for "+e+" widget instance";var f=b[c].apply(b,h);if(f!==b&&f!==d)return l=f,!1}):this.each(function(){var d=a.data(this,e);d?d.option(c||{})._init():a.data(this,e,new b(c,this))});return l}};a.Widget=function(a,b){arguments.length&&this._createWidget(a,b)};a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"", -options:{disabled:!1},_createWidget:function(b,c){a.data(c,this.widgetName,this);this.element=a(c);this.options=a.extend(!0,{},this.options,this._getCreateOptions(),b);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){var b={};a.metadata&&(b=a.metadata.get(element)[this.widgetName]);return b},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName); -this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(b,c){var g=b;if(arguments.length===0)return a.extend({},this.options);if(typeof b==="string"){if(c===d)return this.options[b];g={};g[b]=c}this._setOptions(g);return this},_setOptions:function(b){var c=this;a.each(b,function(a,b){c._setOption(a,b)});return this},_setOption:function(a,b){this.options[a]=b;a==="disabled"&& -this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",b);return this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_trigger:function(b,c,d){var i=this.options[b],c=a.Event(c);c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase();d=d||{};if(c.originalEvent)for(var b=a.event.props.length,h;b;)h=a.event.props[--b],c[h]=c.originalEvent[h];this.element.trigger(c, -d);return!(a.isFunction(i)&&i.call(this.element[0],c,d)===!1||c.isDefaultPrevented())}}})(jQuery);(function(a,d){a.widget("mobile.widget",{_getCreateOptions:function(){var c=this.element,b={};a.each(this.options,function(a){var f=c.jqmData(a.replace(/[A-Z]/g,function(a){return"-"+a.toLowerCase()}));f!==d&&(b[a]=f)});return b}})})(jQuery); -(function(a){function d(){var d=c.width(),g=[],i=[],h;b.removeClass("min-width-"+e.join("px min-width-")+"px max-width-"+e.join("px max-width-")+"px");a.each(e,function(a,b){d>=b&&g.push("min-width-"+b+"px");d<=b&&i.push("max-width-"+b+"px")});g.length&&(h=g.join(" "));i.length&&(h+=" "+i.join(" "));b.addClass(h)}var c=a(window),b=a("html"),e=[320,480,768,1024];a.mobile.media=function(){var c={},e=a("
"),d=a("").append(e);return function(a){if(!(a in c)){var l=document.createElement("style"), -m="@media "+a+" { #jquery-mediatest { position:absolute; } }";l.type="text/css";l.styleSheet?l.styleSheet.cssText=m:l.appendChild(document.createTextNode(m));b.prepend(d).prepend(l);c[a]=e.css("position")==="absolute";d.add(l).remove()}return c[a]}}();a.mobile.addResolutionBreakpoints=function(b){a.type(b)==="array"?e=e.concat(b):e.push(b);e.sort(function(a,b){return a-b});d()};a(document).bind("mobileinit.htmlclass",function(){c.bind("orientationchange.htmlclass throttledResize.htmlclass",function(a){a.orientation&& -b.removeClass("portrait landscape").addClass(a.orientation);d()})});a(function(){c.trigger("orientationchange.htmlclass")})})(jQuery); -(function(a,d){function c(a){var b=a.charAt(0).toUpperCase()+a.substr(1),a=(a+" "+f.join(b+" ")+b).split(" "),c;for(c in a)if(e[c]!==d)return!0}var b=a("").prependTo("html"),e=b[0].style,f=["webkit","moz","o"],g="palmGetResource"in window,i=window.blackberry;a.mobile.browser={};a.mobile.browser.ie=function(){for(var a=3,b=document.createElement("div"),c=b.all||[];b.innerHTML="<\!--[if gt IE "+ ++a+"]>
",c[0];);return a>4?a:!a}();a.extend(a.support,{orientation:"orientation"in -window,touch:"ontouchend"in document,cssTransitions:"WebKitTransitionEvent"in window,pushState:!!history.pushState,mediaquery:a.mobile.media("only all"),cssPseudoElement:!!c("content"),boxShadow:!!c("boxShadow")&&!i,scrollTop:("pageXOffset"in window||"scrollTop"in document.documentElement||"scrollTop"in b[0])&&!g,dynamicBaseTag:function(){var c=location.protocol+"//"+location.host+location.pathname+"ui-dir/",e=a("head base"),d=null,f="";e.length?f=e.attr("href"):e=d=a("",{href:c}).appendTo("head"); -var g=a("").prependTo(b)[0].href;e[0].href=f?f:location.pathname;d&&d.remove();return g.indexOf(c)===0}(),eventCapture:"addEventListener"in document});b.remove();a.support.boxShadow||a("html").addClass("ui-mobile-nosupport-boxshadow")})(jQuery); -(function(a,d,c,b){function e(a){for(;a&&typeof a.originalEvent!=="undefined";)a=a.originalEvent;return a}function f(b){for(var c={};b;){var e=a.data(b,n),d;for(d in e)if(e[d])c[d]=c.hasVirtualBinding=!0;b=b.parentNode}return c}function g(){v&&(clearTimeout(v),v=0);v=setTimeout(function(){A=v=0;B.length=0;w=!1;r=!0},a.vmouse.resetTimerDuration)}function i(c,d,r){var f=!1,g;if(!(g=r&&r[c])){if(r=!r)a:{for(r=d.target;r;){if((g=a.data(r,n))&&(!c||g[c]))break a;r=r.parentNode}r=null}g=r}if(g){f=d;r=f.type; -f=a.Event(f);f.type=c;var h=f.originalEvent,j=a.event.props;if(h)for(c=j.length;c;)g=j[--c],f[g]=h[g];if(r.search(/^touch/)!==-1&&(c=e(h),r=c.touches,c=c.changedTouches,r=r&&r.length?r[0]:c&&c.length?c[0]:b)){c=0;for(h=y.length;ch||Math.abs(c.pageY-u)>h;c=f(b.target);s&&!d&&i("vmousecancel",b,c);i("vmousemove",b,c);g()}}function j(a){if(!r){r=!0;var b=f(a.target);i("vmouseup",a,b);if(!s&&i("vclick",a,b)){var c=e(a).changedTouches[0];B.push({touchID:A, -x:c.clientX,y:c.clientY});w=!0}i("vmouseout",a,b);s=!1;g()}}function p(b){var b=a.data(b,n),c;if(b)for(c in b)if(b[c])return!0;return!1}function k(){}function q(b){var c=b.substr(1);return{setup:function(){p(this)||a.data(this,n,{});a.data(this,n)[b]=!0;t[b]=(t[b]||0)+1;t[b]===1&&C.bind(c,h);a(this).bind(c,k);if(E)t.touchstart=(t.touchstart||0)+1,t.touchstart===1&&C.bind("touchstart",l).bind("touchend",j).bind("touchmove",o).bind("scroll",m)},teardown:function(){--t[b];t[b]||C.unbind(c,h);E&&(--t.touchstart, -t.touchstart||C.unbind("touchstart",l).unbind("touchmove",o).unbind("touchend",j).unbind("scroll",m));var d=a(this),e=a.data(this,n);e&&(e[b]=!1);d.unbind(c,k);p(this)||d.removeData(n)}}}var n="virtualMouseBindings",z="virtualTouchID",d="vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),y="clientX clientY pageX pageY screenX screenY".split(" "),t={},v=0,x=0,u=0,s=!1,B=[],w=!1,r=!1,E=a.support.eventCapture,C=a(c),F=1,A=0;a.vmouse={moveDistanceThreshold:10,clickDistanceThreshold:10, -resetTimerDuration:1500};for(var D=0;D10&&a.preventDefault()}}var m=c.originalEvent.touches?c.originalEvent.touches[0]:c,o={time:(new Date).getTime(),coords:[m.pageX,m.pageY],origin:a(c.target)},j;b.bind(g,e).one(f,function(){b.unbind(g,e); -o&&j&&j.time-o.time<1E3&&Math.abs(o.coords[0]-j.coords[0])>30&&Math.abs(o.coords[1]-j.coords[1])<75&&o.origin.trigger("swipe").trigger(o.coords[0]>j.coords[0]?"swipeleft":"swiperight");o=j=d})})}};(function(a){function b(){var a=d();a!==e&&(e=a,c.trigger("orientationchange"))}var c=a(window),d,e;a.event.special.orientationchange={setup:function(){if(a.support.orientation)return!1;e=d();c.bind("throttledresize",b)},teardown:function(){if(a.support.orientation)return!1;c.unbind("throttledresize",b)}, -add:function(a){var b=a.handler;a.handler=function(a){a.orientation=d();return b.apply(this,arguments)}}};a.event.special.orientationchange.orientation=d=function(){var a=document.documentElement;return a&&a.clientWidth/a.clientHeight<1.1?"portrait":"landscape"}})(jQuery);(function(){a.event.special.throttledresize={setup:function(){a(this).bind("resize",b)},teardown:function(){a(this).unbind("resize",b)}};var b=function(){e=(new Date).getTime();f=e-c;f>=250?(c=e,a(this).trigger("throttledresize")): -(d&&clearTimeout(d),d=setTimeout(b,250-f))},c=0,d,e,f})();a.each({scrollstop:"scrollstart",taphold:"tap",swipeleft:"swipe",swiperight:"swipe"},function(b,c){a.event.special[b]={setup:function(){a(this).bind(c,a.noop)}}})})(jQuery); -(function(a,d,c){function b(a){a=a||location.href;return"#"+a.replace(/^[^#]*#?(.*)$/,"$1")}var e="hashchange",f=document,g,i=a.event.special,h=f.documentMode,l="on"+e in d&&(h===c||h>7);a.fn[e]=function(a){return a?this.bind(e,a):this.trigger(e)};a.fn[e].delay=50;i[e]=a.extend(i[e],{setup:function(){if(l)return!1;a(g.start)},teardown:function(){if(l)return!1;a(g.stop)}});g=function(){function g(){var c=b(),f=n(i);if(c!==i)q(i=c,f),a(d).trigger(e);else if(f!==i)location.href=location.href.replace(/#.*/, -"")+f;j=setTimeout(g,a.fn[e].delay)}var h={},j,i=b(),k=function(a){return a},q=k,n=k;h.start=function(){j||g()};h.stop=function(){j&&clearTimeout(j);j=c};a.browser.msie&&!l&&function(){var c,d;h.start=function(){if(!c)d=(d=a.fn[e].src)&&d+b(),c=a('