Merge pull request #25 from geekwright/master

Standardized avatar, database logging cleanup
XOOPS · Oct 6, 2013 · 7e0703b · 7e0703b
2 parents df113b0 + 8a33fa9
commit 7e0703b
Show file tree

Hide file tree

Showing 50 changed files with 2,236 additions and 1,489 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,12 @@ htdocs/mainfile.php
 htdocs/xoops_data/caches/smarty_cache/*.php
 htdocs/xoops_data/caches/smarty_compile/*.php
 htdocs/xoops_data/caches/xoops_cache/*.php
+htdocs/xoops_data/caches/xoops_cache/*/
 htdocs/xoops_data/configs/*.php
+htdocs/xoops_data/composer/
 htdocs/xoops_data/data/secure.php
+htdocs/xoops_data/logs/
 htdocs/xoops_lib/vendor/
 htdocs/xoops_lib/composer.lock
+htdocs/uploads/avatars/
 htdocs/uploads/banners/
diff --git a/htdocs/class/database/databasefactory.php b/htdocs/class/database/databasefactory.php
@@ -9,6 +9,8 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+use Xoops\Core\Database\Logging\XoopsDebugStack;
+
 /**
  * XoopsDatabaseFactory class
  *
@@ -24,7 +26,6 @@
  * @link      http://xoops.org
  * @since     2.6.0
  */
-
 class XoopsDatabaseFactory
 {
 
@@ -49,6 +50,7 @@ public static function getDatabaseConnection()
         if (!isset($instance)) {
             //New database connector
             $config = new \Doctrine\DBAL\Configuration();
+            $config->setSQLLogger(new XoopsDebugStack());
             $connectionParams = array(
                 'dbname' => XOOPS_DB_NAME,
                 'user' => XOOPS_DB_USER,