Peter M. Groen / knowledgetree

Commit af452a37fc3b0a4cf8ee75de21e51352dc8f8f3a

Authored by Kevin Fourie
1 parent fdbed375

KTS-2348 

"upgrade.php is totally broken"
Fixed. This was a short tags issue.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7140 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 65 additions and 65 deletions
setup/upgrade.php
  View file @af452a3
... ... @@ -172,7 +172,7 @@ function do_start(action)
172 172 document.location='?go=' + action;
173 173 }
174 174 </script>
175   -<?
  175 +<?php
176 176  
177 177 $action = trim($_REQUEST["go"]);
178 178 switch ($action)
... ... @@ -239,7 +239,7 @@ Only administrator users may access the upgrade wizard.
239 239 <tr><td colspan=2 align=center><input type=submit value="login">
240 240 </table>
241 241 </form>
242   -<?
  242 +<?php
243 243 }
244 244  
245 245 function loginProcess()
... ... @@ -472,7 +472,7 @@ function upgradeConfirm()
472 472 <font color="Red">Please ensure that you have made a backup before continuing with the upgrade process.</font>
473 473 <p>
474 474 <br>
475   -<?
  475 +<?php
476 476 }
477 477 ?>
478 478 <p>
... ... @@ -482,7 +482,7 @@ We are about to start the upgrade process.
482 482 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('welcome')">
483 483 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="next" onclick="javascript:do_start('UpgradePreview')">
484 484  
485   -<?
  485 +<?php
486 486  
487 487 }
488 488  
... ... @@ -506,9 +506,9 @@ Your mysql installation has been resolved. Manually, you would do the following:
506 506 <table bgcolor="lightgrey">
507 507 <tr>
508 508 <td>
509   -<nobr>cd "<?=$dir?>"</nobr>
  509 +<nobr>cd "<?php=$dir?>"</nobr>
510 510 <br>
511   -<?
  511 +<?php
512 512 }
513 513 else
514 514 {
... ... @@ -520,17 +520,17 @@ You can continue to do the backup manually using the following process:
520 520 <table bgcolor="lightgrey">
521 521 <tr>
522 522 <td>
523   -<?
  523 +<?php
524 524  
525 525 }
526 526 ?>
527   -<nobr><?=$stmt['display']?>
  527 +<nobr><?php=$stmt['display']?>
528 528 </table>
529 529 <P>
530 530  
531 531 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('home')"> &nbsp;&nbsp; &nbsp; &nbsp;
532 532  
533   -<?
  533 +<?php
534 534 if ($dir != '')
535 535 {
536 536 ?>
... ... @@ -538,7 +538,7 @@ if ($dir != &#39;&#39;)
538 538 <input type=button value="next" onclick="javascript:do_start('Backup')">
539 539  
540 540  
541   -<?
  541 +<?php
542 542 }
543 543 }
544 544  
... ... @@ -565,8 +565,8 @@ function restoreSelect()
565 565 if (count($files) == 0)
566 566 {
567 567 ?>
568   - There don't seem to be any backups to restore from the <i>"<?=$dir?>"</i> directory.
569   - <?
  568 + There don't seem to be any backups to restore from the <i>"<?php=$dir?>"</i> directory.
  569 + <?php
570 570 }
571 571 else
572 572 {
... ... @@ -585,27 +585,27 @@ function restoreSelect()
585 585 <td>Filename
586 586 <td>File Size
587 587 <td>Action
588   -<?
  588 +<?php
589 589 $i=0;
590 590 foreach($files as $file)
591 591 {
592 592 $color=((($i++)%2)==0)?'white':'lightgrey';
593 593 ?>
594   - <tr bgcolor="<?=$color?>">
595   - <td><?=$file?>
596   - <td><?=filesize($dir . '/'.$file)?>
597   - <td><input type=button value="restore" onclick="javascript:selectRestore('<?=$file?>')">
598   -<?
  594 + <tr bgcolor="<?php=$color?>">
  595 + <td><?php=$file?>
  596 + <td><?php=filesize($dir . '/'.$file)?>
  597 + <td><input type=button value="restore" onclick="javascript:selectRestore('<?php=$file?>')">
  598 +<?php
599 599 }
600 600 ?>
601 601 </table>
602   - <?
  602 + <?php
603 603 }
604 604 ?>
605 605  
606 606 <p>
607 607 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('welcome')">
608   - <?
  608 + <?php
609 609  
610 610 }
611 611  
... ... @@ -619,7 +619,7 @@ function restoreSelected()
619 619 <script>
620 620 document.location='?go=RestoreConfirm';
621 621 </script>
622   -<?
  622 +<?php
623 623  
624 624 }
625 625  
... ... @@ -647,9 +647,9 @@ Manually, you would do the following to restore the backup:
647 647 <table bgcolor="lightgrey">
648 648 <tr>
649 649 <td>
650   -<nobr>cd "<?=$dir?>"</nobr>
  650 +<nobr>cd "<?php=$dir?>"</nobr>
