web-based upload dir

Documentation.html

@@ -1339,6 +1339,21 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
         <br /><br />
     </dd>
 
+    <dt><b>$cfg['UploadDir'] </b>string</dt>
+    <dd>
+        The name of the directory, ending with a slash, where SQL files have
+        been uploaded by other means than phpMyAdmin (for example, ftp).
+        Those files are available under a drop-down box when you click the
+        database name, then the SQL tab.
+        <br /><br />
+        This feature is useful when your file is too big to be uploaded via
+        HTTP, or when file uploads are disabled in PHP.
+        <br /><br />
+        Please note that if PHP is running in safe mode, this directory must
+        be owned by the same user as the owner of the phpMyAdmin scripts.
+        <br /><br />
+    </dd>
+
     <dt><b>$cfg['RepeatCells'] </b>integer</dt>
     <dd>
     Repeat the headers every X cells, or 0 to deactivate.

config.inc.php3

@@ -355,6 +355,10 @@ $cfg['SQLQuery']['Explain']   = TRUE;       // EXPLAIN on SELECT queries
 $cfg['SQLQuery']['ShowAsPHP'] = TRUE;       // Wrap a query in PHP
 $cfg['SQLQuery']['Validate']  = FALSE;      // Validate a query (see $cfg['SQLValidator'] as well)
 
