Changeset 587731
- Timestamp:
- 08/20/2012 11:20:24 AM (14 years ago)
- Location:
- e-paper/trunk
- Files:
-
- 6 edited
-
css/backend.css (modified) (3 diffs)
-
epaper.php (modified) (5 diffs)
-
languages/epaper-de_DE.mo (modified) (previous)
-
languages/epaper-de_DE.po (modified) (5 diffs)
-
readme.txt (modified) (3 diffs)
-
templates/admin-meta-upload.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
e-paper/trunk/css/backend.css
r496210 r587731 1 1 .epaper_panel label{ 2 2 float: left; 3 width: 150px;3 width: 220px; 4 4 line-height: 25px; 5 font-weight: bold; 5 6 } 6 7 .epaper_panel input{ … … 11 12 width: auto; 12 13 } 13 .epaper_panel input[type='file'] {14 .epaper_panel input[type='file'], .epaper_panel input[type='checkbox']{ 14 15 width: auto; 15 16 } … … 19 20 #epaper-tabs textarea{ 20 21 border: none; 21 height: 150px;22 height: 240px; 22 23 width: 100%; 23 24 } -
e-paper/trunk/epaper.php
r547029 r587731 2 2 /** 3 3 * @package davidn.de 4 * @version 1.1 24 * @version 1.13 5 5 */ 6 6 /* … … 8 8 Plugin URI: http://www.continent7.com 9 9 Description: This Plugin provides a custom post-type e-paper. 10 Author: David Nellessen (continent7 Bartels & Nellessen GbR)11 Version: 1.1 210 Author: David Nellessen 11 Version: 1.13 12 12 Author URI: http://davidn.de 13 13 */ … … 17 17 # Filename: epaper.php 18 18 # Type: php 19 # Version: 1.1 2.020 # Last Change: 2 1.05.201219 # Version: 1.13.0 20 # Last Change: 20.08.2012 21 21 # Created: 10.06.2011 22 22 # Authors: David Nellessen (info@davidn.de) … … 497 497 $pdf = str_replace(WP_CONTENT_DIR, WP_CONTENT_URL, $pdf); 498 498 499 //find xml-files with E-Paper content 500 if(!$xmlfile = epaper_find_xml_file($uploaddir)) 501 $_SESSION['epaper_admin_notices'] .= '<div class="updated"><p>' . __('E-Paper content could not be recognized: XML-File not found: ', 'epaper') . '...text_.xml' . '</p></div>'; 502 elseif(!class_exists("SimpleXMLElement")) 503 $_SESSION['epaper_admin_notices'] .= '<div class="updated"><p>' . __('E-Paper content could not be recognized: No XML-Parser available.', 'epaper') . '</p></div>'; 504 else{ //Start processing XML-File 505 $xmlobject = simplexml_load_file ( $xmlfile ); 506 $pagescontent = array(); 507 $pagenumbers = array(); 508 if(isset($xmlobject->page) ){ 509 foreach($xmlobject->page as $page){ 510 require_once 'forceUTF8.php'; 511 try { 512 $pagenumber = $page->attributes()->pageNumber; 513 } catch (Exception $e) { 514 $_SESSION['epaper_admin_notices'] .= '<div class="error"><p>' . __('There was a page without a pageNumber', 'epaper') . '</p></div>'; 515 continue; 499 // Import content from xml file. 500 if($_POST['epaper_meta_upload_autoimport']) { 501 //find xml-files with E-Paper content 502 if(!$xmlfile = epaper_find_xml_file($uploaddir)) 503 $_SESSION['epaper_admin_notices'] .= '<div class="updated"><p>' . __('E-Paper content could not be recognized: XML-File not found: ', 'epaper') . '...text_.xml' . '</p></div>'; 504 elseif(!class_exists("SimpleXMLElement")) 505 $_SESSION['epaper_admin_notices'] .= '<div class="updated"><p>' . __('E-Paper content could not be recognized: No XML-Parser available.', 'epaper') . '</p></div>'; 506 else{ //Start processing XML-File 507 $xmlobject = simplexml_load_file ( $xmlfile ); 508 $pagescontent = array(); 509 $pagenumbers = array(); 510 if(isset($xmlobject->page) ){ 511 foreach($xmlobject->page as $page){ 512 require_once 'forceUTF8.php'; 513 try { 514 $pagenumber = $page->attributes()->pageNumber; 515 } catch (Exception $e) { 516 $_SESSION['epaper_admin_notices'] .= '<div class="error"><p>' . __('There was a page without a pageNumber', 'epaper') . '</p></div>'; 517 continue; 518 } 519 array_push($pagenumbers, (int)$pagenumber); 520 //protect user input http://stackoverflow.com/questions/1401317/remove-non-utf8-characters-from-string#3521396 521 if(isset($page->text)) $pagescontent[(int)$pagenumber] = fixUTF8(print_r((string)$page->text, TRUE)); 516 522 } 517 array_push($pagenumbers, (int)$pagenumber);518 //protect user input http://stackoverflow.com/questions/1401317/remove-non-utf8-characters-from-string#3521396519 if(isset($page->text)) $pagescontent[(int)$pagenumber] = fixUTF8(print_r((string)$page->text, TRUE));520 523 } 521 524 } 522 } 523 //fill the the missing pages as empty strings 524 for($i=1; $i <= (int)$pagenumber; $i++){ 525 if(in_array($i, $pagenumbers)) continue; 526 $pagescontent[$i] = ""; 527 } 528 ksort ($pagescontent); 529 525 //fill the the missing pages as empty strings 526 for($i=1; $i <= (int)$pagenumber; $i++){ 527 if(in_array($i, $pagenumbers)) continue; 528 $pagescontent[$i] = ""; 529 } 530 ksort ($pagescontent); 530 531 //END AUTODETECTION 532 } 531 533 } 532 534 … … 975 977 * 976 978 * Used to register plugin settings and set up option page. 979 * 980 * @todo Create separate options page. 977 981 */ 978 982 function epaper_settings_api_init() { -
e-paper/trunk/languages/epaper-de_DE.po
r547029 r587731 3 3 "Project-Id-Version: E-Paper Plugin for Wordpress\n" 4 4 "Report-Msgid-Bugs-To: \n" 5 "POT-Creation-Date: 2012-0 5-21 15:30+0100\n"6 "PO-Revision-Date: 2012-0 5-21 15:32+0100\n"5 "POT-Creation-Date: 2012-08-20 13:12+0100\n" 6 "PO-Revision-Date: 2012-08-20 13:16+0100\n" 7 7 "Last-Translator: David Nellessen <info@davidn.de>\n" 8 8 "Language-Team: continent7 <nellessen@continent7>\n" … … 18 18 "X-Poedit-SearchPath-0: /home/davidn/Freelancer/projects/e-paper/workspace/trunk\n" 19 19 20 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:25 521 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:25 622 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:26 620 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:253 21 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:254 22 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:264 23 23 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/epaper-the-content.php:14 24 24 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/epaper-the-content.php:18 … … 26 26 msgstr "E-Paper" 27 27 28 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:25 728 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:255 29 29 msgid "Add New" 30 30 msgstr "Erstellen" 31 31 32 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:25 832 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:256 33 33 msgid "Add New E-Paper" 34 34 msgstr "Neues E-Paper erstellen" 35 35 36 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:25 936 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:257 37 37 msgid "Edit E-Paper" 38 38 msgstr "E-Paper bearbeiten" 39 39 40 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:2 6040 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:258 41 41 msgid "New E-Paper" 42 42 msgstr "Neues E-Paper" 43 43 44 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:2 6144 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:259 45 45 msgid "View E-Paper" 46 46 msgstr "E-Paper anzeigen" 47 47 48 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:26 248 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:260 49 49 msgid "Search E-Paper" 50 50 msgstr "E-Paper" 51 51 52 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:26 352 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:261 53 53 msgid "No E-Paper found" 54 54 msgstr "Kein E-Paper gefunden" 55 55 56 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:26 456 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:262 57 57 msgid "No E-Paper found in Trash" 58 58 msgstr "Kein E-Paper im Papierkorb gefunden" 59 59 60 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:26 560 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:263 61 61 msgid "Parent E-Paper" 62 62 msgstr "Eltern E-Paper" 63 63 64 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:26 864 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:266 65 65 msgid "This is an E-Paper content." 66 66 msgstr "Dies ist ein E-Paper Inhalt." 67 67 68 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:3 1168 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:309 69 69 msgid "E-Paper Settings" 70 70 msgstr "E-Paper Einstellungen" 71 71 72 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:31 972 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:317 73 73 msgid "E-Paper Content (for Relevanssi search)" 74 74 msgstr "Inhalt des E-Papers (für Relevanssi Suche)" 75 75 76 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:32 776 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:325 77 77 msgid "Upload epaper data" 78 78 msgstr "E-Paper Daten hochladen" 79 79 80 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:45 580 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:453 81 81 msgid "Access denied 3!" 82 82 msgstr "Zugriff verweigert 3!" 83 83 84 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:45 984 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:457 85 85 msgid "Access denied 4!" 86 86 msgstr "Zugriff verweigert 4!" 87 87 88 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:46 388 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:461 89 89 msgid "Access denied 5!" 90 90 msgstr "Zugriff verweigert 5!" 91 91 92 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:47 292 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:470 93 93 msgid "Upload completed and processed." 94 94 msgstr "Hochladen beendet und verarbeitet." … … 179 179 msgstr "Fehler: Die IP-Adresse konnte nicht ermittelt werden." 180 180 181 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:98 3181 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:985 182 182 msgid "E-Paper Configuration" 183 183 msgstr "E-Paper Konfiguration" 184 184 185 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:9 89185 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:991 186 186 msgid "Add rel=\"nofollow\" to E-Paper Links" 187 187 msgstr "Füge rel=\"nofollow\" zu E-Paper Ressourcen hinzu" 188 188 189 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:99 5189 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:997 190 190 msgid "Add rel=\"nofollow\" to PDF Links" 191 191 msgstr "Füge rel=\"nofollow\" zu PDF Links hinzu" 192 192 193 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:101 2193 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/epaper.php:1014 194 194 msgid "<p>Configure E-Paper options:</p>" 195 195 msgstr "<p>Konfiguriere E-Paper Optionen:</p>" … … 234 234 msgstr "Laden Sie eine Zip-Datei mit den E-Paper Daten hoch. Dieses Archiv sollte das eigentlich E-Paper in einem beliebigen Format enthalten (HTML, FLASH, ...) außerdem sollte es eine PDF-Version des E-Papers enthalten. Falls Sie Flip Viewer Express Creator (http://www.flipviewer.com/) benutzen, können Sie das mit dieser Software erstellte Archiv einfach hochladen. Die Einstellungen (E-Paper-URL, PDF-URL, Inhalt des E-Papers) werden dann automatisch erkannt. Ansonsten sollten Sie diese Werte manuell setzen. Die Daten des hochgeladenen Archivs werden in jedem Fall durch dieses Plugin geschützt. Nur Besucher, die diesen E-Paper-Wordpressinhalt aufrufen können, erhalten Zugangsberechtigung zu den E-Paper Daten." 235 235 236 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:23 237 msgid "Autoimport E-Paper Content" 238 msgstr "Autoimport E-Paper Inhalt" 239 236 240 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:27 241 msgid "Check this to automatically import the E-Paper content from the uploaded archive. It will be available in the box <strong>E-Paper Content (for Relevanssi search)</strong> and used for search indexation. This only works with E-Papers created using Flip Viewer Express Creator (http://www.flipviewer.com/)." 242 msgstr "Wählen Sie diese Option, damit der Inhalt des E-Papers automatisch aus dem hochgeladenen Archiv importiert wird. Der Inhalt wird in der Box <strong>Inhalt des E-Papers (für Relevanssi Suche)</strong> eingefügt und für die Suche benutzt. Diese Option funktioniert wahrscheinlich nur mit E-Paper, die durch Flip Viewer Express Creator (http://www.flipviewer.com/) erstellt wurden." 243 244 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:36 237 245 msgid "FTP" 238 246 msgstr "FTP" 239 247 240 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 29248 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:38 241 249 msgid "FTPS (SSL)" 242 250 msgstr "FTPS (SSL)" 243 251 244 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 31252 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:40 245 253 msgid "SSH2" 246 254 msgstr "SSH2" 247 255 248 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 54256 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:63 249 257 msgid "Username" 250 258 msgstr "Benutzername" 251 259 252 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 55260 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:64 253 261 msgid "Password" 254 262 msgstr "Passwort" 255 263 256 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 61264 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:70 257 265 msgid "FTP/SSH Username" 258 266 msgstr "FTP/SSH Benutzername" 259 267 260 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 62268 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:71 261 269 msgid "FTP/SSH Password" 262 270 msgstr "FTP/SSH Passwort" 263 271 264 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 65272 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:74 265 273 msgid "FTP Username" 266 274 msgstr "FTP Benutzername" 267 275 268 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php: 66276 #: /home/davidn/Freelancer/projects/e-paper/workspace/trunk/templates/admin-meta-upload.php:75 269 277 msgid "FTP Password" 270 278 msgstr "FTP Passwort" -
e-paper/trunk/readme.txt
r547029 r587731 4 4 Tags: e-paper,paper,ebook,book,publication,custom-post-type,FlipViewer,publisher,Relevanssi,relevance,user access manager,pdf 5 5 Requires at least: 3.1.0 6 Tested up to: 3.3. 27 Stable tag: 1.1 26 Tested up to: 3.3.4 7 Stable tag: 1.13 8 8 9 9 With E-Paper-plugin you can easily integrate your e-paper … … 101 101 Version format is: major.minor.bugfix 102 102 103 = Version 1.13.0 (20.08.2012) = 104 * Added checkbox for importing e-paper content (so exlusion is possible now). 105 103 106 = Version 1.12.0 (21.05.2012) = 104 107 * Added no follow relation to the e-paper resources. … … 203 206 == License == 204 207 205 Copyright (c) 2010,2011 continent7208 Copyright (c) 2010,2011 206 209 207 210 Permission is hereby granted, free of charge, to any person obtaining a copy -
e-paper/trunk/templates/admin-meta-upload.php
r496210 r587731 20 20 <?php print __('Upload a zip-file containing the E-Paper data. This archive should contain the actual E-Paper in whatever format you like (PDF, HTML, FLASH, ...). If you are using Flip Viewer Express Creator (http://www.flipviewer.com/) don\'t worry about the settings above (E-Paper-URL, PDF-URL), they will be autodetected. Otherwise you need to set them correctly. The whole data of this archive will be protected by this plugin!', 'epaper')?> 21 21 </p> 22 <p> 23 <label><?php print __('Autoimport E-Paper Content', 'epaper')?>:</label> 24 <input type="checkbox" name="epaper_meta_upload_autoimport" checked/> 25 </p> 26 <p> 27 <?php print __('Check this to automatically import the E-Paper content from the uploaded archive. It will be available in the box <strong>E-Paper Content (for Relevanssi search)</strong> and used for search indexation. This only works with E-Papers created using Flip Viewer Express Creator (http://www.flipviewer.com/).', 'epaper')?> 28 </p> 29 30 22 31 <?php if(get_filesystem_method(array(), get_option( EPAPER_POST_TYPE_NAME . '_dir') ) != 'direct' && FALSE) : //If no direct filesystem acces, user needs to put credentials; This feature is removed for now, ince we only support direct fs access! 23 //Have a look at request_filesystem_credentials(). This is where the following code comes from!24 25 $types = array();26 if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )27 $types[ 'ftp' ] = __('FTP');28 if ( extension_loaded('ftp') ) //Only this supports FTPS29 $types[ 'ftps' ] = __('FTPS (SSL)');30 if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )31 $types[ 'ssh' ] = __('SSH2');32 33 $types = apply_filters('fs_ftp_connection_types', $types, $credentials, $type, $error, $context);34 35 ?>36 <script type="text/javascript">37 <!--38 jQuery(function($){39 jQuery("#ssh").click(function () {40 jQuery("#ssh_keys").show();41 });42 jQuery("#ftp, #ftps").click(function () {43 jQuery("#ssh_keys").hide();44 });45 jQuery('form input[value=""]:first').focus();46 });47 -->48 </script>49 50 <div class="wrap credentials-form">51 <?php screen_icon(); ?>52 <h2><?php _e('Connection Information') ?></h2>53 <p><?php54 $label_user = __('Username');55 $label_pass = __('Password');56 _e('To perform the requested action, WordPress needs to access your web server.');57 echo ' ';58 if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {59 if ( isset( $types['ssh'] ) ) {60 _e('Please enter your FTP or SSH credentials to proceed.');61 $label_user = __('FTP/SSH Username');62 $label_pass = __('FTP/SSH Password');63 } else {64 _e('Please enter your FTP credentials to proceed.');65 $label_user = __('FTP Username');66 $label_pass = __('FTP Password');67 }68 echo ' ';69 }70 _e('If you do not remember your credentials, you should contact your web host.');71 ?></p>72 <table class="form-table">73 <tr valign="top">74 <th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>75 <td><input name="hostname" type="text" id="hostname" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> size="40" /></td>76 </tr>77 78 <tr valign="top">79 <th scope="row"><label for="username"><?php echo $label_user; ?></label></th>80 <td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> size="40" /></td>81 </tr>82 83 <tr valign="top">84 <th scope="row"><label for="password"><?php echo $label_pass; ?></label></th>85 <td><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> size="40" /></td>86 </tr>87 88 <?php if ( isset($types['ssh']) ) : ?>89 <tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">90 <th scope="row"><?php _e('Authentication Keys') ?>91 <div class="key-labels textright">92 <label for="public_key"><?php _e('Public Key:') ?></label ><br />93 <label for="private_key"><?php _e('Private Key:') ?></label>94 </div></th>95 <td><br /><input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> size="40" />96 <div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td>97 </tr>98 <?php endif; ?>99 100 <tr valign="top">101 <th scope="row"><?php _e('Connection Type') ?></th>102 <td>103 <fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>104 <?php105 $disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );106 foreach ( $types as $name => $text ) : ?>107 <label for="<?php echo esc_attr($name) ?>">108 <input type="radio" name="connection_type" id="<?php echo esc_attr($name) ?>" value="<?php echo esc_attr($name) ?>"<?php checked($name, $connection_type); echo $disabled; ?> />109 <?php echo $text ?>110 </label>111 <?php endforeach; ?>112 </fieldset>113 </td>114 </tr>115 </table>116 117 <?php118 119 //submit_button( __( 'Proceed' ), 'button', 'upgrade' );120 ?>32 //Have a look at request_filesystem_credentials(). This is where the following code comes from! 33 34 $types = array(); 35 if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') ) 36 $types[ 'ftp' ] = __('FTP'); 37 if ( extension_loaded('ftp') ) //Only this supports FTPS 38 $types[ 'ftps' ] = __('FTPS (SSL)'); 39 if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) 40 $types[ 'ssh' ] = __('SSH2'); 41 42 $types = apply_filters('fs_ftp_connection_types', $types, $credentials, $type, $error, $context); 43 44 ?> 45 <script type="text/javascript"> 46 <!-- 47 jQuery(function($){ 48 jQuery("#ssh").click(function () { 49 jQuery("#ssh_keys").show(); 50 }); 51 jQuery("#ftp, #ftps").click(function () { 52 jQuery("#ssh_keys").hide(); 53 }); 54 jQuery('form input[value=""]:first').focus(); 55 }); 56 --> 57 </script> 58 59 <div class="wrap credentials-form"> 60 <?php screen_icon(); ?> 61 <h2><?php _e('Connection Information') ?></h2> 62 <p><?php 63 $label_user = __('Username'); 64 $label_pass = __('Password'); 65 _e('To perform the requested action, WordPress needs to access your web server.'); 66 echo ' '; 67 if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) { 68 if ( isset( $types['ssh'] ) ) { 69 _e('Please enter your FTP or SSH credentials to proceed.'); 70 $label_user = __('FTP/SSH Username'); 71 $label_pass = __('FTP/SSH Password'); 72 } else { 73 _e('Please enter your FTP credentials to proceed.'); 74 $label_user = __('FTP Username'); 75 $label_pass = __('FTP Password'); 76 } 77 echo ' '; 78 } 79 _e('If you do not remember your credentials, you should contact your web host.'); 80 ?></p> 81 <table class="form-table"> 82 <tr valign="top"> 83 <th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th> 84 <td><input name="hostname" type="text" id="hostname" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> size="40" /></td> 85 </tr> 86 87 <tr valign="top"> 88 <th scope="row"><label for="username"><?php echo $label_user; ?></label></th> 89 <td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> size="40" /></td> 90 </tr> 91 92 <tr valign="top"> 93 <th scope="row"><label for="password"><?php echo $label_pass; ?></label></th> 94 <td><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> size="40" /></td> 95 </tr> 96 97 <?php if ( isset($types['ssh']) ) : ?> 98 <tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>"> 99 <th scope="row"><?php _e('Authentication Keys') ?> 100 <div class="key-labels textright"> 101 <label for="public_key"><?php _e('Public Key:') ?></label ><br /> 102 <label for="private_key"><?php _e('Private Key:') ?></label> 103 </div></th> 104 <td><br /><input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> size="40" /> 105 <div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td> 106 </tr> 107 <?php endif; ?> 108 109 <tr valign="top"> 110 <th scope="row"><?php _e('Connection Type') ?></th> 111 <td> 112 <fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend> 113 <?php 114 $disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false ); 115 foreach ( $types as $name => $text ) : ?> 116 <label for="<?php echo esc_attr($name) ?>"> 117 <input type="radio" name="connection_type" id="<?php echo esc_attr($name) ?>" value="<?php echo esc_attr($name) ?>"<?php checked($name, $connection_type); echo $disabled; ?> /> 118 <?php echo $text ?> 119 </label> 120 <?php endforeach; ?> 121 </fieldset> 122 </td> 123 </tr> 124 </table> 125 126 <?php 127 128 //submit_button( __( 'Proceed' ), 'button', 'upgrade' ); 129 ?> 121 130 122 131
Note: See TracChangeset
for help on using the changeset viewer.