Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin int…

…o 0609_monitor
phpmyadmin · Jun 13, 2013 · 438c841 · 438c841
2 parents 9156b61 + ca3c8a0
commit 438c841
Show file tree

Hide file tree

Showing 192 changed files with 35,427 additions and 31,906 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,5 +3,8 @@ php:
   - "5.5"
   - "5.4"
   - "5.3"
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq ant
 before_script: ./scripts/generate-mo --quiet
-script: phpunit --configuration phpunit.xml.nocoverage
+script: ant phpunit-nocoverage lint
diff --git a/ChangeLog b/ChangeLog
@@ -15,6 +15,10 @@ phpMyAdmin - ChangeLog
 + rfe #1423 Clarify option text for icon/text settings
 + [interface] Upgraded CodeMirror to 3.x series
 + rfe #1363 Improved query profiler
++ [interface] rfe #1429 Better suggestion for database name
++ rfe #1433 Support relations with ndbcluster
+- bug #3962 Proper escaping of JSON export
++ rfe #1328 Optional ReCAPTCHA support
 
 4.0.4.0 (not yet released)
 - bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
@@ -28,6 +32,9 @@ not set
 - bug #3971 Ctrl/shift + click opens links in same window
 - bug #3964 Import using https does not work
 - bug Missing removeCRLF option in ExportCsv and ExportExcel plugins
+- bug #3631 Drop not working Visio schema export.
+- bug #3645 Better handling of invalid ODS documents
+- bug #3976 Number of pages
 
 4.0.3.0 (2013-06-05)
 - bug #3941 Recent tables list always empty

diff --git a/build.xml b/build.xml
@@ -4,9 +4,6 @@
  <property name="source" value="."/>
  <property name="source_comma_sep" value="."/>
 
- <fileset dir="${source}" includes="js/pmd/*.js,js/*.js" id="jsfiles" />
- <pathconvert pathsep=" " property="js-list" refid="jsfiles" />
-
  <target name="clean" description="Clean up and create artifact directories">
   <delete dir="${basedir}/build/api"/>
   <delete dir="${basedir}/build/code-browser"/>
@@ -47,7 +44,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -62,6 +59,8 @@
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
               --exclude libraries/phpseclib
+              --exclude libraries/plugins/auth/recaptchalib.php
+              --exclude libraries/plugins/auth/swekey/swekey.php
               ${source}" />
   </exec>
  </target>
@@ -76,14 +75,16 @@
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
               --exclude libraries/phpseclib
+              --exclude libraries/plugins/auth/recaptchalib.php
+              --exclude libraries/plugins/auth/swekey/swekey.php
               ${source}" />
   </exec>
  </target>
 
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, tcpdf directories">
   <exec executable="phpcs">
    <arg line="
-	      --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*
+	      --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptchalib.php,*/swekey.php
               --report=checkstyle
               --report-file='${basedir}/build/logs/checkstyle.xml'
               --standard=PMAStandard
@@ -106,10 +107,25 @@
  </target>
 
  <target name="jshint" description="Javascript checks">
-  <exec executable="jshint" output="${basedir}/build/logs/jslint.xml">
-   <arg line="--config ./.jshintrc --jslint-reporter ${js-list}" />
-  </exec>
+  <apply executable="jshint" output="${basedir}/build/logs/jslint.xml"  parallel="true">
+   <arg line="--config ./.jshintrc --jslint-reporter" />
+   <fileset dir="${basedir}">
+    <include name="js/pmd/*.js" />
+    <include name="js/*.js" />
+   </fileset>
+  </apply>
+ </target>
+
+ <target name="lint" description="Perform syntax check of sourcecode files">
+  <apply executable="php" failonerror="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+  </apply>
  </target>
 
- <target name="build" depends="clean,phpunit,pdepend,phpmd,phpcpd,phpcs,phpdoc,phploc,phpcb"/>
+ <target name="build" depends="clean,phpunit,pdepend,phpmd,phpcpd,phpcs,phpdoc,phploc,phpcb,lint,jshint"/>
 </project>
diff --git a/db_create.php b/db_create.php
@@ -10,7 +10,7 @@
  */
 require_once 'libraries/common.inc.php';
 
-require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.inc.php';
 if (! PMA_DRIZZLE) {
     include_once 'libraries/replication.inc.php';
 }

diff --git a/db_operations.php b/db_operations.php
@@ -16,7 +16,7 @@
  * requirements
  */
 require_once 'libraries/common.inc.php';
-require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.inc.php';
 
 /**
  * functions implementation for this script

diff --git a/db_routines.php b/db_routines.php
@@ -11,7 +11,7 @@
  */
 require_once 'libraries/common.inc.php';
 require_once 'libraries/Util.class.php';
-require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.inc.php';
 
 /**
  * Include all other files

diff --git a/db_structure.php b/db_structure.php
@@ -74,7 +74,7 @@
 
 require_once 'libraries/bookmark.lib.php';
 
-require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.inc.php';
 $db_collation = PMA_getDbCollation($db);
 
 $titles = PMA_Util::buildActionTitles();

diff --git a/db_tracking.php b/db_tracking.php
@@ -68,7 +68,7 @@
 
 // If a HEAD version exists
 if ($GLOBALS['dbi']->numRows($all_tables_result) > 0) {
-?>
+    ?>
     <div id="tracked_tables">
     <h3><?php echo __('Tracked tables');?></h3>
 
@@ -151,7 +151,7 @@
     </tbody>
     </table>
     </div>
-<?php
+    <?php
 }
 
 $sep = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
@@ -189,7 +189,7 @@
 
 // If untracked tables exist
 if (isset($my_tables)) {
-?>
+    ?>
     <h3><?php echo __('Untracked tables');?></h3>
 
     <table id="noversions" class="data">
@@ -200,7 +200,7 @@
     </tr>
     </thead>
     <tbody>
-<?php
+    <?php
     // Print out list of untracked tables
 
     $style = 'odd';
@@ -211,12 +211,12 @@
                 . '&amp;table=' . htmlspecialchars($tablename) .'">';
             $my_link .= PMA_Util::getIcon('eye.png', __('Track table'));
             $my_link .= '</a>';
-        ?>
+            ?>
             <tr class="noclick <?php echo $style;?>">
             <td><?php echo htmlspecialchars($tablename);?></td>
             <td><?php echo $my_link;?></td>
             </tr>
-        <?php
+            <?php
             if ($style == 'even') {
                 $style = 'odd';
             } else {
@@ -227,8 +227,7 @@
     ?>
     </tbody>
     </table>
-
-<?php
+    <?php
 }
 // If available print out database log
 if (count($data['ddlog']) > 0) {