From 58577791f5196b4e044720be6c6548fcce5db829 Mon Sep 17 00:00:00 2001 From: Nabeel Date: Mon, 16 Jul 2012 15:03:30 -0400 Subject: [PATCH] refs #71 Added die() line to template files --- core/templates/acarsmap.php | 3 +- core/templates/activity_list.php | 145 +++++++++--------- core/templates/contact_form.php | 1 + core/templates/contact_sent.php | 1 + core/templates/core_error.php | 1 + core/templates/core_htmlhead.php | 1 + core/templates/core_htmlreq.php | 1 + core/templates/core_message.php | 1 + core/templates/core_navigation.php | 1 + core/templates/core_success.php | 1 + core/templates/download_item.php | 1 + core/templates/downloads_list.php | 1 + core/templates/email_lostpassword.php | 1 + core/templates/email_pilot_retired.php | 1 + core/templates/email_registered.php | 1 + core/templates/email_registrationaccepted.php | 1 + core/templates/email_registrationdenied.php | 1 + core/templates/finance_balancesheet.php | 1 + core/templates/finance_header.php | 1 + core/templates/finance_summarysheet.php | 1 + core/templates/flown_routes_map.php | 1 + core/templates/frontpage_main.php | 1 + core/templates/frontpage_recentbids.php | 1 + core/templates/frontpage_recentpilots.php | 1 + core/templates/frontpage_reports.php | 1 + core/templates/fsacars_config.php | 1 + core/templates/fsfk_liveacars_config.php | 1 + core/templates/fsfk_log_flightcritique.php | 3 +- core/templates/fsfk_log_flightdata.php | 1 + core/templates/fsfk_log_flightimages.php | 1 + ...flig.phpan.tpl => fsfk_log_flightplan.php} | 0 core/templates/fsfk_pirep_config.php | 1 + core/templates/fsfk_vaconfig.php | 1 + core/templates/fspax_config.php | 1 + core/templates/login_already.php | 1 + core/templates/login_complete.php | 1 + core/templates/login_forgotpassword.php | 1 + core/templates/login_form.php | 1 + core/templates/login_notfound.php | 1 + core/templates/login_passwordreset.php | 1 + core/templates/login_rejected.php | 1 + core/templates/login_unconfirmed.php | 2 + core/templates/maintenance.php | 37 ++--- core/templates/news_newsitem.php | 1 + core/templates/pages_content.php | 1 + core/templates/pages_items.php | 1 + core/templates/pages_nopermission.php | 1 + core/templates/pages_notfound.php | 1 + core/templates/pilot_public_profile.php | 1 + core/templates/pilots_list.php | 1 + core/templates/pirep_editform.php | 1 + core/templates/pirep_new.php | 1 + core/templates/pirep_viewreport.php | 1 + core/templates/pireps_addcomment.php | 1 + core/templates/pireps_airportdropdown.php | 31 ++-- core/templates/pireps_viewall.php | 1 + core/templates/profile_badge.php | 1 + core/templates/profile_changepassword.php | 1 + core/templates/profile_edit.php | 1 + core/templates/profile_main.php | 1 + core/templates/profile_myroutesmap.php | 1 + core/templates/profile_stats.php | 1 + core/templates/registration_autoconfirm.php | 1 + core/templates/registration_complete.php | 1 + core/templates/registration_customfields.php | 1 + core/templates/registration_error.php | 1 + core/templates/registration_javascript.php | 1 + core/templates/registration_mainform.php | 1 + .../registration_sentconfirmation.php | 1 + core/templates/reqlogin.php | 1 + core/templates/route_map.php | 1 + core/templates/schedule_bids.php | 1 + core/templates/schedule_boarding_pass.php | 1 + core/templates/schedule_briefing.php | 1 + core/templates/schedule_details.php | 1 + core/templates/schedule_list.php | 1 + core/templates/schedule_results.php | 1 + core/templates/schedule_searchform.php | 1 + core/templates/xacars_config.php | 1 + 79 files changed, 186 insertions(+), 107 deletions(-) rename core/templates/{fsfk_log_flig.phpan.tpl => fsfk_log_flightplan.php} (100%) diff --git a/core/templates/acarsmap.php b/core/templates/acarsmap.php index 965ff687..f42de4c1 100644 --- a/core/templates/acarsmap.php +++ b/core/templates/acarsmap.php @@ -1,4 +1,5 @@ - +Activity Feed -type to determine the type of activity (duh?) - Constants are in app.config.php - - Like here, I put a specific link to the PIREP at the end of the message - You can use the if/else's to add specific images? - - $activity->refid is the ID of the thing it's referring to, so if it's a - new PIREP, the refid will be the ID of the PIREP - - $activity-> also contains all the fields about the pilot who this notice - is about - */ - - $link_title = ''; - $link_href = ''; - if($activity->type == ACTIVITY_NEW_PIREP) { - - $link_href = url('/pireps/view/'.$activity->refid); - $link_title = 'View Flight Report'; - - } elseif($activity->type == ACTIVITY_TWITTER) { - - $link_href = 'http://twitter.com/#!/'.Config::get('TWITTER_AIRLINE_ACCOUNT').'/status/'.$activity->refid; - $link_title = 'View Tweet'; - - } elseif($activity->type == ACTIVITY_NEW_PILOT) { - $link_href = url('/profile/view/'.$activity->pilotid); - $link_title = 'View Profile'; - } -?> -

