From 5a41aa413d2bce0880a47b39b10d9f2a8f2274ba Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Fri, 15 May 2009 21:12:37 +0200 Subject: [PATCH] [svn r20709] FS#306 - Replacing some natural language unsafe occurrences of the function ucfirst(). --- main/admin/calendar.lib.php | 10 +++++----- main/admin/calendar_view_print.php | 4 ++-- main/admin/configure_homepage.php | 6 +++--- main/admin/course_user_list.php | 4 ++-- main/admin/index.php | 12 ++++++------ main/admin/resume_session.php | 8 ++++---- main/calendar/myagenda.inc.php | 2 +- main/chat/chat_whoisonline.php | 2 +- main/inc/lib/text.lib.php | 6 +++--- main/mySpace/access_details.php | 2 +- main/newscorm/lp_edit.php | 2 +- main/notebook/index.php | 2 +- main/reservation/reservation.php | 2 +- main/social/profile.php | 2 +- main/work/work.lib.php | 8 ++++---- main/work/work.php | 8 ++++---- 16 files changed, 40 insertions(+), 40 deletions(-) diff --git a/main/admin/calendar.lib.php b/main/admin/calendar.lib.php index 21a2b38439..bc3ef1d873 100644 --- a/main/admin/calendar.lib.php +++ b/main/admin/calendar.lib.php @@ -753,7 +753,7 @@ function display_agenda_items() { $month_bar = date("m",strtotime($myrow["start_date"])).date("Y",strtotime($myrow["start_date"])); echo "\t\n\t\t". - ucfirst(format_locale_date("%B %Y",strtotime($myrow["start_date"]))). + api_ucfirst(format_locale_date("%B %Y",strtotime($myrow["start_date"]))). "\n\t\n"; } @@ -822,14 +822,14 @@ function display_agenda_items() --------------------------------------------------*/ echo ""; echo "\t\t".get_lang("StartTimeWindow").": "; - echo ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["start_date"])))."   "; + echo api_ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["start_date"])))."   "; echo ucfirst(strftime($timeNoSecFormat,strtotime($myrow["start_date"]))).""; echo "\n"; echo "\t\t"; if ($myrow["end_date"]<>"0000-00-00 00:00:00") { echo get_lang("EndTimeWindow").": "; - echo ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["end_date"])))."   "; + echo api_ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["end_date"])))."   "; echo ucfirst(strftime($timeNoSecFormat,strtotime($myrow["end_date"]))).""; } echo "\n"; @@ -1067,11 +1067,11 @@ function display_one_agenda_item($agenda_id) --------------------------------------------------*/ echo "\t\n"; echo "\t\t".get_lang("StartTime").": "; - echo ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["start_date"])))."   "; + echo api_ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["start_date"])))."   "; echo ucfirst(strftime($timeNoSecFormat,strtotime($myrow["start_date"]))).""; echo "\n"; echo "\t\t".get_lang("EndTime").": "; - echo ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["end_date"])))."   "; + echo api_ucfirst(format_locale_date($dateFormatLong,strtotime($myrow["end_date"])))."   "; echo ucfirst(strftime($timeNoSecFormat,strtotime($myrow["end_date"]))).""; echo "\n"; echo "\n\t\n"; diff --git a/main/admin/calendar_view_print.php b/main/admin/calendar_view_print.php index 9442e7fdd9..0a66c399d1 100755 --- a/main/admin/calendar_view_print.php +++ b/main/admin/calendar_view_print.php @@ -82,14 +82,14 @@ while($row=Database::fetch_array($result)) echo get_lang('StartTime').' : '; - echo ucfirst(format_locale_date($dateFormatLong,strtotime($row["start_date"])))."   "; + echo api_ucfirst(format_locale_date($dateFormatLong,strtotime($row["start_date"])))."   "; echo ucfirst(strftime($timeNoSecFormat,strtotime($row["start_date"]))).""; echo '
'; echo get_lang('EndTime').' : '; - echo ucfirst(format_locale_date($dateFormatLong,strtotime($row["end_date"])))."   "; + echo api_ucfirst(format_locale_date($dateFormatLong,strtotime($row["end_date"])))."   "; echo ucfirst(strftime($timeNoSecFormat,strtotime($row["end_date"]))).""; echo '

'; diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index bd75f27287..721cf98b8d 100644 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -1,4 +1,4 @@ - diff --git a/main/admin/course_user_list.php b/main/admin/course_user_list.php index 3098050607..440494c6f2 100644 --- a/main/admin/course_user_list.php +++ b/main/admin/course_user_list.php @@ -15,7 +15,7 @@ for ($i=0;$i - + - \ No newline at end of file + diff --git a/main/admin/index.php b/main/admin/index.php index 645ecadec9..578f55b810 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -1,4 +1,4 @@ -
-