651 651 <br>
652   -<?
  652 +<?php
653 653 }
654 654 else
655 655 {
... ... @@ -661,28 +661,28 @@ You can continue to do the restore manually using the following command(s):
661 661 <table bgcolor="lightgrey">
662 662 <tr>
663 663 <td>
664   -<?
  664 +<?php
665 665  
666 666 }
667 667 ?>
668   -<nobr><?=$stmt['display']?>
  668 +<nobr><?php=$stmt['display']?>
669 669 </table>
670 670 <P>
671   -<?
  671 +<?php
672 672 if ($dir != '')
673 673 {
674 674 ?>
675 675 Press <i>continue to restore</i> to attempt the command(s) above.
676 676  
677 677 <P>
678   -<?
  678 +<?php
679 679 }
680 680 ?>
681 681  
682 682 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('home')">
683 683 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="select another backup" onclick="javascript:do_start('RestoreSelect')">
684 684  
685   -<?
  685 +<?php
686 686 if ($dir != '')
687 687 {
688 688 ?>
... ... @@ -698,7 +698,7 @@ function restore()
698 698 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="next" onclick="javascript:restore()">
699 699  
700 700  
701   -<?
  701 +<?php
702 702 }
703 703 }
704 704  
... ... @@ -715,10 +715,10 @@ function backupDone()
715 715 {
716 716 $stmt=create_restore_stmt($filename);
717 717 ?>
718   - The backup file <nobr><I>"<?=$filename?>"</i></nobr> has been created.
  718 + The backup file <nobr><I>"<?php=$filename?>"</i></nobr> has been created.
719 719 <P> It appears as though the <font color=green>backup has been successful</font>.
720 720 <P>
721   - <?
  721 + <?php
722 722 if ($stmt['dir'] != '')
723 723 {
724 724 ?>
... ... @@ -727,9 +727,9 @@ function backupDone()
727 727 <table bgcolor="lightgrey">
728 728 <tr>
729 729 <td>
730   - <nobr>cd <?=$stmt['dir']?></nobr>
  730 + <nobr>cd <?php=$stmt['dir']?></nobr>
731 731 <br>
732   - <?
  732 + <?php
733 733 }
734 734 else
735 735 {
... ... @@ -741,13 +741,13 @@ function backupDone()
741 741 <table bgcolor="lightgrey">
742 742 <tr>
743 743 <td>
744   - <?
  744 + <?php
745 745 }
746 746 ?>
747   - <nobr><?=$stmt['display']?>
  747 + <nobr><?php=$stmt['display']?>
748 748 </table>
749 749  
750   -<?
  750 +<?php
751 751 }
752 752 else
753 753 {
... ... @@ -760,22 +760,22 @@ We appologise for the inconvenience.
760 760 <table bgcolor="lightgrey">
761 761 <tr>
762 762 <td>
763   -<?=$_SESSION['backupOutput']?>
  763 +<?php=$_SESSION['backupOutput']?>
764 764 </table>
765   -<?
  765 +<?php
766 766  
767 767 }
768 768 ?>
769 769 <br>
770 770  
771 771 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('welcome')">
772   -<?
  772 +<?php
773 773 if ($status)
774 774 {
775 775 ?>
776 776 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="next" onclick="javascript:do_start('UpgradeConfirm')">
777 777  
778   -<?
  778 +<?php
779 779 }
780 780 }
781 781 function restoreDone()
... ... @@ -790,14 +790,14 @@ function restoreDone()
790 790 {
791 791  
792 792 ?>
793   - The restore of <nobr><I>"<?=$filename?>"</i></nobr> has been completed.
  793 + The restore of <nobr><I>"<?php=$filename?>"</i></nobr> has been completed.
794 794 <P>
795 795 It appears as though the <font color=green>restore has been successful</font>.
796 796 <P>
797 797  
798 798  
799 799  
800   -<?
  800 +<?php
801 801 }
802 802 else
803 803 {
... ... @@ -811,9 +811,9 @@ We appologise for the inconvenience.
811 811 <table bgcolor="lightgrey">
812 812 <tr>
813 813 <td>
814   -<?=$_SESSION['restoreOutput']?>
  814 +<?php=$_SESSION['restoreOutput']?>
815 815 </table>
816   -<?
  816 +<?php
817 817  
818 818 }
819 819 ?>
... ... @@ -822,7 +822,7 @@ We appologise for the inconvenience.
822 822  
823 823 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('welcome')">
824 824  
825   -<?
  825 +<?php