- type == ACTIVITY_TWITTER) { - echo 'twitter update'; - } - - ?> - pilotid != 0) { - $pilotCode = PilotData::getPilotCode($activity->code, $activity->pilotid); - ?> - - - firstname.' '.$activity->lastname?> - - - - - message); - ?> - - '.$link_title.''; - } - ?> -

- +

Activity Feed

+type to determine the type of activity (duh?) + Constants are in app.config.php + + Like here, I put a specific link to the PIREP at the end of the message + You can use the if/else's to add specific images? + + $activity->refid is the ID of the thing it's referring to, so if it's a + new PIREP, the refid will be the ID of the PIREP + + $activity-> also contains all the fields about the pilot who this notice + is about + */ + + $link_title = ''; + $link_href = ''; + if($activity->type == ACTIVITY_NEW_PIREP) { + + $link_href = url('/pireps/view/'.$activity->refid); + $link_title = 'View Flight Report'; + + } elseif($activity->type == ACTIVITY_TWITTER) { + + $link_href = 'http://twitter.com/#!/'.Config::get('TWITTER_AIRLINE_ACCOUNT').'/status/'.$activity->refid; + $link_title = 'View Tweet'; + + } elseif($activity->type == ACTIVITY_NEW_PILOT) { + $link_href = url('/profile/view/'.$activity->pilotid); + $link_title = 'View Profile'; + } +?> +

+ type == ACTIVITY_TWITTER) { + echo 'twitter update'; + } + + ?> + pilotid != 0) { + $pilotCode = PilotData::getPilotCode($activity->code, $activity->pilotid); + ?> + + + firstname.' '.$activity->lastname?> + + + + + message); + ?> + + '.$link_title.''; + } + ?> +

+ \ No newline at end of file diff --git a/core/templates/contact_form.php b/core/templates/contact_form.php index fba600b4..419b8fa2 100644 --- a/core/templates/contact_form.php +++ b/core/templates/contact_form.php @@ -1,3 +1,4 @@ +

Contact Us

diff --git a/core/templates/contact_sent.php b/core/templates/contact_sent.php index 40ef7077..489ed13a 100644 --- a/core/templates/contact_sent.php +++ b/core/templates/contact_sent.php @@ -1,2 +1,3 @@ +

Thanks!

Your request has been submitted, we will be in touch shortly.

