Changeset 768959
- Timestamp:
- 09/09/2013 10:51:33 AM (13 years ago)
- Location:
- wponlinebackup/trunk
- Files:
-
- 4 edited
-
include/stream_full.php (modified) (1 diff)
-
include/tables.php (modified) (5 diffs)
-
lang/wponlinebackup.pot (modified) (23 diffs)
-
wponlinebackup.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
wponlinebackup/trunk/include/stream_full.php
r768952 r768959 729 729 $date_format = __( 'd-m-Y H.i.s T' , 'wponlinebackup' ); 730 730 731 // The data 732 $data = sprintf( 733 _x( 734 'Online Backup for WordPress' . PHP_EOL . 735 'Version %s' . PHP_EOL . 736 'http://www.backup-technology.com/free-wordpress-backup/' . PHP_EOL . 737 PHP_EOL . 738 'Blog: %s' . PHP_EOL . 739 'Creation Time: %s', 740 'Readme.txt file in downloadable ZIP file', 741 'wponlinebackup' 742 ), 743 WPONLINEBACKUP_VERSION, 744 get_bloginfo( 'wpurl' ), 745 date( $date_format, $status['mod_time'] ) 746 ); 731 $data = 732 __( 'Online Backup for WordPress', 'wponlinebackup' ) . WPONLINEBACKUP_EOL . 733 sprintf( __( 'Version %s', 'wponlinebackup' ), WPONLINEBACKUP_VERSION ) . WPONLINEBACKUP_EOL . 734 __( 'http://www.backup-technology.com/free-wordpress-backup/', 'wponlinebackup' ) . WPONLINEBACKUP_EOL . 735 WPONLINEBACKUP_EOL . 736 sprintf( __( 'Blog: %s', 'wponlinebackup' ), get_bloginfo( 'wpurl' ) ) . WPONLINEBACKUP_EOL . 737 sprintf( __( 'Creation Time: %s', 'wponlinebackup' ), date( $date_format, $status['mod_time'] ) ) . WPONLINEBACKUP_EOL; 747 738 748 739 // Calculate header attributes and compress data -
wponlinebackup/trunk/include/tables.php
r727864 r768959 364 364 365 365 $header = 366 '-- ' . _x( 'Online Backup for WordPress', 'DB backup header', 'wponlinebackup' ) . PHP_EOL .367 '-- ' . sprintf( _x( 'Version %s', 'DB backup header', 'wponlinebackup' ), WPONLINEBACKUP_VERSION ) . PHP_EOL .368 '-- ' . _x( 'http://www.backup-technology.com/free-wordpress-backup/', 'DB backup header', 'wponlinebackup' ) . PHP_EOL .369 '-- ' . PHP_EOL .370 '-- ' . sprintf( _x( 'Blog: %s', 'DB backup header', 'wponlinebackup' ), get_bloginfo( 'wpurl' ) ) . PHP_EOL .371 '-- ' . sprintf( _x( 'Dump Time: %s', 'DB backup header', 'wponlinebackup' ), date( $date_format ) ) . PHP_EOL .372 PHP_EOL .373 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . PHP_EOL .374 PHP_EOL;366 '-- ' . __( 'Online Backup for WordPress', 'wponlinebackup' ) . WPONLINEBACKUP_EOL . 367 '-- ' . sprintf( __( 'Version %s', 'wponlinebackup' ), WPONLINEBACKUP_VERSION ) . WPONLINEBACKUP_EOL . 368 '-- ' . __( 'http://www.backup-technology.com/free-wordpress-backup/', 'wponlinebackup' ) . WPONLINEBACKUP_EOL . 369 '-- ' . WPONLINEBACKUP_EOL . 370 '-- ' . sprintf( __( 'Blog: %s', 'wponlinebackup' ), get_bloginfo( 'wpurl' ) ) . WPONLINEBACKUP_EOL . 371 '-- ' . sprintf( __( 'Database Dump Time: %s', 'wponlinebackup' ), date( $date_format ) ) . WPONLINEBACKUP_EOL . 372 WPONLINEBACKUP_EOL . 373 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . WPONLINEBACKUP_EOL . 374 WPONLINEBACKUP_EOL; 375 375 376 376 $progress['rsize'] += strlen( $header ); … … 612 612 $this->progress['message'] = sprintf( __( 'Backing up %s...' , 'wponlinebackup' ), $this->job['table'] ); 613 613 614 $drop = 'DROP TABLE IF EXISTS `' . $this->job['table'] . '`;' . PHP_EOL . PHP_EOL;614 $drop = 'DROP TABLE IF EXISTS `' . $this->job['table'] . '`;' . WPONLINEBACKUP_EOL . WPONLINEBACKUP_EOL; 615 615 616 616 // Table information doesn't exist, so let's gather it, first by getting the CREATE TABLE dump … … 635 635 } 636 636 637 $create .= ';' . PHP_EOL . PHP_EOL; 637 // Normalise line-endings 638 $create = preg_replace( '/\\r\\n?|\\n/', WPONLINEBACKUP_EOL, $create ); 639 640 $create .= ';' . WPONLINEBACKUP_EOL . WPONLINEBACKUP_EOL; 638 641 $this->progress['rsize'] += strlen( $create ); 639 642 if ( ( $ret = $this->stream->Write_Stream( $drop . $create ) ) !== true ) return $ret; … … 714 717 $insert .= 715 718 ( $row_count == 1 ? 716 'INSERT INTO `' . $this->job['table'] . '` (' . $fields . ') VALUES' . PHP_EOL :717 ',' . PHP_EOL719 'INSERT INTO `' . $this->job['table'] . '` (' . $fields . ') VALUES' . WPONLINEBACKUP_EOL : 720 ',' . WPONLINEBACKUP_EOL 718 721 ) . 719 722 '(' . implode( ',', $values ) . ')'; … … 737 740 738 741 // Finish the statement 739 $insert .= ';' . PHP_EOL . PHP_EOL;742 $insert .= ';' . WPONLINEBACKUP_EOL . WPONLINEBACKUP_EOL; 740 743 741 744 $this->job['done'] += $row_count; -
wponlinebackup/trunk/lang/wponlinebackup.pot
r767779 r768959 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: Online Backup for WordPress 3.0. 3\n"5 "Project-Id-Version: Online Backup for WordPress 3.0.4\n" 6 6 "Report-Msgid-Bugs-To: http://wordpress.org/tag/wponlinebackup\n" 7 "POT-Creation-Date: 2013-09-0 6 08:31:21+00:00\n"7 "POT-Creation-Date: 2013-09-09 10:30:52+00:00\n" 8 8 "MIME-Version: 1.0\n" 9 9 "Content-Type: text/plain; charset=UTF-8\n" … … 26 26 msgstr "" 27 27 28 #: include/admin.php:430 include/admin.php:945 include/admin.php:43 1528 #: include/admin.php:430 include/admin.php:945 include/admin.php:4340 29 29 msgid "Backup" 30 30 msgstr "" … … 59 59 msgstr "" 60 60 61 #. #-#-#-#-# plugin.pot (Online Backup for WordPress 3.0. 3) #-#-#-#-#61 #. #-#-#-#-# plugin.pot (Online Backup for WordPress 3.0.4) #-#-#-#-# 62 62 #. Plugin Name of the plugin/theme 63 63 #: include/admin.php:453 … … 580 580 581 581 #: include/admin.php:1846 include/admin.php:2367 include/admin.php:2422 582 #: include/admin.php:2472 include/admin.php:43 19582 #: include/admin.php:2472 include/admin.php:4344 583 583 msgid "Decrypt" 584 584 msgstr "" … … 1211 1211 msgstr "" 1212 1212 1213 #: include/admin.php:40 071213 #: include/admin.php:4015 1214 1214 msgid "Advanced Settings" 1215 1215 msgstr "" 1216 1216 1217 #: include/admin.php:40 171217 #: include/admin.php:4025 1218 1218 msgid "" 1219 1219 "These are advanced (and sometimes dangerous) settings that control the " … … 1223 1223 msgstr "" 1224 1224 1225 #: include/admin.php:40 181225 #: include/admin.php:4026 1226 1226 msgid "" 1227 1227 "For 99% of users, the default settings will work perfectly fine. Changes to " … … 1230 1230 msgstr "" 1231 1231 1232 #: include/admin.php:40 221232 #: include/admin.php:4030 1233 1233 msgid "" 1234 1234 "ATTENTION! DO NOT MAKE CHANGES TO THESE SETTINGS UNLESS ABSOLUTELY NECESSARY " … … 1236 1236 msgstr "" 1237 1237 1238 #: include/admin.php:41 72 include/admin.php:42071238 #: include/admin.php:4180 include/admin.php:4215 include/admin.php:4245 1239 1239 msgid "Yes" 1240 1240 msgstr "" 1241 1241 1242 #: include/admin.php:41 76 include/admin.php:42111242 #: include/admin.php:4184 include/admin.php:4219 include/admin.php:4249 1243 1243 msgid "No" 1244 1244 msgstr "" 1245 1245 1246 #: include/admin.php:42 241246 #: include/admin.php:4232 1247 1247 msgid "Save Advanced Settings" 1248 1248 msgstr "" 1249 1249 1250 #: include/admin.php:43 101250 #: include/admin.php:4335 1251 1251 msgctxt "Type of backup" 1252 1252 msgid "Unknown" 1253 1253 msgstr "" 1254 1254 1255 #: include/admin.php:43 511255 #: include/admin.php:4376 1256 1256 msgid "Nothing is currently running." 1257 1257 msgstr "" 1258 1258 1259 #: include/admin.php:43 651259 #: include/admin.php:4390 1260 1260 msgid "%s stopped unexpectedly. The WordPress cron may be misconfigured." 1261 1261 msgstr "" 1262 1262 1263 #: include/admin.php:43 691263 #: include/admin.php:4394 1264 1264 msgid "%1$s completed successfully with %2$d warning." 1265 1265 msgid_plural "%1$s completed successfully with %2$d warnings." … … 1267 1267 msgstr[1] "" 1268 1268 1269 #: include/admin.php:43 691269 #: include/admin.php:4394 1270 1270 msgid "%s completed successfully." 1271 1271 msgstr "" 1272 1272 1273 #: include/admin.php:4 3781273 #: include/admin.php:4403 1274 1274 msgid "" 1275 1275 "%1$s completed partially with %2$d error. Please consult the event log for " … … 1281 1281 msgstr[1] "" 1282 1282 1283 #: include/admin.php:4 3781283 #: include/admin.php:4403 1284 1284 msgid "%s completed partially." 1285 1285 msgstr "" 1286 1286 1287 #: include/admin.php:44 071287 #: include/admin.php:4432 1288 1288 msgid "Processing..." 1289 1289 msgstr "" … … 1400 1400 msgstr "" 1401 1401 1402 #: include/bootstrap.php:145 31402 #: include/bootstrap.php:1452 1403 1403 msgid "Backup starting..." 1404 1404 msgstr "" 1405 1405 1406 #: include/bootstrap.php:145 71406 #: include/bootstrap.php:1456 1407 1407 msgid "Scheduled backup starting..." 1408 1408 msgstr "" 1409 1409 1410 #: include/bootstrap.php:146 11410 #: include/bootstrap.php:1460 1411 1411 msgid "Decrypt starting..." 1412 1412 msgstr "" 1413 1413 1414 #: include/bootstrap.php:146 51414 #: include/bootstrap.php:1464 1415 1415 msgid "Starting..." 1416 1416 msgstr "" 1417 1417 1418 #: include/bootstrap.php:148 41418 #: include/bootstrap.php:1483 1419 1419 msgid "The backup failed to start: %s" 1420 1420 msgstr "" 1421 1421 1422 #: include/bootstrap.php:148 81422 #: include/bootstrap.php:1487 1423 1423 msgid "The scheduled backup failed to start: %s" 1424 1424 msgstr "" 1425 1425 1426 #: include/bootstrap.php:149 21426 #: include/bootstrap.php:1491 1427 1427 msgid "The decrypt failed to start: %s" 1428 1428 msgstr "" 1429 1429 1430 #: include/bootstrap.php:149 61430 #: include/bootstrap.php:1495 1431 1431 msgid "The activity failed to start: %s" 1432 1432 msgstr "" 1433 1433 1434 #: include/bootstrap.php:151 61434 #: include/bootstrap.php:1515 1435 1435 msgid "" 1436 1436 "An online backup cannot be performed if the plugin is not currently logged " … … 1439 1439 msgstr "" 1440 1440 1441 #: include/bootstrap.php:152 21441 #: include/bootstrap.php:1521 1442 1442 msgid "" 1443 1443 "The backup could not be started: An online backup cannot be performed if the " … … 1445 1445 msgstr "" 1446 1446 1447 #: include/bootstrap.php:154 21447 #: include/bootstrap.php:1541 1448 1448 msgid "The activity was stopped by %s." 1449 1449 msgstr "" 1450 1450 1451 #: include/bootstrap.php:154 91451 #: include/bootstrap.php:1548 1452 1452 msgid "The activity was stopped." 1453 1453 msgstr "" 1454 1454 1455 #: include/bootstrap.php:157 51455 #: include/bootstrap.php:1574 1456 1456 msgid "The activity failed to initialise: %s" 1457 1457 msgstr "" 1458 1458 1459 #: include/bootstrap.php:164 21459 #: include/bootstrap.php:1641 1460 1460 msgid "The activity failed: %s" 1461 1461 msgstr "" 1462 1462 1463 #: include/bootstrap.php:166 71463 #: include/bootstrap.php:1666 1464 1464 msgid "Backup complete." 1465 1465 msgstr "" 1466 1466 1467 #: include/bootstrap.php:167 11467 #: include/bootstrap.php:1670 1468 1468 msgid "Scheduled backup complete." 1469 1469 msgstr "" 1470 1470 1471 #: include/bootstrap.php:167 51471 #: include/bootstrap.php:1674 1472 1472 msgid "Decrypt complete." 1473 1473 msgstr "" 1474 1474 1475 #: include/bootstrap.php:167 91475 #: include/bootstrap.php:1678 1476 1476 msgid "Completed." 1477 1477 msgstr "" 1478 1478 1479 #: include/bootstrap.php:174 51479 #: include/bootstrap.php:1744 1480 1480 msgid "Initialising..." 1481 1481 msgstr "" 1482 1482 1483 #: include/bootstrap.php:176 91483 #: include/bootstrap.php:1768 1484 1484 msgid "Initialisation completed." 1485 1485 msgstr "" 1486 1486 1487 #: include/bootstrap.php:2130 1488 msgid "" 1489 "The directory (%s) where local backups will be stored could not be created." 1490 msgstr "" 1491 1487 1492 #: include/bootstrap.php:2131 1488 msgid ""1489 "The directory (%s) where local backups will be stored could not be created."1490 msgstr ""1491 1492 #: include/bootstrap.php:21321493 1493 msgid "" 1494 1494 "You may need to login via FTP and create the folder yourself and \"CHMOD\" " … … 1497 1497 msgstr "" 1498 1498 1499 #: include/bootstrap.php:213 3 include/bootstrap.php:21551500 #: include/bootstrap.php:217 7 include/bootstrap.php:22111501 #: include/bootstrap.php:249 31499 #: include/bootstrap.php:2132 include/bootstrap.php:2154 1500 #: include/bootstrap.php:2176 include/bootstrap.php:2210 1501 #: include/bootstrap.php:2492 1502 1502 msgid "Error: %s" 1503 1503 msgstr "" 1504 1504 1505 #: include/bootstrap.php:213 61505 #: include/bootstrap.php:2135 1506 1506 msgid "Unable to create the local backup directory." 1507 1507 msgstr "" 1508 1508 1509 #: include/bootstrap.php:2152 1510 msgid "" 1511 "The directory (%s) where local backups will be stored cannot be written to." 1512 msgstr "" 1513 1509 1514 #: include/bootstrap.php:2153 1510 msgid ""1511 "The directory (%s) where local backups will be stored cannot be written to."1512 msgstr ""1513 1514 #: include/bootstrap.php:21541515 1515 msgid "" 1516 1516 "You may need to login via FTP and \"CHMOD\" it to \"0770\" or, as a last " … … 1519 1519 msgstr "" 1520 1520 1521 #: include/bootstrap.php:215 81521 #: include/bootstrap.php:2157 1522 1522 msgid "Unable to write to the local backup directory." 1523 1523 msgstr "" 1524 1524 1525 #: include/bootstrap.php:217 51525 #: include/bootstrap.php:2174 1526 1526 msgid "" 1527 1527 "The temporary processing directory (%s) where data is processed could not be " … … 1529 1529 msgstr "" 1530 1530 1531 #: include/bootstrap.php:217 61531 #: include/bootstrap.php:2175 1532 1532 msgid "" 1533 1533 "You may need to login via FTP and create the folder yourself and \"CHMOD\" " … … 1535 1535 msgstr "" 1536 1536 1537 #: include/bootstrap.php:21 801537 #: include/bootstrap.php:2179 1538 1538 msgid "Unable to create the temporary processing directory." 1539 1539 msgstr "" 1540 1540 1541 #: include/bootstrap.php:220 91541 #: include/bootstrap.php:2208 1542 1542 msgid "" 1543 1543 "The temporary data file could not be created in the temporary processing " … … 1545 1545 msgstr "" 1546 1546 1547 #: include/bootstrap.php:22 101547 #: include/bootstrap.php:2209 1548 1548 msgid "" 1549 1549 "If the below error is related to permissions, you may need to login to your " … … 1554 1554 msgstr "" 1555 1555 1556 #: include/bootstrap.php:221 41556 #: include/bootstrap.php:2213 1557 1557 msgid "Unable to create the temporary data file." 1558 1558 msgstr "" 1559 1559 1560 #: include/bootstrap.php:230 91560 #: include/bootstrap.php:2308 1561 1561 msgid "Finalising..." 1562 1562 msgstr "" 1563 1563 1564 #: include/bootstrap.php:242 71564 #: include/bootstrap.php:2426 1565 1565 msgid "Stored the decrypted file locally as %s." 1566 1566 msgstr "" 1567 1567 1568 #: include/bootstrap.php:246 11568 #: include/bootstrap.php:2460 1569 1569 msgid "WPOnlineBackup_%1$s_%2$s_%3$s" 1570 1570 msgstr "" 1571 1571 1572 #: include/bootstrap.php:249 21572 #: include/bootstrap.php:2491 1573 1573 msgid "" 1574 1574 "An error occurred trying to save the backup to the local backup folder at %s." 1575 1575 msgstr "" 1576 1576 1577 #: include/bootstrap.php:249 61577 #: include/bootstrap.php:2495 1578 1578 msgid "Failed to save the backup to local storage." 1579 1579 msgstr "" 1580 1580 1581 #: include/bootstrap.php:250 61581 #: include/bootstrap.php:2505 1582 1582 msgid "Stored the backup locally as %s." 1583 1583 msgstr "" 1584 1584 1585 #: include/bootstrap.php:254 51585 #: include/bootstrap.php:2544 1586 1586 msgid "Local Backups contains %1$s generation with a total size of %2$s." 1587 1587 msgid_plural "" … … 1590 1590 msgstr[1] "" 1591 1591 1592 #: include/bootstrap.php:255 5include/transmission.php:6461592 #: include/bootstrap.php:2554 include/transmission.php:646 1593 1593 msgid "Performing retention..." 1594 1594 msgstr "" 1595 1595 1596 #: include/bootstrap.php:257 11596 #: include/bootstrap.php:2570 1597 1597 msgid "Retention is not required." 1598 1598 msgstr "" 1599 1599 1600 #: include/bootstrap.php:262 81600 #: include/bootstrap.php:2627 1601 1601 msgid "Failed to delete local backup %1$s: %2$s" 1602 1602 msgstr "" 1603 1603 1604 #: include/bootstrap.php:266 51604 #: include/bootstrap.php:2664 1605 1605 msgid "" 1606 1606 "Errors were encountered trying to delete one or more Local Backups. Disk " … … 1609 1609 msgstr "" 1610 1610 1611 #: include/bootstrap.php:267 3include/transmission.php:7171611 #: include/bootstrap.php:2672 include/transmission.php:717 1612 1612 msgid "Retention completed; deleted %d file with a total size of %s." 1613 1613 msgid_plural "Retention completed; deleted %d files with a total size of %s." … … 1950 1950 msgstr "" 1951 1951 1952 #: include/stream_full.php:7 181952 #: include/stream_full.php:720 1953 1953 msgctxt "Readme.txt filename in downloadable ZIP file" 1954 1954 msgid "Readme.txt" … … 1959 1959 #. translators: date() function string when displaying dump time in database 1960 1960 #. backup header 1961 #: include/stream_full.php:72 5include/tables.php:3631961 #: include/stream_full.php:729 include/tables.php:363 1962 1962 msgid "d-m-Y H.i.s T" 1963 1963 msgstr "" 1964 1964 1965 #: include/stream_full.php: 8101965 #: include/stream_full.php:774 1966 1966 msgctxt "Full backup folder name in downloadable ZIP file" 1967 1967 msgid "Database" 1968 1968 msgstr "" 1969 1969 1970 #: include/stream_full.php: 8241970 #: include/stream_full.php:792 1971 1971 msgctxt "Full backup folder name in downloadable ZIP file" 1972 1972 msgid "FileSystem" -
wponlinebackup/trunk/wponlinebackup.php
r768952 r768959 38 38 if ( !defined( 'PHP_EOL' ) ) 39 39 define( 'PHP_EOL', "\n" ); // Default to Linux style 40 41 // When we generate data, we use Windows line-endings since they are more universal, and most users will be Windows 42 // This prevents apparent mangled Readme.txt and OBFW_Database.sql files in downloaded ZIP files 43 define( 'WPONLINEBACKUP_EOL', "\r\n" ); 40 44 41 45 // Our custom error handler - Only used when we are missing error_get_last() and only activated when WPOnlineBackup::Enable_Error_Handling is called
Note: See TracChangeset
for help on using the changeset viewer.