826 826  
827 827 }
828 828  
... ... @@ -836,9 +836,9 @@ function check_state($value, $state=&#39;Home&#39;)
836 836 {
837 837 ?>
838 838 <script>
839   - document.location="?go=<?=$state?>";
  839 + document.location="?go=<?php=$state?>";
840 840 </script>
841   - <?
  841 + <?php
842 842 exit;
843 843 }
844 844 }
... ... @@ -861,7 +861,7 @@ function backup()
861 861 flush();
862 862 ?>
863 863 The backup is now underway. Please wait till it completes.
864   -<?
  864 +<?php
865 865  
866 866 ob_flush();
867 867 flush();
... ... @@ -895,7 +895,7 @@ function backup()
895 895 <script>
896 896 document.location="?go=BackupDone";
897 897 </script>
898   -<?
  898 +<?php
899 899  
900 900  
901 901 }
... ... @@ -903,10 +903,10 @@ function backup()
903 903 {
904 904 ?>
905 905 <P>
906   - The <i>mysqldump</i> utility was not found in the <?=$dir?> subdirectory.
  906 + The <i>mysqldump</i> utility was not found in the <?php=$dir?> subdirectory.
907 907  
908 908 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('welcome')">
909   -<?
  909 +<?php
910 910 }
911 911  
912 912  
... ... @@ -932,7 +932,7 @@ function restore()
932 932  
933 933 ?>
934 934 The restore is now underway. Please wait till it completes.
935   -<?
  935 +<?php
936 936 print "\n";
937 937  
938 938  
... ... @@ -967,7 +967,7 @@ function restore()
967 967 <script>
968 968 document.location="?go=RestoreDone";
969 969 </script>
970   -<?
  970 +<?php
971 971  
972 972  
973 973 }
... ... @@ -975,10 +975,10 @@ function restore()
975 975 {
976 976 ?>
977 977 <P>
978   - The <i>mysql</i> utility was not found in the <?=$dir?> subdirectory.
  978 + The <i>mysql</i> utility was not found in the <?php=$dir?> subdirectory.
979 979  
980 980 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('welcome')">
981   -<?
  981 +<?php
982 982 }
983 983  
984 984  
... ... @@ -1008,7 +1008,7 @@ If you have already done this, you may skip this step can continue directly to t
1008 1008 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="restore database" onclick="javascript:do_start('RestoreConfirm');">
1009 1009  
1010 1010  
1011   -<?
  1011 +<?php
1012 1012  
1013 1013  
1014 1014 }
... ... @@ -1020,9 +1020,9 @@ function UpgradePreview()
1020 1020 global $default;
1021 1021 ?>
1022 1022 <p>The table below describes the upgrades that need to occur to
1023   - upgrade your <?php echo APP_NAME;?> installation to <strong><?=$default->systemVersion?></strong>.
  1023 + upgrade your <?php echo APP_NAME;?> installation to <strong><?php echo $default->systemVersion;?></strong>.
1024 1024 Click on the button below the table to perform the upgrades.</p>
1025   - <?
  1025 + <?php
1026 1026 $upgradeTable = generateUpgradeTable();
1027 1027 print $upgradeTable;
1028 1028 ?>
... ... @@ -1030,7 +1030,7 @@ function UpgradePreview()
1030 1030  
1031 1031 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('home')">
1032 1032 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="next" onclick="javascript:do_start('Upgrade')">
1033   - <?
  1033 + <?php
1034 1034  
1035 1035 }
1036 1036  
... ... @@ -1041,15 +1041,15 @@ function Upgrade()
1041 1041 global $default;
1042 1042 ?>
1043 1043 <p>The table below describes the upgrades that have occurred to
1044   - upgrade your <?php echo APP_NAME;?> installation to <strong><?=$default->systemVersion?></strong>.
  1044 + upgrade your <?php echo APP_NAME;?> installation to <strong><?php echo $default->systemVersion;?></strong>.
1045 1045  
1046   - <?
  1046 + <?php
1047 1047 $res = performAllUpgrades();
1048 1048 if (PEAR::isError($res))
1049 1049 {
1050 1050 ?>
1051 1051 <font color="red">Upgrade failed.</font>
1052   -<?
  1052 +<?php
1053 1053 }
1054 1054 else
1055 1055 {
... ... @@ -1057,14 +1057,14 @@ function Upgrade()
1057 1057 ?>
1058 1058 <p>
1059 1059 <font color="green">Upgrade succeeded.</font>
1060   -<?
  1060 +<?php
1061 1061 }
1062 1062 ?>
1063 1063 <p>
1064 1064  
1065 1065 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('home')">
1066 1066 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="next" onclick="javascript:document.location='..';">
1067   -<?
  1067 +<?php
1068 1068 }
1069 1069  
1070 1070 ?>
... ... @@ -1075,4 +1075,4 @@ function Upgrade()
1075 1075 <?php }else{ ?>
1076 1076 background="../resources/graphics/ktbg.png">&nbsp;</td>
1077 1077 <?php }?>
1078   -</table>
1079 1078 \ No newline at end of file
  1079 +</table>
... ...