+

  • @@ -91,7 +91,7 @@ if (api_is_platform_admin()) {
    • -
    • +
    • @@ -105,7 +105,7 @@ else { ?>
    -

    +

      • @@ -119,7 +119,7 @@ else if(api_is_platform_admin()) { ?>
      -

      +

      -

      +

        • diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php index 720ce4976c..b1cd241e45 100644 --- a/main/admin/resume_session.php +++ b/main/admin/resume_session.php @@ -1,4 +1,4 @@ - - : + : @@ -138,7 +138,7 @@ api_display_tool_title($tool_name); - : + : @@ -257,4 +257,4 @@ else { \ No newline at end of file +?> diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php index d6b2c58f2e..f1c663e871 100644 --- a/main/calendar/myagenda.inc.php +++ b/main/calendar/myagenda.inc.php @@ -839,7 +839,7 @@ function show_simple_personal_agenda($user_id) --------------------------------------------------*/ // adding an internal anchor $content.= date("d", strtotime($myrow["date"]))." ".$MonthsLong[date("n", strtotime($myrow["date"])) - 1]." ".date("Y", strtotime($myrow["date"]))." "; - $content.= ucfirst(strftime(get_lang("timeNoSecFormat"), strtotime($myrow["date"]))); + $content.= api_ucfirst(strftime(get_lang("timeNoSecFormat"), strtotime($myrow["date"]))); /*-------------------------------------------------- display: the title diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php index d204b5853e..b3c74257ca 100755 --- a/main/chat/chat_whoisonline.php +++ b/main/chat/chat_whoisonline.php @@ -114,7 +114,7 @@ if (!empty($course)) ?> - '11')).' '; else echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '11'));?> name="user_" href="?&showPic=#user_"> + '11')).' '; else echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '11'));?> name="user_" href="?&showPic=#user_"> '.get_lang('User').': '.$mainUserInfo['firstName'].' '.$mainUserIn
          • -
          • +
        ';?>
      diff --git a/main/newscorm/lp_edit.php b/main/newscorm/lp_edit.php index d555d9789a..5255da3919 100644 --- a/main/newscorm/lp_edit.php +++ b/main/newscorm/lp_edit.php @@ -94,7 +94,7 @@ if (api_get_setting('allow_course_theme') == 'true') } //Author -//$form -> addElement('text', 'lp_author', ucfirst(get_lang('Author'))); +//$form -> addElement('text', 'lp_author', api_ucfirst(get_lang('Author'))); //$form->add_html_editor('lp_author', get_lang('Author')); $form->addElement('html_editor','lp_author',get_lang('Author'),array('size'=>80) ); diff --git a/main/notebook/index.php b/main/notebook/index.php index d38e09974c..19d500d481 100755 --- a/main/notebook/index.php +++ b/main/notebook/index.php @@ -36,7 +36,7 @@ event_access_tool(TOOL_NOTEBOOK); if ( isset($_GET['action']) && ($_GET['action'] == 'addnote' || $_GET['action'] == 'editnote')) { $tool=get_lang('NotebookManagement'); -$interbreadcrumb[] = array ("url"=>"index.php", "name"=> ucfirst(get_lang(TOOL_NOTEBOOK))); +$interbreadcrumb[] = array ("url"=>"index.php", "name"=> api_ucfirst(get_lang(TOOL_NOTEBOOK))); } // displaying the header diff --git a/main/reservation/reservation.php b/main/reservation/reservation.php index c707d53190..4c4beea534 100644 --- a/main/reservation/reservation.php +++ b/main/reservation/reservation.php @@ -130,7 +130,7 @@ if ($gogogo&&!empty($_GET['cat'])) { ob_end_clean(); - $legend=getBlock('green').' '.ucfirst(get_lang('OpenBooking')).' '.getBlock('blue').' '.get_lang('TimePicker').' '.getBlock('orange').' '.get_lang('OutPeriod').' '.getBlock('red').' '.get_lang('Reserved').' '.getBlock('grey').' '.get_lang('NoReservations').' '.getBlock('black').' '.get_lang('Blackout'); + $legend=getBlock('green').' '.api_ucfirst(get_lang('OpenBooking')).' '.getBlock('blue').' '.get_lang('TimePicker').' '.getBlock('orange').' '.get_lang('OutPeriod').' '.getBlock('red').' '.get_lang('Reserved').' '.getBlock('grey').' '.get_lang('NoReservations').' '.getBlock('black').' '.get_lang('Blackout'); echo '

      '.$GLOBALS['weekstart'].' - '.$GLOBALS['weekend'].'
      '.$buffer.'
       
      '.$legend.'
      '; } } diff --git a/main/social/profile.php b/main/social/profile.php index 77dea28270..087cbba34c 100644 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -760,7 +760,7 @@ echo '
      '; //echo '
      ';
 				if ( is_array($list) ) {
 					echo '
      ';
-					echo ucfirst(get_lang('MyCourses'));
+					echo api_ucfirst(get_lang('MyCourses'));
 					echo '
      ';
 					echo '