\ No newline at end of file diff --git a/core/templates/core_error.php b/core/templates/core_error.php index 95ad81f3..b1c2cf2b 100644 --- a/core/templates/core_error.php +++ b/core/templates/core_error.php @@ -1,3 +1,4 @@ +'.$message.''; ?> \ No newline at end of file diff --git a/core/templates/core_htmlhead.php b/core/templates/core_htmlhead.php index 9a7b8dda..28943bf3 100644 --- a/core/templates/core_htmlhead.php +++ b/core/templates/core_htmlhead.php @@ -1,3 +1,4 @@ +
\ No newline at end of file diff --git a/core/templates/core_message.php b/core/templates/core_message.php index 26f8222c..e914d1e7 100644 --- a/core/templates/core_message.php +++ b/core/templates/core_message.php @@ -1,3 +1,4 @@ +
\ No newline at end of file diff --git a/core/templates/core_navigation.php b/core/templates/core_navigation.php index 83cd4d04..716219bf 100644 --- a/core/templates/core_navigation.php +++ b/core/templates/core_navigation.php @@ -1,3 +1,4 @@ +
  • home
  • '.$message.''; ?> \ No newline at end of file diff --git a/core/templates/download_item.php b/core/templates/download_item.php index d8861d61..5791b692 100644 --- a/core/templates/download_item.php +++ b/core/templates/download_item.php @@ -1,3 +1,4 @@ +

    Your download will start in a few seconds, or click here to manually start.

    diff --git a/core/templates/downloads_list.php b/core/templates/downloads_list.php index dc433f54..3b114f31 100644 --- a/core/templates/downloads_list.php +++ b/core/templates/downloads_list.php @@ -1,3 +1,4 @@ +

    Downloads

    Dear , Your password was reset, it is: diff --git a/core/templates/email_pilot_retired.php b/core/templates/email_pilot_retired.php index 89accbff..6d2bfd48 100644 --- a/core/templates/email_pilot_retired.php +++ b/core/templates/email_pilot_retired.php @@ -1,3 +1,4 @@ + Hi firstname.' '.$pilot->lastname?>, You have been marked as retired because you have been inactive for more than days. To be un-retired, you must file a PIREP. diff --git a/core/templates/email_registered.php b/core/templates/email_registered.php index 6e4ceebc..74aacb20 100644 --- a/core/templates/email_registered.php +++ b/core/templates/email_registered.php @@ -1,3 +1,4 @@ + Dear , Your account have been made at , but your account has not yet been activated. You will receive an email when your registration has been activated by someone on our staff. diff --git a/core/templates/email_registrationaccepted.php b/core/templates/email_registrationaccepted.php index e8ebb51e..12fda948 100644 --- a/core/templates/email_registrationaccepted.php +++ b/core/templates/email_registrationaccepted.php @@ -1,3 +1,4 @@ + Dear firstname.' '.$pilot->lastname ?>, Your registration for was accepted! Please visit us at to login and complete your registration diff --git a/core/templates/email_registrationdenied.php b/core/templates/email_registrationdenied.php index 7e879095..fad2e174 100644 --- a/core/templates/email_registrationdenied.php +++ b/core/templates/email_registrationdenied.php @@ -1,3 +1,4 @@ + Dear firstname.' '.$pilot->lastname?>, Your registration for was denied. Please contact an admin at to dispute this. diff --git a/core/templates/finance_balancesheet.php b/core/templates/finance_balancesheet.php index 00fc7973..160d46ef 100644 --- a/core/templates/finance_balancesheet.php +++ b/core/templates/finance_balancesheet.php @@ -1,3 +1,4 @@ + diff --git a/core/templates/finance_header.php b/core/templates/finance_header.php index 6a37c8b0..deb42b14 100644 --- a/core/templates/finance_header.php +++ b/core/templates/finance_header.php @@ -1,3 +1,4 @@ +
    Select Report: diff --git a/core/templates/finance_summarysheet.php b/core/templates/finance_summarysheet.php index 6ebcf6d4..493c0b45 100644 --- a/core/templates/finance_summarysheet.php +++ b/core/templates/finance_summarysheet.php @@ -1,3 +1,4 @@ +
    diff --git a/core/templates/frontpage_reports.php b/core/templates/frontpage_reports.php index a50f3ae7..105c10ec 100644 --- a/core/templates/frontpage_reports.php +++ b/core/templates/frontpage_reports.php @@ -1,3 +1,4 @@ + [Log] Log=/action.php/acars/fsacars/pirep Mail= diff --git a/core/templates/fsfk_liveacars_config.php b/core/templates/fsfk_liveacars_config.php index 9d4731b7..6f759601 100644 --- a/core/templates/fsfk_liveacars_config.php +++ b/core/templates/fsfk_liveacars_config.php @@ -1,3 +1,4 @@ + [ACARS_CONFIG] ADDRESS= diff --git a/core/templates/fsfk_log_flightcritique.php b/core/templates/fsfk_log_flightcritique.php index d39934d2..2ddedcc1 100644 --- a/core/templates/fsfk_log_flightcritique.php +++ b/core/templates/fsfk_log_flightcritique.php @@ -1,4 +1,5 @@ - +
    Flight Details
    diff --git a/core/templates/fsfk_log_flightimages.php b/core/templates/fsfk_log_flightimages.php index c256ff95..214fb799 100644 --- a/core/templates/fsfk_log_flightimages.php +++ b/core/templates/fsfk_log_flightimages.php @@ -1,3 +1,4 @@ +
    Flight Images
    [WEB_CONFIG] ADDRESS= diff --git a/core/templates/fsfk_vaconfig.php b/core/templates/fsfk_vaconfig.php index f84410bf..8b309166 100644 --- a/core/templates/fsfk_vaconfig.php +++ b/core/templates/fsfk_vaconfig.php @@ -1,3 +1,4 @@ + [VA_CONFIG] DOWNLOADURL = diff --git a/core/templates/fspax_config.php b/core/templates/fspax_config.php index 2d818016..2d8f0e2d 100644 --- a/core/templates/fspax_config.php +++ b/core/templates/fspax_config.php @@ -1,3 +1,4 @@ + menu_name=; base_url=; path_stats=index.php/acars; diff --git a/core/templates/login_already.php b/core/templates/login_already.php index 12f90162..b6d097ca 100644 --- a/core/templates/login_already.php +++ b/core/templates/login_already.php @@ -1,2 +1,3 @@ +

    Error!

    You are already logged in!

    \ No newline at end of file diff --git a/core/templates/login_complete.php b/core/templates/login_complete.php index fc2a9a94..68dc25ec 100644 --- a/core/templates/login_complete.php +++ b/core/templates/login_complete.php @@ -1,3 +1,4 @@ +

    Enter your email address to get a new password: diff --git a/core/templates/login_form.php b/core/templates/login_form.php index 674455e0..a1c4c250 100644 --- a/core/templates/login_form.php +++ b/core/templates/login_form.php @@ -1,3 +1,4 @@ +

    Login

    "; ?> diff --git a/core/templates/login_notfound.php b/core/templates/login_notfound.php index 9fd924c4..a18515ad 100644 --- a/core/templates/login_notfound.php +++ b/core/templates/login_notfound.php @@ -1 +1,2 @@ +

    This email address was not found in our database. If you feel this was an error, please contact an administrator.

    \ No newline at end of file diff --git a/core/templates/login_passwordreset.php b/core/templates/login_passwordreset.php index 8c258497..4694b5be 100644 --- a/core/templates/login_passwordreset.php +++ b/core/templates/login_passwordreset.php @@ -1,2 +1,3 @@ +

    Password Reset

    Your new password has been sent to your email!

    \ No newline at end of file diff --git a/core/templates/login_rejected.php b/core/templates/login_rejected.php index d356fcb5..8139f176 100644 --- a/core/templates/login_rejected.php +++ b/core/templates/login_rejected.php @@ -1,2 +1,3 @@ +

    Sorry!

    Your registration was not accepted. Please contact the administrator for additional details.

    \ No newline at end of file diff --git a/core/templates/login_unconfirmed.php b/core/templates/login_unconfirmed.php index 57c55e41..3b3746ce 100644 --- a/core/templates/login_unconfirmed.php +++ b/core/templates/login_unconfirmed.php @@ -1,3 +1,5 @@ + +

    Unconfirmed

    Sorry! Your registration has not yet been checked by an administrator. Please try again later. You will receive an email when your registration has been accepted

    \ No newline at end of file diff --git a/core/templates/maintenance.php b/core/templates/maintenance.php index bd4cbe84..0ebfda26 100644 --- a/core/templates/maintenance.php +++ b/core/templates/maintenance.php @@ -1,19 +1,20 @@ - - - -Down for maintenance - phpVMS Virtual Airline - - - -
    -

    Down for maintenance

    -

    We are currently down for maintenance, please check back soon.

    -
    - + + + + +Down for maintenance - phpVMS Virtual Airline + + + +
    +

    Down for maintenance

    +

    We are currently down for maintenance, please check back soon.

    +
    + \ No newline at end of file diff --git a/core/templates/news_newsitem.php b/core/templates/news_newsitem.php index 0858c868..12b2c046 100644 --- a/core/templates/news_newsitem.php +++ b/core/templates/news_newsitem.php @@ -1,3 +1,4 @@ +

    Posted by on

    diff --git a/core/templates/pages_content.php b/core/templates/pages_content.php index c9ef8ac3..fd4a9c4e 100644 --- a/core/templates/pages_content.php +++ b/core/templates/pages_content.php @@ -1,3 +1,4 @@ +

    diff --git a/core/templates/pages_items.php b/core/templates/pages_items.php index a99e169d..a78bb553 100644 --- a/core/templates/pages_items.php +++ b/core/templates/pages_items.php @@ -1,3 +1,4 @@ +

    Not Allowed

    You are not allowed permission to access this page

    \ No newline at end of file diff --git a/core/templates/pages_notfound.php b/core/templates/pages_notfound.php index f6336a5f..e4dc899f 100644 --- a/core/templates/pages_notfound.php +++ b/core/templates/pages_notfound.php @@ -1,2 +1,3 @@ +

    You broke it!

    Just kidding. The page you were looking for has run away. Contact the site admin if you think this is an error.

    \ No newline at end of file diff --git a/core/templates/pilot_public_profile.php b/core/templates/pilot_public_profile.php index 80a0a92f..893fc525 100644 --- a/core/templates/pilot_public_profile.php +++ b/core/templates/pilot_public_profile.php @@ -1,3 +1,4 @@ + This pilot does not exist!'; diff --git a/core/templates/pilots_list.php b/core/templates/pilots_list.php index 730c61b1..8868f8d5 100644 --- a/core/templates/pilots_list.php +++ b/core/templates/pilots_list.php @@ -1,3 +1,4 @@ +

    Add Comment to PIREP

    File a Flight Report

    Flight code . $pirep->flightnum; ?>

    diff --git a/core/templates/pireps_addcomment.php b/core/templates/pireps_addcomment.php index 3431e6e8..47a3b6dc 100644 --- a/core/templates/pireps_addcomment.php +++ b/core/templates/pireps_addcomment.php @@ -1,3 +1,4 @@ +

    Add Comment to PIREP

    Comment:
    diff --git a/core/templates/pireps_airportdropdown.php b/core/templates/pireps_airportdropdown.php index 547d42a0..ebc9467c 100644 --- a/core/templates/pireps_airportdropdown.php +++ b/core/templates/pireps_airportdropdown.php @@ -1,16 +1,17 @@ -'; - return; -} -?> - + + +icao . '">' . $airport->icao . ' - ' . $airport->name . ''; +} +?> + \ No newline at end of file diff --git a/core/templates/pireps_viewall.php b/core/templates/pireps_viewall.php index dfb5235b..7985da90 100644 --- a/core/templates/pireps_viewall.php +++ b/core/templates/pireps_viewall.php @@ -1,3 +1,4 @@ +

    PIREPs List

    Pilot Badge

    diff --git a/core/templates/profile_changepassword.php b/core/templates/profile_changepassword.php index 5704e3ef..6b364e20 100644 --- a/core/templates/profile_changepassword.php +++ b/core/templates/profile_changepassword.php @@ -1,3 +1,4 @@ +

    Change Password

    diff --git a/core/templates/profile_edit.php b/core/templates/profile_edit.php index 40c55ea6..452dbf56 100644 --- a/core/templates/profile_edit.php +++ b/core/templates/profile_edit.php @@ -1,3 +1,4 @@ +

    Edit Profile

    diff --git a/core/templates/profile_main.php b/core/templates/profile_main.php index a7923ef7..8024ad39 100644 --- a/core/templates/profile_main.php +++ b/core/templates/profile_main.php @@ -1,3 +1,4 @@ +

    Pilot Center

    diff --git a/core/templates/profile_myroutesmap.php b/core/templates/profile_myroutesmap.php index e69de29b..36be6f4e 100644 --- a/core/templates/profile_myroutesmap.php +++ b/core/templates/profile_myroutesmap.php @@ -0,0 +1 @@ + diff --git a/core/templates/profile_stats.php b/core/templates/profile_stats.php index 90bdc139..fd95f2f6 100644 --- a/core/templates/profile_stats.php +++ b/core/templates/profile_stats.php @@ -1,3 +1,4 @@ +

    Your Stats

    Registration Confirmation

    Thanks for joining us! Your registration has been completed! You can login using your pilot ID (code, $pilot->pilotid);?>), and the password you used during registration.

    \ No newline at end of file diff --git a/core/templates/registration_complete.php b/core/templates/registration_complete.php index f3b3b6c6..a12058a3 100644 --- a/core/templates/registration_complete.php +++ b/core/templates/registration_complete.php @@ -1,2 +1,3 @@ +

    Thank you!

    Your registration is now complete! You may log-in now

    \ No newline at end of file diff --git a/core/templates/registration_customfields.php b/core/templates/registration_customfields.php index dada5c88..5827c217 100644 --- a/core/templates/registration_customfields.php +++ b/core/templates/registration_customfields.php @@ -1,3 +1,4 @@ +

    Error Registering

    \ No newline at end of file diff --git a/core/templates/registration_javascript.php b/core/templates/registration_javascript.php index 40f2fca1..00499321 100644 --- a/core/templates/registration_javascript.php +++ b/core/templates/registration_javascript.php @@ -1,3 +1,4 @@ +
    diff --git a/core/templates/schedule_details.php b/core/templates/schedule_details.php index d0e0b2e9..f9e49d87 100644 --- a/core/templates/schedule_details.php +++ b/core/templates/schedule_details.php @@ -1,3 +1,4 @@ +

    Schedule Details

    Flight Number: code.$schedule->flightnum ?>
    diff --git a/core/templates/schedule_list.php b/core/templates/schedule_list.php index 061e38b1..e054eb4b 100644 --- a/core/templates/schedule_list.php +++ b/core/templates/schedule_list.php @@ -1,3 +1,4 @@ +

    Search Schedules

    diff --git a/core/templates/xacars_config.php b/core/templates/xacars_config.php index be981ea3..43c2a6c4 100644 --- a/core/templates/xacars_config.php +++ b/core/templates/xacars_config.php @@ -1,3 +1,4 @@ + [Server] Address = /action.php/acars/xacars/acars