From 2191a4dc73362c37b6c7fad32780d96526c62133 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Jul 2012 21:43:40 +0200 Subject: [PATCH 1/3] Fix: use ENGINE=innodb instead of type=innodb --- dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql | 2 +- dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql | 2 +- dev/dbmodel/emulate_oscommerce/llx_osc_order.sql | 2 +- dev/dbmodel/emulate_oscommerce/llx_osc_product.sql | 2 +- htdocs/admin/modules.php | 2 +- htdocs/admin/system/database-tables.php | 2 +- htdocs/install/etape2.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql index 84bfd1e6558..23a96cc996b 100755 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql @@ -23,4 +23,4 @@ CREATE TABLE llx_osc_categories ( PRIMARY KEY (rowid), UNIQUE KEY dolicatid (dolicatid), UNIQUE KEY osccatid (osccatid) -) TYPE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC'; +) ENGINE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC'; diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql index 1d3a65615ee..3f878e97ff5 100755 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql @@ -22,4 +22,4 @@ CREATE TABLE llx_osc_customer ( fk_soc int(11) NOT NULL default '0', PRIMARY KEY (rowid), UNIQUE KEY fk_soc (fk_soc) -) TYPE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr'; +) ENGINE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr'; diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql index 8927849df6c..a2cb1ad8146 100755 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql @@ -22,4 +22,4 @@ CREATE TABLE llx_osc_order ( fk_commande int(11) NOT NULL default '0', PRIMARY KEY (rowid), UNIQUE KEY fk_commande (fk_commande) -) TYPE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr'; +) ENGINE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr'; diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql index 9b7e463aa19..dba9ca1fef1 100755 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql @@ -22,6 +22,6 @@ CREATE TABLE llx_osc_product ( fk_product int(11) NOT NULL default '0', PRIMARY KEY (rowid), UNIQUE KEY fk_product (fk_product) -) TYPE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr'; +) ENGINE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr'; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 8c39f3a8fe7..5db40f5cdbd 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -111,7 +111,7 @@ foreach ($modulesdir as $dir) { // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; - dol_syslog("Scan directory ".$dir." for modules"); + dol_syslog("Scan directory ".$dir." for module descriptor files (modXXX.class.php)"); $handle=@opendir($dir); if (is_resource($handle)) { diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index b634d98e6b7..abba79fc5cc 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -32,7 +32,7 @@ if (!$user->admin) accessforbidden(); if ($_GET["action"] == 'convert') { - $db->query("alter table ".$_GET["table"]." type=INNODB"); + $db->query("alter table ".$_GET["table"]." ENGINE=INNODB"); } diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index b8373847c25..a8904cd10ab 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -188,7 +188,7 @@ if ($action == "set") fclose($fp); $buffer=trim($buffer); - if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') // For Mysql 5.5+, we must replace type=innodb + if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') // For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb { $buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer); } From 190f005b687b588fd1a98a51010d69e9152146d1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Jul 2012 21:44:00 +0200 Subject: [PATCH 2/3] New: ECM module is full Ajax --- htdocs/ecm/index.php | 2 +- .../connectors/jqueryFileTree.asp | 44 ++++++++ .../connectors/jqueryFileTree.aspx | 31 ++++++ .../connectors/jqueryFileTree.cf | 19 ++++ .../connectors/jqueryFileTree.jsp | 49 +++++++++ .../connectors/jqueryFileTree.php | 43 ++++++++ .../connectors/jqueryFileTree.pl | 102 ++++++++++++++++++ .../connectors/jqueryFileTree.py | 25 +++++ .../connectors/jqueryFileTree.rb | 61 +++++++++++ .../connectors/jqueryFileTree_huck.lasso | 36 +++++++ .../connectors/jqueryFileTree_sabourdin.lasso | 48 +++++++++ .../jqueryFileTree/images/application.png | Bin 0 -> 464 bytes .../plugins/jqueryFileTree/images/code.png | Bin 0 -> 603 bytes .../plugins/jqueryFileTree/images/css.png | Bin 0 -> 618 bytes .../plugins/jqueryFileTree/images/db.png | Bin 0 -> 579 bytes .../jqueryFileTree/images/directory.png | Bin 0 -> 537 bytes .../plugins/jqueryFileTree/images/doc.png | Bin 0 -> 651 bytes .../plugins/jqueryFileTree/images/file.png | Bin 0 -> 294 bytes .../plugins/jqueryFileTree/images/film.png | Bin 0 -> 653 bytes .../plugins/jqueryFileTree/images/flash.png | Bin 0 -> 582 bytes .../jqueryFileTree/images/folder_open.png | Bin 0 -> 583 bytes .../plugins/jqueryFileTree/images/html.png | Bin 0 -> 734 bytes .../plugins/jqueryFileTree/images/java.png | Bin 0 -> 633 bytes .../plugins/jqueryFileTree/images/linux.png | Bin 0 -> 668 bytes .../plugins/jqueryFileTree/images/music.png | Bin 0 -> 385 bytes .../plugins/jqueryFileTree/images/pdf.png | Bin 0 -> 591 bytes .../plugins/jqueryFileTree/images/php.png | Bin 0 -> 538 bytes .../plugins/jqueryFileTree/images/picture.png | Bin 0 -> 606 bytes .../plugins/jqueryFileTree/images/ppt.png | Bin 0 -> 588 bytes .../plugins/jqueryFileTree/images/psd.png | Bin 0 -> 856 bytes .../plugins/jqueryFileTree/images/ruby.png | Bin 0 -> 626 bytes .../plugins/jqueryFileTree/images/script.png | Bin 0 -> 859 bytes .../plugins/jqueryFileTree/images/spinner.gif | Bin 0 -> 2530 bytes .../plugins/jqueryFileTree/images/txt.png | Bin 0 -> 342 bytes .../plugins/jqueryFileTree/images/xls.png | Bin 0 -> 663 bytes .../plugins/jqueryFileTree/images/zip.png | Bin 0 -> 386 bytes .../plugins/jqueryFileTree/jqueryFileTree.css | 90 ++++++++++++++++ .../plugins/jqueryFileTree/jqueryFileTree.js | 97 +++++++++++++++++ 38 files changed, 646 insertions(+), 1 deletion(-) create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.asp create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.aspx create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.cf create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.jsp create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.rb create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_huck.lasso create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_sabourdin.lasso create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css create mode 100755 htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 1b2fb5a5d2e..c8d638c779e 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -315,7 +315,7 @@ if ($action == 'refreshmanual') //print "xx".$_SESSION["dol_screenheight"]; $maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500)?($_SESSION["dol_screenheight"]-166):660; $morejs=array(); -if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs=array("/filemanager/includes/jqueryFileTree/jqueryFileTree.js"); // TODO Move lib into includes +if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs=array("/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js"); $moreheadcss="