nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup; missing doc; XHTML fixes in doc

Browse Source
This commit is contained in:
Marc Delisle
2009-12-06 18:27:44 +00:00
parent f663fe465d
commit 1f6d16e38c
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Documentation.html
View File

@@ -81,7 +81,9 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
is strongly suggested for most users and is <b>required</b> for is strongly suggested for most users and is <b>required</b> for
64&#8211;bit machines. Not using mcrypt will cause phpMyAdmin to 64&#8211;bit machines. Not using mcrypt will cause phpMyAdmin to
load pages significantly slower. load pages significantly slower.
</li> </li>
<li>To support upload progress bars, see <a href="#faq2_9">
<abbr title="Frequently Asked Questions">FAQ</abbr> 2.9</a>.</li>
</ul> </ul>
</li> </li>
<li><b>MySQL</b> 5.0 or newer (<a href="#faq1_17">details</a>);</li> <li><b>MySQL</b> 5.0 or newer (<a href="#faq1_17">details</a>);</li>
@@ -3277,6 +3279,15 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
</li> </li>
</ul> </ul>
<h4 id="faq2_9">
<a href="#faq2_9">2.9 Seeing an upload progress bar</a></h4>
<p> To be able to see a progress bar during your uploads, your server must
have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
or the <a href="http://pecl.php.net/package/uploadprogress">uploadprogress</a>
one. Moreover, the JSON extension has to be enabled in your PHP.</p>
<p> If using APC, you must set <tt>apc.rfc1867</tt> to <tt>on</tt> in your php.ini.</p>
<h3 id="faqlimitations">Known limitations</h3> <h3 id="faqlimitations">Known limitations</h3>
<h4 id="login_bug"> <h4 id="login_bug">
@@ -3444,7 +3455,7 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
<h4 id="faq3_15"> <h4 id="faq3_15">
<a href="#faq3_15">3.15 When I import an Excel spreadsheet, some cells with calculations do not display correctly.</a></h4> <a href="#faq3_15">3.15 When I import an Excel spreadsheet, some cells with calculations do not display correctly.</a></h4>
<p> <p>
phpMyAdmin uses the <a href="http://www.codeplex.com/PHPExcel/" target=_blank>PHPExcel</a> library to parse Excel XLS and XLSX spreadsheets. phpMyAdmin uses the <a href="http://www.codeplex.com/PHPExcel/" target="_blank">PHPExcel</a> library to parse Excel XLS and XLSX spreadsheets.
Therefore, any limitations that are listed on their page regarding Excel calculations will also apply here. Therefore, any limitations that are listed on their page regarding Excel calculations will also apply here.
<br /><br /> <br /><br />
PHPExcel will be kept up to date so as to make all improvements available to phpMyAdmin users. PHPExcel will be kept up to date so as to make all improvements available to phpMyAdmin users.
@@ -4377,7 +4388,7 @@ server host name, username, password, port and the name of the database. Therefo
now synchronize your databases placed on the same server or some remote server. now synchronize your databases placed on the same server or some remote server.
</p> </p>
<p>For more details see <a href="./documentation-gsoc/Synchronization_User Manual.htm">How to synchronize</a> <p>For more details see <a href="./documentation-gsoc/Synchronization_User%20Manual.htm">How to synchronize</a>
</p> </p>
<!-- DEVELOPERS --> <!-- DEVELOPERS -->

28
libraries/display_import_ajax.lib.php
View File

@@ -7,7 +7,7 @@
*/ */
if (!defined('PHPMYADMIN')) { if (!defined('PHPMYADMIN')) {
exit; exit;
} }
/** /**
* constant for differenciating array in $_SESSION variable * constant for differenciating array in $_SESSION variable
@@ -35,11 +35,11 @@ $plugins = array(
// select available plugin // select available plugin
foreach ($plugins as $plugin) { foreach ($plugins as $plugin) {
$check = "PMA_import_".$plugin."Check"; $check = "PMA_import_" . $plugin . "Check";
if ($check()) { if ($check()) {
$_SESSION[$SESSION_KEY]["handler"] = $plugin; $_SESSION[$SESSION_KEY]["handler"] = $plugin;
include_once("import/upload/".$plugin.".php"); include_once("import/upload/" . $plugin . ".php");
break; break;
} }
} }
@@ -50,9 +50,10 @@ foreach ($plugins as $plugin) {
* @return true if APC extension is available and if rfc1867 is enabled, false if it is not * @return true if APC extension is available and if rfc1867 is enabled, false if it is not
*/ */
function PMA_import_apcCheck() { function PMA_import_apcCheck() {
if (!extension_loaded('apc') || !function_exists('apc_fetch') || !function_exists('getallheaders')) if (! extension_loaded('apc') || ! function_exists('apc_fetch') || ! function_exists('getallheaders')) {
return false; return false;
return (ini_get('apc.enabled') && ini_get('apc.rfc1867')); }
return (ini_get('apc.enabled') && ini_get('apc.rfc1867'));
} }
/** /**
@@ -61,9 +62,10 @@ function PMA_import_apcCheck() {
* @return true if UploadProgress extension is available, false if it is not * @return true if UploadProgress extension is available, false if it is not
*/ */
function PMA_import_uploadprogressCheck() { function PMA_import_uploadprogressCheck() {
if (!function_exists("uploadprogress_get_info") || !function_exists('getallheaders')) if (! function_exists("uploadprogress_get_info") || ! function_exists('getallheaders')) {
return false; return false;
return true; }
return true;
} }
/** /**
* Default plugin for handling import. If no other plugin is available, noplugin is used. * Default plugin for handling import. If no other plugin is available, noplugin is used.
@@ -71,7 +73,7 @@ function PMA_import_uploadprogressCheck() {
* @return true * @return true
*/ */
function PMA_import_nopluginCheck() { function PMA_import_nopluginCheck() {
return true; return true;
} }
/** /**
@@ -83,4 +85,4 @@ function PMA_importAjaxStatus($id) {
header('Content-type: application/json'); header('Content-type: application/json');
echo json_encode(PMA_getUploadStatus($id)); echo json_encode(PMA_getUploadStatus($id));
} }
?> ?>