+/**
+ * web-server upload directory
+ */
+$cfg['UploadDir']             = './upload/';  // end with a slash
 
 /**
  * SQL Parser Settings

db_details.php3

@@ -96,14 +96,37 @@ if ($is_upload) {
             echo '>' . $temp_charset . '</option>' . "\n";
         }
         echo '        </select>';
-    } // end if
+    } // end if (recoding)
     echo "\n";
     ?>
     </div>
     <?php
-} // end if
+} // end if (is upload)
 echo "\n";
 
+// web-server upload directory
+// (TODO: display the charset selection, even if is_upload == FALSE)
+
+if ($cfg['UploadDir'] !='' && $handle = opendir($cfg['UploadDir'])) {
+    $isfirst=0;
+    while ($file = @readdir($handle)) {
+        if(is_file($cfg['UploadDir'] . $file)) {
+            if ($isfirst==0) {
+                echo "\n".'    <i>' . $strOr . '</i> ' . $strWebServerUploadDirectory . '&nbsp;:<br />' . "\n";
+                echo '    <div style="margin-bottom: 5px">' . "\n";
+                echo '        <select size="1" name="sql_localfile">' . "\n";
+                echo '            <option value="" selected></option>' . "\n";
+            } // end if (isfirst)
+            echo '            <option value="'.$file.'">'.$file.'</option>' . "\n";
+            $isfirst++;
+        } // end if (is_file)
+    } // end while
+    if ($isfirst>0) {
+        echo "        </select>\n    </div>\n\n";
+    } // end if (isfirst > 0)
+    @closedir($handle);
+} // end if (web-server upload directory)
+
 // Bookmark Support
 if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) {
     if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) {

lang/afrikaans-iso-8859-1.inc.php3

@@ -430,4 +430,5 @@ $strYes = 'Ja';
 $strZip = '"ge-zip"';
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/afrikaans-utf-8.inc.php3

@@ -431,4 +431,5 @@ $strYes = 'Ja';
 $strZip = '"ge-zip"';
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/albanian-iso-8859-1.inc.php3

@@ -429,4 +429,5 @@ $strZip = '"kompresuar me zip"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/albanian-utf-8.inc.php3

@@ -430,4 +430,5 @@ $strZip = '"kompresuar me zip"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/arabic-utf-8.inc.php3

@@ -445,4 +445,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/arabic-windows-1256.inc.php3

@@ -444,4 +444,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/brazilian_portuguese-iso-8859-1.inc.php3

@@ -444,4 +444,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php3

@@ -445,4 +445,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/bulgarian-koi8-r.inc.php3

@@ -444,4 +444,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php3

@@ -445,4 +445,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/bulgarian-windows-1251.inc.php3

@@ -444,4 +444,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/catalan-iso-8859-1.inc.php3

@@ -431,4 +431,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/catalan-utf-8.inc.php3

@@ -432,4 +432,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/chinese_big5-utf-8.inc.php3

@@ -431,4 +431,5 @@ $strZip = '"zipped"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/chinese_big5.inc.php3

@@ -430,4 +430,5 @@ $strZip = '"zipped"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/chinese_gb-utf-8.inc.php3

@@ -430,4 +430,5 @@ $strZip = '"zipped"';
 
 // To translate
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/chinese_gb.inc.php3

@@ -428,4 +428,5 @@ $strZip = '"zipped"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/croatian-iso-8859-2.inc.php3

@@ -443,4 +443,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/croatian-utf-8.inc.php3

@@ -444,4 +444,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/croatian-windows-1250.inc.php3

@@ -443,4 +443,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/czech-iso-8859-2.inc.php3

@@ -429,4 +429,5 @@ $strYes = 'Ano';
 $strZip = '"zazipov<6F>no"';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/czech-utf-8.inc.php3

@@ -430,4 +430,5 @@ $strYes = 'Ano';
 $strZip = '"zazipováno"';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/czech-windows-1250.inc.php3

@@ -429,4 +429,5 @@ $strYes = 'Ano';
 $strZip = '"zazipov<6F>no"';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/danish-iso-8859-1.inc.php3

@@ -438,4 +438,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/danish-utf-8.inc.php3

@@ -439,4 +439,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/dutch-iso-8859-1.inc.php3

@@ -433,4 +433,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/dutch-utf-8.inc.php3

@@ -434,4 +434,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/english-iso-8859-1.inc.php3

@@ -415,6 +415,7 @@ $strValue = 'Value';
 $strViewDump = 'View dump (schema) of table';
 $strViewDumpDB = 'View dump (schema) of database';
 
+$strWebServerUploadDirectory = 'web-server upload directory';
 $strWelcome = 'Welcome to %s';
 $strWithChecked = 'With selected:';
 $strWrongUser = 'Wrong username/password. Access denied.';

lang/english-utf-8.inc.php3

@@ -416,6 +416,7 @@ $strValue = 'Value';
 $strViewDump = 'View dump (schema) of table';
 $strViewDumpDB = 'View dump (schema) of database';
 
+$strWebServerUploadDirectory = 'web-server upload directory';
 $strWelcome = 'Welcome to %s';
 $strWithChecked = 'With selected:';
 $strWrongUser = 'Wrong username/password. Access denied.';

lang/estonian-iso-8859-1.inc.php3

@@ -424,4 +424,5 @@ $strZip = '"zipitud"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/estonian-utf-8.inc.php3

@@ -425,4 +425,5 @@ $strZip = '"zipitud"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/finnish-iso-8859-1.inc.php3

@@ -427,4 +427,5 @@ $strYes = 'Kyll
 $strZip = '"zip-pakattu"';
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/finnish-utf-8.inc.php3

@@ -428,4 +428,5 @@ $strYes = 'Kyllä';
 $strZip = '"zip-pakattu"';
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/french-iso-8859-1.inc.php3

@@ -415,6 +415,7 @@ $strValue = 'Valeur';
 $strViewDump = '<b>Afficher le sch<63>ma</b> de la table';
 $strViewDumpDB = 'Afficher le sch<63>ma de la base ';
 
+$strWebServerUploadDirectory = 'r<>pertoire de transfert du serveur Web';
 $strWelcome = 'Bienvenue <20> %s ';
 $strWithChecked = 'Pour la s<>lection :';
 $strWrongUser = 'Erreur d\'utilisateur/mot de passe. Acc<63>s refus<75>';

lang/french-utf-8.inc.php3

@@ -424,4 +424,5 @@ $strYes = 'Oui';
 
 $strZip = '"zippé"';
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/galician-iso-8859-1.inc.php3

@@ -431,4 +431,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/galician-utf-8.inc.php3

@@ -432,4 +432,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/georgian-utf-8.inc.php3

@@ -443,4 +443,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/german-iso-8859-1.inc.php3

@@ -432,4 +432,5 @@ $strYes = 'Ja';
 $strZip = 'Zip-komprimiert';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/german-utf-8.inc.php3

@@ -433,4 +433,5 @@ $strYes = 'Ja';
 $strZip = 'Zip-komprimiert';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/greek-iso-8859-7.inc.php3

@@ -442,4 +442,5 @@ $strStructure = '
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/greek-utf-8.inc.php3

@@ -443,4 +443,5 @@ $strStructure = 'Δομή';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/hebrew-iso-8859-8-i.inc.php3

@@ -440,4 +440,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/hindi-utf-8.inc.php3

@@ -444,4 +444,5 @@ $strWrongUser = 'Wrong username/password. Access denied.'; //to translate
 
 $strZip = '"zipped"'; //to translate
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/hungarian-iso-8859-2.inc.php3

@@ -428,4 +428,5 @@ $strNoQuery = 'Nincs SQL k
 $strSearchOption1 = 'at least one of the words';//to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/hungarian-utf-8.inc.php3

@@ -429,4 +429,5 @@ $strNoQuery = 'Nincs SQL kérés!';  //to translate
 $strSearchOption1 = 'at least one of the words';//to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/indonesian-iso-8859-1.inc.php3

@@ -426,4 +426,5 @@ $strZip = '"Dikompress dengan Zip"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/indonesian-utf-8.inc.php3

@@ -427,4 +427,5 @@ $strZip = '"Dikompress dengan Zip"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/italian-iso-8859-1.inc.php3

@@ -430,4 +430,5 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/italian-utf-8.inc.php3

@@ -431,4 +431,5 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/japanese-euc.inc.php3

@@ -436,4 +436,5 @@ $strYes = '
 $strZip = '"zip<69><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/japanese-sjis.inc.php3

@@ -434,4 +434,5 @@ $strYes = '
 $strZip = '"zip<69><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/japanese-utf-8.inc.php3

@@ -434,4 +434,5 @@ $strYes = 'はい';
 $strZip = '"zipされる"';
 // To translate
 
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/korean-ks_c_5601-1987.inc.php3

@@ -443,4 +443,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/latvian-utf-8.inc.php3

@@ -444,4 +444,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/latvian-windows-1257.inc.php3

@@ -443,4 +443,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php3

@@ -431,4 +431,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/lithuanian-windows-1257.inc.php3

@@ -430,4 +430,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/norwegian-iso-8859-1.inc.php3

@@ -438,4 +438,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/norwegian-utf-8.inc.php3

@@ -439,4 +439,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/polish-iso-8859-2.inc.php3

@@ -424,4 +424,5 @@ $strZip = '".zip"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/polish-utf-8.inc.php3

@@ -425,4 +425,5 @@ $strZip = '".zip"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/portuguese-iso-8859-1.inc.php3

@@ -435,4 +435,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/portuguese-utf-8.inc.php3

@@ -436,4 +436,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/romanian-iso-8859-1.inc.php3

@@ -428,4 +428,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/romanian-utf-8.inc.php3

@@ -429,4 +429,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/russian-koi8-r.inc.php3

@@ -434,4 +434,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/russian-utf-8.inc.php3

@@ -435,4 +435,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/russian-windows-1251.inc.php3

@@ -434,4 +434,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/serbian-utf-8.inc.php3

@@ -446,4 +446,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/serbian-windows-1250.inc.php3

@@ -445,4 +445,5 @@ $strStructure = 'Structure';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/slovak-iso-8859-2.inc.php3

@@ -426,4 +426,5 @@ $strZip = '"zo zipovan
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/slovak-utf-8.inc.php3

@@ -427,4 +427,5 @@ $strZip = '"zo zipované"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/slovak-windows-1250.inc.php3

@@ -426,4 +426,5 @@ $strZip = '"zo zipovan
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/slovenian-iso-8859-2.inc.php3

@@ -428,4 +428,5 @@ $strZip = '"zipano"';
 
 // To translate
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/slovenian-utf-8.inc.php3

@@ -429,4 +429,5 @@ $strZip = '"zipano"';
 
 // To translate
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/slovenian-windows-1250.inc.php3

@@ -428,4 +428,5 @@ $strZip = '"zipano"';
 
 // To translate
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/spanish-iso-8859-1.inc.php3

@@ -426,4 +426,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/spanish-utf-8.inc.php3

@@ -427,4 +427,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/swedish-iso-8859-1.inc.php3

@@ -425,4 +425,5 @@ $strZip = '"zippad"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/swedish-utf-8.inc.php3

@@ -426,4 +426,5 @@ $strZip = '"zippad"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/thai-tis-620.inc.php3

@@ -428,4 +428,5 @@ $strZip = '"
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/thai-utf-8.inc.php3

@@ -429,4 +429,5 @@ $strZip = '"ถูกบีบอัดอยู่ (zip)"';
 // To translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/turkish-iso-8859-9.inc.php3

@@ -431,4 +431,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/turkish-utf-8.inc.php3

@@ -432,4 +432,5 @@ $strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php3

@@ -434,4 +434,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

lang/ukrainian-windows-1251.inc.php3

@@ -433,4 +433,5 @@ $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 
 $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';  //to translate
+$strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 ?>

libraries/functions.js

@@ -118,6 +118,9 @@ function checkSqlQuery(theForm)
         if (isEmpty && typeof(theForm.elements['sql_file']) != 'undefined') {
             isEmpty  = (theForm.elements['sql_file'].value == '') ? 1 : 0;
         }
+        if (isEmpty && typeof(theForm.elements['sql_localfile']) != 'undefined') {
+            isEmpty  = (theForm.elements['sql_localfile'].value == '') ? 1 : 0;
+        }
         if (isEmpty && typeof(theForm.elements['id_bookmark']) != 'undefined') {
             isEmpty  = (theForm.elements['id_bookmark'].value == null || theForm.elements['id_bookmark'].value == '');
         }
@@ -133,6 +136,9 @@ function checkSqlQuery(theForm)
         if (isEmpty && typeof(theForm.elements['sql_file']) != 'undefined') {
             isEmpty  = (theForm.elements['sql_file'].value.replace(space_re, '') == '') ? 1 : 0;
         }
+        if (isEmpty && typeof(theForm.elements['sql_localfile']) != 'undefined') {
+            isEmpty  = (theForm.elements['sql_localfile'].value.replace(space_re, '') == '') ? 1 : 0;
+        }
         if (isEmpty && typeof(theForm.elements['id_bookmark']) != 'undefined') {
             isEmpty  = (theForm.elements['id_bookmark'].value == null || theForm.elements['id_bookmark'].value == '');
             isEmpty  = (theForm.elements['id_bookmark'].selectedIndex == 0);

read_dump.php3

@@ -199,6 +199,7 @@ $err_url  = $goto
 $view_bookmark = 0;
 $sql_bookmark  = isset($sql_bookmark) ? $sql_bookmark : '';
 $sql_query     = isset($sql_query)    ? $sql_query    : '';
+$sql_file      = (!empty($sql_localfile) && $cfg['UploadDir']!='')  ? $cfg['UploadDir'].$sql_localfile : $sql_file;
 $sql_file      = !empty($sql_file)    ? $sql_file     : 'none';
 
 
@@ -227,8 +228,8 @@ if (!empty($id_bookmark)) {
  */
 // Gets the query from a file if required
 if ($sql_file != 'none') {
-    if (file_exists($sql_file) && is_uploaded_file($sql_file)) {
+    if ((file_exists($sql_file) && is_uploaded_file($sql_file)) 
-
+       || file_exists($cfg['UploadDir'].$sql_localfile)) { 
         $open_basedir     = '';
         if (PMA_PHP_INT_VERSION >= 40000) {
             $open_basedir = @ini_get('open_basedir');