From c70cd8e5879d42e22e2edeb7cf40d07f89fd5fd9 Mon Sep 17 00:00:00 2001 From: jo Date: Mon, 11 Oct 2021 17:11:14 +0200 Subject: [PATCH 1/5] Fix duplicate check-yaml entry --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 78c5ee7a1..a38ff34ca 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: check-json - id: check-yaml - - id: check-yaml + - id: check-xml - id: check-toml - id: check-merge-conflict From 3a7d4501915177c3e3c7a205b588de7dcbd59379 Mon Sep 17 00:00:00 2001 From: jo Date: Mon, 11 Oct 2021 17:11:33 +0200 Subject: [PATCH 2/5] Enable pre-commit on legacy code --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a38ff34ca..00d8ce5b9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,6 @@ --- # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks -exclude: ^(legacy.*)$ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.0.1 @@ -53,3 +52,4 @@ repos: args: - --ignore-words=.codespellignore - --builtin=clear,rare,informal + exclude: ^(legacy.*)$ From fea11ac752803442bcd631a31d3df88bc94bf691 Mon Sep 17 00:00:00 2001 From: jo Date: Mon, 11 Oct 2021 17:29:44 +0200 Subject: [PATCH 3/5] Fix seed_files.yml --- .../application/models/database/datasets/seed_files.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/legacy/tests/application/models/database/datasets/seed_files.yml b/legacy/tests/application/models/database/datasets/seed_files.yml index c29094a97..16ec4cb01 100644 --- a/legacy/tests/application/models/database/datasets/seed_files.yml +++ b/legacy/tests/application/models/database/datasets/seed_files.yml @@ -6,7 +6,7 @@ cc_music_dirs: type: 'stor' exists: 't' watched: 't' - + cc_files: - @@ -79,7 +79,7 @@ cc_files: is_playlist: 'f' filesize: '5126748' - + - id: '4' mime: 'audio/mp3' ftype: 'audioclip' @@ -103,6 +103,7 @@ cc_files: is_playlist: 'f' filesize: '5126748' + - id: '5' mime: 'audio/mp3' ftype: 'audioclip' @@ -128,6 +129,7 @@ cc_files: + - id: '6' mime: 'audio/mp3' ftype: 'audioclip' @@ -152,6 +154,7 @@ cc_files: filesize: '5126748' + - id: '7' mime: 'audio/mp3' ftype: 'audioclip' @@ -174,4 +177,3 @@ cc_files: is_scheduled: 'f' is_playlist: 'f' filesize: '5126748' - From 83b7e4162e5b7e854baff30652e92ed46770f24c Mon Sep 17 00:00:00 2001 From: jo Date: Tue, 12 Oct 2021 11:17:57 +0200 Subject: [PATCH 4/5] Run pre-commit on legacy code --- .../airtime_2.5.13/downgrade.sql | 2 +- .../airtime_2.5.15/downgrade.sql | 2 +- .../airtime_3.0.0-alpha.1/downgrade.sql | 1 - .../airtime_3.0.0-alpha.6/downgrade.sql | 1 - .../airtime_3.0.0-alpha.7.1/downgrade.sql | 1 - .../airtime_3.0.0-alpha.9.2/downgrade.sql | 2 +- .../airtime_3.0.0-alpha.9.4/downgrade.sql | 2 +- .../upgrade_sql/airtime_2.5.14/upgrade.sql | 2 +- .../upgrade_sql/airtime_2.5.15/upgrade.sql | 2 +- .../upgrade_sql/airtime_2.5.17/upgrade.sql | 2 +- .../upgrade_sql/airtime_2.5.9/upgrade.sql | 2 +- .../airtime_3.0.0-alpha.7.1/upgrade.sql | 1 - .../airtime_3.0.0-alpha.9.2/upgrade.sql | 1 - .../airtime_3.0.0-alpha.9.4/upgrade.sql | 2 +- .../application/layouts/scripts/layout.phtml | 1 - .../layouts/scripts/livestream.phtml | 2 +- .../application/layouts/scripts/login.phtml | 12 +- legacy/application/models/ListenerStat.php | 4 +- .../models/airtime/map/CcSectionTableMap.php | 4 +- .../airtime/map/CcSectioncontentsTableMap.php | 4 +- .../models/airtime/om/BaseCcAccess.php | 46 +- .../models/airtime/om/BaseCcAccessPeer.php | 25 +- .../models/airtime/om/BaseCcAccessQuery.php | 34 +- .../models/airtime/om/BaseCcBackup.php | 32 +- .../models/airtime/om/BaseCcBackupPeer.php | 17 +- .../models/airtime/om/BaseCcBackupQuery.php | 16 +- .../models/airtime/om/BaseCcBlockPeer.php | 1 - .../airtime/om/BaseCcBlockcontentsPeer.php | 1 - .../airtime/om/BaseCcBlockcriteriaPeer.php | 1 - .../models/airtime/om/BaseCcCountryPeer.php | 1 - .../models/airtime/om/BaseCcFileTag.php | 20 +- .../models/airtime/om/BaseCcFileTagPeer.php | 49 +- .../models/airtime/om/BaseCcFileTagQuery.php | 32 +- .../models/airtime/om/BaseCcFilesPeer.php | 1 - .../airtime/om/BaseCcListenerCountPeer.php | 1 - .../models/airtime/om/BaseCcLiveLogPeer.php | 1 - .../models/airtime/om/BaseCcLocalePeer.php | 1 - .../airtime/om/BaseCcLoginAttemptsPeer.php | 1 - .../models/airtime/om/BaseCcMountNamePeer.php | 1 - .../models/airtime/om/BaseCcMusicDirsPeer.php | 1 - .../models/airtime/om/BaseCcPermsPeer.php | 1 - .../models/airtime/om/BaseCcPlaylistPeer.php | 1 - .../airtime/om/BaseCcPlaylistcontentsPeer.php | 1 - .../airtime/om/BaseCcPlaylistcriteria.php | 36 +- .../airtime/om/BaseCcPlaylistcriteriaPeer.php | 25 +- .../om/BaseCcPlaylistcriteriaQuery.php | 30 +- .../om/BaseCcPlayoutHistoryMetaDataPeer.php | 1 - .../airtime/om/BaseCcPlayoutHistoryPeer.php | 1 - .../BaseCcPlayoutHistoryTemplateFieldPeer.php | 1 - .../om/BaseCcPlayoutHistoryTemplatePeer.php | 1 - .../om/BaseCcPlayoutHistoryTemplateTag.php | 32 +- .../BaseCcPlayoutHistoryTemplateTagPeer.php | 25 +- .../BaseCcPlayoutHistoryTemplateTagQuery.php | 28 +- .../models/airtime/om/BaseCcPrefPeer.php | 1 - .../models/airtime/om/BaseCcSchedulePeer.php | 1 - .../airtime/om/BaseCcServiceRegisterPeer.php | 1 - .../models/airtime/om/BaseCcSessPeer.php | 1 - .../models/airtime/om/BaseCcShowDaysPeer.php | 1 - .../models/airtime/om/BaseCcShowHostsPeer.php | 1 - .../airtime/om/BaseCcShowInstancesPeer.php | 1 - .../models/airtime/om/BaseCcShowPeer.php | 1 - .../airtime/om/BaseCcShowRebroadcastPeer.php | 1 - .../models/airtime/om/BaseCcShowSchedule.php | 24 +- .../airtime/om/BaseCcShowSchedulePeer.php | 25 +- .../airtime/om/BaseCcShowScheduleQuery.php | 24 +- .../airtime/om/BaseCcStreamSettingPeer.php | 1 - .../models/airtime/om/BaseCcSubjsPeer.php | 1 - .../airtime/om/BaseCcSubjsTokenPeer.php | 1 - .../models/airtime/om/BaseCcTag.php | 20 +- .../models/airtime/om/BaseCcTagPeer.php | 23 +- .../models/airtime/om/BaseCcTagQuery.php | 42 +- .../models/airtime/om/BaseCcTimestampPeer.php | 1 - .../airtime/om/BaseCcTracktypesPeer.php | 1 - .../models/airtime/om/BaseCcTrans.php | 108 +- .../models/airtime/om/BaseCcTransPeer.php | 17 +- .../models/airtime/om/BaseCcTransQuery.php | 54 +- .../om/BaseCcWebstreamMetadataPeer.php | 1 - .../models/airtime/om/BaseCcWebstreamPeer.php | 1 - .../models/airtime/om/BaseCeleryTasksPeer.php | 1 - .../models/airtime/om/BaseCloudFilePeer.php | 1 - .../airtime/om/BaseImportedPodcastPeer.php | 1 - .../airtime/om/BasePodcastEpisodesPeer.php | 1 - .../models/airtime/om/BasePodcastPeer.php | 1 - .../airtime/om/BaseStationPodcastPeer.php | 1 - .../om/BaseThirdPartyTrackReferencesPeer.php | 1 - .../models/tests/plistEmbedded.xml | 5 +- .../views/scripts/api/status.phtml | 2 +- .../views/scripts/dashboard/about.phtml | 4 +- .../views/scripts/dashboard/help.phtml | 5 +- .../scripts/dashboard/stream-player.phtml | 6 +- .../scripts/form/add-show-autoplaylist.phtml | 4 +- .../views/scripts/form/add-show-block.phtml | 2 +- .../scripts/form/add-show-live-stream.phtml | 1 - .../form/add-show-rebroadcast-absolute.phtml | 12 +- .../scripts/form/add-show-rebroadcast.phtml | 12 +- .../views/scripts/form/add-show-when.phtml | 3 +- .../views/scripts/form/daterange.phtml | 2 +- .../scripts/form/edit-history-file.phtml | 4 +- .../views/scripts/form/edit-user.phtml | 22 +- .../views/scripts/form/login.phtml | 8 +- .../views/scripts/form/password-change.phtml | 6 +- .../views/scripts/form/password-restore.phtml | 1 - .../scripts/form/preferences_livestream.phtml | 2 +- .../scripts/form/preferences_tunein.phtml | 2 +- .../form/preferences_watched_dirs.phtml | 3 +- .../scripts/form/smart-block-criteria.phtml | 12 +- .../scripts/form/stream-setting-form.phtml | 6 +- .../views/scripts/library/index.phtml | 2 +- .../views/scripts/login/index.phtml | 2 +- .../views/scripts/login/password-change.phtml | 2 +- .../login/password-restore-after.phtml | 2 +- legacy/application/views/scripts/menu.phtml | 2 +- .../partialviews/dashboard-sub-nav.php | 2 +- .../scripts/playlist/permission-denied.phtml | 2 +- .../views/scripts/playlist/playlist.phtml | 2 +- .../views/scripts/playlist/set-cue.phtml | 8 +- .../views/scripts/playlist/set-fade.phtml | 16 +- .../views/scripts/playlist/update.phtml | 2 +- .../views/scripts/playouthistory/dialog.phtml | 2 +- .../views/scripts/playouthistory/index.phtml | 2 +- .../configure-template.phtml | 2 +- .../playouthistorytemplate/index.phtml | 2 +- .../template-contents.phtml | 2 +- .../views/scripts/plupload/index.phtml | 4 +- .../scripts/podcast/featureupgrade-pane.phtml | 1 - .../scripts/podcast/podcast_url_dialog.phtml | 2 +- .../scripts/schedule/add-show-form.phtml | 1 - .../schedule/get-current-playlist.phtml | 2 +- .../scripts/schedule/get-show-data.phtml | 2 +- .../views/scripts/schedule/index.phtml | 2 +- .../views/scripts/schedule/show-list.phtml | 2 +- .../scripts/systemstatus/get-log-file.phtml | 1 - .../views/scripts/systemstatus/index.phtml | 4 +- .../airtime-setup/forms/database-settings.php | 12 +- .../airtime-setup/forms/media-settings.php | 2 +- .../airtime-setup/forms/rabbitmq-settings.php | 10 +- legacy/build/airtime-setup/setup-config.php | 2 +- legacy/build/airtime.example.conf | 20 +- legacy/build/build.properties | 2 +- legacy/build/sql/triggers.sql | 1 - legacy/public/css/add-show.css | 2 +- legacy/public/css/bootstrap-3.3.1.min.css | 2 +- .../css/bootstrap-datetimepicker.min.css | 2 +- legacy/public/css/datatables/css/ColVis.css | 2 +- .../datatables/css/dataTables.colReorder.css | 2 +- .../css/datatables/css/jquery.dataTables.css | 3 +- .../css/jquery.dataTables_themeroller.css | 1 - .../embed/weekly-schedule-widget-basic.css | 1 - .../css/embed/weekly-schedule-widget.css | 2 - legacy/public/css/fullcalendar-old.css | 248 ++- legacy/public/css/fullcalendar.css | 242 +-- legacy/public/css/history_styles.css | 2 +- legacy/public/css/images/icon-clock.svg | 2 +- .../public/css/jquery-ui-timepicker-addon.css | 2 +- legacy/public/css/jquery.contextMenu.css | 14 +- legacy/public/css/jquery.ui.timepicker.css | 8 +- legacy/public/css/landing-page.css | 1 - legacy/public/css/masterpanel.css | 12 +- legacy/public/css/media_library.css | 2 +- legacy/public/css/player-form.css | 4 - legacy/public/css/player.css | 2 +- legacy/public/css/playlist_builder.css | 8 +- legacy/public/css/playouthistory.css | 2 +- legacy/public/css/plupload.queue.css | 6 +- legacy/public/css/pro_dropdown_3.css | 7 +- legacy/public/css/qtip/jquery.qtip.css | 29 +- legacy/public/css/qtip/jquery.qtip.min.css | 2 +- .../public/css/radio-page/premium_player.css | 2 +- legacy/public/css/radio-page/radio-page.css | 2 +- .../public/css/radio-page/station-podcast.css | 18 +- .../css/redmond/jquery-ui-1.8.8.custom.css | 2 +- .../jquery-ui-1.8.8.custom.css | 12 +- legacy/public/css/schedule-widget.css | 2 +- legacy/public/css/setup/config-check.css | 2 +- legacy/public/css/setup/setup-config.css | 4 +- legacy/public/css/show_analytics.css | 2 +- legacy/public/css/showbuilder.css | 39 +- legacy/public/css/tipsy/jquery.tipsy.css | 10 +- legacy/public/css/tracktypes.css | 2 +- legacy/public/css/users.css | 2 +- legacy/public/css/waveform.css | 4 +- .../fonts/glyphicons-halflings-regular.svg | 2 +- legacy/public/js/airtime/buttons/buttons.js | 2 +- .../public/js/airtime/common/audioplaytest.js | 6 +- legacy/public/js/airtime/common/common.js | 22 +- legacy/public/js/airtime/common/facebook.js | 1 - .../js/airtime/dashboard/helperfunctions.js | 53 +- .../js/airtime/dashboard/versiontooltip.js | 2 +- .../library/events/library_playlistbuilder.js | 4 +- .../library/events/library_showbuilder.js | 2 +- legacy/public/js/airtime/library/podcast.js | 16 +- .../js/airtime/listenerstat/listenerstat.js | 28 +- .../airtime/listenerstat/showlistenerstat.js | 2 +- .../public/js/airtime/nowplaying/register.js | 36 +- legacy/public/js/airtime/player/player.js | 1 - .../public/js/airtime/player/playerhtml5.js | 13 +- .../playouthistory/configuretemplate.js | 88 +- .../js/airtime/playouthistory/historytable.js | 358 ++--- .../js/airtime/playouthistory/template.js | 68 +- .../js/airtime/preferences/musicdirs.js | 8 +- .../js/airtime/preferences/preferences.js | 12 +- .../js/airtime/preferences/streamsetting.js | 65 +- legacy/public/js/airtime/schedule/add-show.js | 116 +- .../schedule/full-calendar-functions.js | 2 +- legacy/public/js/airtime/schedule/schedule.js | 84 +- .../js/airtime/showbuilder/main_builder.js | 40 +- legacy/public/js/airtime/status/status.js | 12 +- legacy/public/js/airtime/user/user.js | 22 +- .../public/js/airtime/utilities/utilities.js | 30 +- legacy/public/js/airtime/widgets/table.js | 2 - legacy/public/js/blockui/jquery.blockUI.js | 26 +- .../bootstrap-datetimepicker.js | 12 +- legacy/public/js/bootstrap/bootstrap.min.js | 2 +- .../public/js/colorpicker/js/colorpicker.js | 12 +- .../public/js/contextmenu/AIRTIME_DEV_README | 3 +- .../js/contextmenu/jquery.contextMenu.js | 264 ++-- legacy/public/js/cookie/js.cookie.js | 2 +- legacy/public/js/datatables/i18n/el_GR.txt | 2 +- legacy/public/js/datatables/i18n/en_CA.txt | 2 +- legacy/public/js/datatables/i18n/en_US.txt | 2 +- legacy/public/js/datatables/i18n/es_ES.txt | 2 +- legacy/public/js/datatables/i18n/fr_FR.txt | 2 +- legacy/public/js/datatables/i18n/hu_HU.txt | 2 +- legacy/public/js/datatables/i18n/it_IT.txt | 2 +- legacy/public/js/datatables/i18n/ko_KR.txt | 2 +- legacy/public/js/datatables/i18n/pl_PL.txt | 2 +- legacy/public/js/datatables/i18n/ru_RU.txt | 2 +- .../public/js/datatables/i18n/sr_RS@latin.txt | 2 +- legacy/public/js/datatables/i18n/zh_CN.txt | 2 +- .../js/datatables/js/jquery.dataTables.js | 8 +- .../plugin/AIRTIME_DEV_README_COLUMN_FILTER | 30 +- .../plugin/AIRTIME_DEV_README_COL_VIS | 9 +- .../js/datatables/plugin/dataTables.ColVis.js | 292 ++-- .../plugin/dataTables.ColVis_orig.js | 286 ++-- .../plugin/dataTables.FixedColumns.js | 234 +-- .../plugin/dataTables.FixedHeader.js | 190 +-- .../plugin/dataTables.colReorder.js | 2 +- .../plugin/dataTables.columnFilter.js | 36 +- .../plugin/dataTables.columnFilter_orig.js | 30 +- .../plugin/dataTables.fnSetFilteringDelay.js | 10 +- .../datatables/plugin/dataTables.pluginAPI.js | 12 +- legacy/public/js/flot/README.txt | 2 +- .../public/js/flot/jquery.flot.crosshair.js | 18 +- legacy/public/js/flot/jquery.flot.js | 324 ++-- legacy/public/js/flot/jquery.flot.resize.js | 10 +- .../public/js/fullcalendar/AIRTIME_DEV_README | 3 +- legacy/public/js/fullcalendar/fullcalendar.js | 1398 ++++++++-------- .../js/fullcalendar/fullcalendar.orig.js | 1404 ++++++++--------- legacy/public/js/i18n/jquery.i18n.js | 22 +- .../public/js/jplayer/jplayer.playlist.min.js | 2 +- .../js/jplayer/jquery.jplayer.inspector.js | 40 +- .../public/js/jplayer/jquery.jplayer.min.js | 2 +- .../js/jplayer/popcorn/popcorn.jplayer.js | 4 +- .../skin/jplayer.airtime.audio.preview.css | 16 +- .../jplayer.audio-preview.blue.monday.css | 18 +- .../js/jplayer/skin/jplayer.blue.monday.css | 1 - legacy/public/js/libs/CSVexport.js | 2 +- legacy/public/js/libs/dropzone.min.js | 2 +- legacy/public/js/libs/handlebars.min.js | 2 +- legacy/public/js/libs/jquery-1.8.3.min.js | 2 +- .../js/libs/jquery-ui-1.8.18.custom.min.js | 2 +- legacy/public/js/libs/jquery-ui-1.8.24.min.js | 2 +- legacy/public/js/libs/pdfmake.min.js | 2 +- legacy/public/js/libs/timezone.min.js | 2 +- legacy/public/js/libs/utc.min.js | 2 +- legacy/public/js/libs/vfs_fonts.min.js | 2 +- legacy/public/js/plupload/i18n/en_CA.js | 2 +- legacy/public/js/plupload/i18n/en_US.js | 2 +- legacy/public/js/plupload/i18n/hr_HR.js | 2 +- legacy/public/js/plupload/i18n/hu_HU.js | 2 +- legacy/public/js/plupload/i18n/ko_KR.js | 2 +- legacy/public/js/plupload/i18n/pl_PL.js | 2 +- .../js/plupload/jquery.plupload.queue.min.js | 2 +- .../public/js/plupload/plupload.full.min.js | 2 +- legacy/public/js/qtip/jquery.qtip.js | 112 +- legacy/public/js/qtip/jquery.qtip.min.js | 2 +- .../public/js/serverbrowse/AIRTIME_DEV_README | 4 +- .../public/js/serverbrowse/serverbrowser.js | 46 +- .../js/serverbrowse/serverbrowser_orig.js | 46 +- .../timepicker/jquery-ui-timepicker-addon.js | 108 +- .../js/timepicker/jquery.ui.timepicker.js | 26 +- legacy/public/js/tipsy/AIRTIME_DEV_README | 6 +- legacy/public/js/tipsy/jquery.tipsy.js | 72 +- legacy/public/js/tipsy/jquery.tipsy_orig.js | 72 +- legacy/public/js/waveformplaylist/config.js | 8 +- legacy/public/js/waveformplaylist/controls.js | 35 +- legacy/public/js/waveformplaylist/curves.js | 5 +- legacy/public/js/waveformplaylist/fades.js | 16 +- legacy/public/js/waveformplaylist/loader.js | 8 +- .../js/waveformplaylist/observer/observer.js | 6 +- legacy/public/js/waveformplaylist/playlist.js | 35 +- legacy/public/js/waveformplaylist/playout.js | 13 +- .../public/js/waveformplaylist/time_scale.js | 13 +- legacy/public/js/waveformplaylist/track.js | 63 +- .../js/waveformplaylist/track_render.js | 61 +- .../models/database/datasets/seed_files.yml | 327 ++-- .../database/datasets/seed_schedule.yml | 18 +- .../datasets/test_checkOverlappingShows.yml | 494 +++--- .../database/datasets/seed_show_service.yml | 18 +- .../test_ccShowInsertedIntoDatabase.yml | 35 +- ...hangeRepeatDayUpdatesScheduleCorrectly.yml | 139 +- ...test_createBiWeeklyRepeatNoEndNoRRShow.yml | 110 +- .../datasets/test_createLinkedShow.yml | 161 +- ...reateMonthlyMonthlyRepeatNoEndNoRRShow.yml | 93 +- ...createMonthlyWeeklyRepeatNoEndNoRRShow.yml | 93 +- .../datasets/test_createNoRepeatNoRRShow.yml | 76 +- .../datasets/test_createNoRepeatRRShow.yml | 336 ++-- ...st_createQuadWeeklyRepeatNoEndNoRRShow.yml | 93 +- ...est_createTriWeeklyRepeatNoEndNoRRShow.yml | 93 +- .../test_createWeeklyRepeatNoEndNoRRShow.yml | 161 +- .../test_createWeeklyRepeatRRShow.yml | 383 +++-- .../datasets/test_deleteRepeatingShow.yml | 1 - .../datasets/test_deleteShowInstance.yml | 161 +- ...test_deleteShowInstanceAndAllFollowing.yml | 377 +++-- ...est_editRepeatingShowChangeNoEndOption.yml | 93 +- .../test_editRepeatingShowInstance.yml | 201 ++- ...tRepeatShowDayUpdatesScheduleCorrectly.yml | 139 +- ...CreationWhenUserMovesForwardInCalendar.yml | 161 +- .../datasets/test_unlinkLinkedShow.yml | 161 +- .../datasets/test_weeklyToBiWeekly.yml | 110 +- .../datasets/test_weeklyToNoRepeat.yml | 76 +- legacy/tests/conf/testing/airtime.conf | 2 +- legacy/tests/phpunit.xml | 4 +- 323 files changed, 6126 insertions(+), 6462 deletions(-) diff --git a/legacy/application/controllers/downgrade_sql/airtime_2.5.13/downgrade.sql b/legacy/application/controllers/downgrade_sql/airtime_2.5.13/downgrade.sql index 5943649f2..70ee99ae7 100644 --- a/legacy/application/controllers/downgrade_sql/airtime_2.5.13/downgrade.sql +++ b/legacy/application/controllers/downgrade_sql/airtime_2.5.13/downgrade.sql @@ -8,4 +8,4 @@ DROP TABLE IF EXISTS "third_party_track_references" CASCADE; -- celery_tasks ----------------------------------------------------------------------- -DROP TABLE IF EXISTS "celery_tasks" CASCADE; \ No newline at end of file +DROP TABLE IF EXISTS "celery_tasks" CASCADE; diff --git a/legacy/application/controllers/downgrade_sql/airtime_2.5.15/downgrade.sql b/legacy/application/controllers/downgrade_sql/airtime_2.5.15/downgrade.sql index c88134246..ddb9bbc6d 100644 --- a/legacy/application/controllers/downgrade_sql/airtime_2.5.15/downgrade.sql +++ b/legacy/application/controllers/downgrade_sql/airtime_2.5.15/downgrade.sql @@ -1 +1 @@ -ALTER TABLE third_party_track_references ALTER COLUMN file_id SET NOT NULL; \ No newline at end of file +ALTER TABLE third_party_track_references ALTER COLUMN file_id SET NOT NULL; diff --git a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql index 1f7d24eb5..5f4c8110c 100644 --- a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql +++ b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql @@ -2,4 +2,3 @@ ALTER TABLE imported_podcast DROP COLUMN IF EXISTS album_override; ALTER TABLE third_party_track_references ALTER COLUMN file_id DROP DEFAULT; ALTER TABLE third_party_track_references ALTER COLUMN file_id SET NOT NULL; ALTER TABLE cc_show DROP COLUMN IF EXISTS autoplaylist_repeat; - diff --git a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.6/downgrade.sql b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.6/downgrade.sql index 023d51030..c5705ae2c 100644 --- a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.6/downgrade.sql +++ b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.6/downgrade.sql @@ -1,2 +1 @@ ALTER TABLE cc_service_register ALTER COLUMN ip TYPE character varying(18); - diff --git a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql index eec397f70..dfc39db7f 100644 --- a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql +++ b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql @@ -1,3 +1,2 @@ ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_title; ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_description; - diff --git a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.2/downgrade.sql b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.2/downgrade.sql index 1aa658107..abeb03634 100644 --- a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.2/downgrade.sql +++ b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.2/downgrade.sql @@ -1,3 +1,3 @@ ALTER TABLE cc_files DROP COLUMN IF EXISTS track_type; -DROP TABLE IF EXISTS "cc_track_types" CASCADE; \ No newline at end of file +DROP TABLE IF EXISTS "cc_track_types" CASCADE; diff --git a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.4/downgrade.sql b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.4/downgrade.sql index 232c51526..b0baed129 100644 --- a/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.4/downgrade.sql +++ b/legacy/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9.4/downgrade.sql @@ -3,4 +3,4 @@ ALTER TABLE cc_files ADD COLUMN soundcloud_id INTEGER; ALTER TABLE cc_files ADD COLUMN soundcloud_error_code INTEGER; ALTER TABLE cc_files ADD COLUMN soundcloud_error_msg VARCHAR(512); ALTER TABLE cc_files ADD COLUMN soundcloud_link_to_file VARCHAR(4096); -ALTER TABLE cc_files ADD COLUMN soundcloud_upload_time TIMESTAMP(6); \ No newline at end of file +ALTER TABLE cc_files ADD COLUMN soundcloud_upload_time TIMESTAMP(6); diff --git a/legacy/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql b/legacy/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql index 218a74096..0e721b538 100644 --- a/legacy/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql +++ b/legacy/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql @@ -1,3 +1,3 @@ ALTER TABLE cc_pref ALTER COLUMN subjid SET DEFAULT NULL; CREATE UNIQUE INDEX cc_pref_key_idx ON cc_pref (keystr) WHERE subjid IS NULL; -ANALYZE cc_pref; \ No newline at end of file +ANALYZE cc_pref; diff --git a/legacy/application/controllers/upgrade_sql/airtime_2.5.15/upgrade.sql b/legacy/application/controllers/upgrade_sql/airtime_2.5.15/upgrade.sql index 2d9a551c6..9d5051ae5 100644 --- a/legacy/application/controllers/upgrade_sql/airtime_2.5.15/upgrade.sql +++ b/legacy/application/controllers/upgrade_sql/airtime_2.5.15/upgrade.sql @@ -1 +1 @@ -ALTER TABLE third_party_track_references ALTER COLUMN file_id DROP NOT NULL; \ No newline at end of file +ALTER TABLE third_party_track_references ALTER COLUMN file_id DROP NOT NULL; diff --git a/legacy/application/controllers/upgrade_sql/airtime_2.5.17/upgrade.sql b/legacy/application/controllers/upgrade_sql/airtime_2.5.17/upgrade.sql index 3d92007aa..09a7a75f0 100644 --- a/legacy/application/controllers/upgrade_sql/airtime_2.5.17/upgrade.sql +++ b/legacy/application/controllers/upgrade_sql/airtime_2.5.17/upgrade.sql @@ -1 +1 @@ -ALTER TABLE cc_files ADD COLUMN artwork TYPE character varying(255); \ No newline at end of file +ALTER TABLE cc_files ADD COLUMN artwork TYPE character varying(255); diff --git a/legacy/application/controllers/upgrade_sql/airtime_2.5.9/upgrade.sql b/legacy/application/controllers/upgrade_sql/airtime_2.5.9/upgrade.sql index 4e35466f6..3e6011851 100644 --- a/legacy/application/controllers/upgrade_sql/airtime_2.5.9/upgrade.sql +++ b/legacy/application/controllers/upgrade_sql/airtime_2.5.9/upgrade.sql @@ -8,4 +8,4 @@ CREATE TABLE cloud_file CONSTRAINT "cloud_file_FK_1" FOREIGN KEY (cc_file_id) REFERENCES cc_files (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE -) \ No newline at end of file +) diff --git a/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql b/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql index 2615a0f92..8777f59c8 100644 --- a/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql +++ b/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql @@ -1,3 +1,2 @@ ALTER TABLE podcast_episodes ADD COLUMN episode_title VARCHAR(4096); ALTER TABLE podcast_episodes ADD COLUMN episode_description VARCHAR(4096); - diff --git a/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.2/upgrade.sql b/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.2/upgrade.sql index 67c5e5ca3..682e94314 100644 --- a/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.2/upgrade.sql +++ b/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.2/upgrade.sql @@ -23,4 +23,3 @@ INSERT INTO cc_track_types VALUES (9, 'NWS', 'News', 'This is used for noteworth INSERT INTO cc_track_types VALUES (10, 'COM', 'Commercial', 'This is used for commerical advertising.', true); INSERT INTO cc_track_types VALUES (11, 'ITV', 'Interview', 'This is used for radio interviews', true); INSERT INTO cc_track_types VALUES (12, 'VTR', 'Voice Tracking', 'Also referred as robojock or taped. Make announcements without actually being in the station.', true); - diff --git a/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.4/upgrade.sql b/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.4/upgrade.sql index f1816ea33..4569697ba 100644 --- a/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.4/upgrade.sql +++ b/legacy/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9.4/upgrade.sql @@ -2,4 +2,4 @@ ALTER TABLE cc_files DROP COLUMN soundcloud_id; ALTER TABLE cc_files DROP COLUMN soundcloud_error_code; ALTER TABLE cc_files DROP COLUMN soundcloud_error_msg; ALTER TABLE cc_files DROP COLUMN soundcloud_link_to_file; -ALTER TABLE cc_files DROP COLUMN soundcloud_upload_time; \ No newline at end of file +ALTER TABLE cc_files DROP COLUMN soundcloud_upload_time; diff --git a/legacy/application/layouts/scripts/layout.phtml b/legacy/application/layouts/scripts/layout.phtml index 9120d99e4..12f3c3eeb 100644 --- a/legacy/application/layouts/scripts/layout.phtml +++ b/legacy/application/layouts/scripts/layout.phtml @@ -207,4 +207,3 @@ - diff --git a/legacy/application/layouts/scripts/livestream.phtml b/legacy/application/layouts/scripts/livestream.phtml index d4f5bbe89..76bde004a 100644 --- a/legacy/application/layouts/scripts/livestream.phtml +++ b/legacy/application/layouts/scripts/livestream.phtml @@ -5,7 +5,7 @@ - + <?php echo _("Live stream") ?> headLink() ?> headScript() ?> diff --git a/legacy/application/layouts/scripts/login.phtml b/legacy/application/layouts/scripts/login.phtml index 7ece3d12a..b1c4fca10 100644 --- a/legacy/application/layouts/scripts/login.phtml +++ b/legacy/application/layouts/scripts/login.phtml @@ -12,21 +12,21 @@ layout()->content ?>
- " - . LICENSE_VERSION + $licenseSiteAnchor = "" + . LICENSE_VERSION . ""; $companySiteAnchor = "" . $company . ""; echo sprintf(_('%1$s copyright © %2$s All rights reserved.
' - . 'Maintained and distributed under the %3$s by %4$s'), + . 'Maintained and distributed under the %3$s by %4$s'), PRODUCT_NAME, $company, $licenseSiteAnchor, $companySiteAnchor); - ?> + ?>
- + diff --git a/legacy/application/models/ListenerStat.php b/legacy/application/models/ListenerStat.php index f6fdbe54d..1624d396a 100644 --- a/legacy/application/models/ListenerStat.php +++ b/legacy/application/models/ListenerStat.php @@ -92,7 +92,7 @@ SQL; // this query selects all show instances that aired in this date range that match the show_id $sql = <<<'SQL' -SELECT id, starts, ends FROM cc_show_instances WHERE show_id =:p1 +SELECT id, starts, ends FROM cc_show_instances WHERE show_id =:p1 AND starts >=:p2 AND ends <=:p3 SQL; $data = Application_Common_Database::prepareAndExecute( @@ -134,7 +134,7 @@ SQL; // this query selects the id of all show instances that aired in this date range $all_show_data = []; $sql = <<<'SQL' -SELECT show_id FROM cc_show_instances +SELECT show_id FROM cc_show_instances WHERE starts >=:p1 AND ends <=:p2 GROUP BY show_id SQL; diff --git a/legacy/application/models/airtime/map/CcSectionTableMap.php b/legacy/application/models/airtime/map/CcSectionTableMap.php index 3fb493083..ce7210f73 100644 --- a/legacy/application/models/airtime/map/CcSectionTableMap.php +++ b/legacy/application/models/airtime/map/CcSectionTableMap.php @@ -61,9 +61,9 @@ class CcSectionTableMap extends TableMap { } // buildRelations() /** - * + * * Gets the list of behaviors registered for this table - * + * * @return array Associative array (name => parameters) of behaviors */ public function getBehaviors() diff --git a/legacy/application/models/airtime/map/CcSectioncontentsTableMap.php b/legacy/application/models/airtime/map/CcSectioncontentsTableMap.php index 1d4382091..6eebccac3 100644 --- a/legacy/application/models/airtime/map/CcSectioncontentsTableMap.php +++ b/legacy/application/models/airtime/map/CcSectioncontentsTableMap.php @@ -60,9 +60,9 @@ class CcSectioncontentsTableMap extends TableMap { } // buildRelations() /** - * + * * Gets the list of behaviors registered for this table - * + * * @return array Associative array (name => parameters) of behaviors */ public function getBehaviors() diff --git a/legacy/application/models/airtime/om/BaseCcAccess.php b/legacy/application/models/airtime/om/BaseCcAccess.php index 8f2de9dca..e635ff525 100644 --- a/legacy/application/models/airtime/om/BaseCcAccess.php +++ b/legacy/application/models/airtime/om/BaseCcAccess.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_access' table. * - * + * * * @package propel.generator.airtime.om */ @@ -125,7 +125,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [id] column value. - * + * * @return int */ public function getId() @@ -135,7 +135,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [gunid] column value. - * + * * @return string */ public function getGunid() @@ -145,7 +145,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [token] column value. - * + * * @return string */ public function getToken() @@ -155,7 +155,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [chsum] column value. - * + * * @return string */ public function getChsum() @@ -165,7 +165,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [ext] column value. - * + * * @return string */ public function getExt() @@ -175,7 +175,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [type] column value. - * + * * @return string */ public function getType() @@ -185,7 +185,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [parent] column value. - * + * * @return string */ public function getParent() @@ -195,7 +195,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [owner] column value. - * + * * @return int */ public function getOwner() @@ -205,7 +205,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Get the [optionally formatted] temporal [ts] column value. - * + * * * @param string $format The date/time format string (either date()-style or strftime()-style). * If format is NULL, then the raw DateTime object will be returned. @@ -238,7 +238,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [id] column. - * + * * @param int $v new value * @return CcAccess The current object (for fluent API support) */ @@ -258,7 +258,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [gunid] column. - * + * * @param string $v new value * @return CcAccess The current object (for fluent API support) */ @@ -278,7 +278,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [token] column. - * + * * @param string $v new value * @return CcAccess The current object (for fluent API support) */ @@ -298,7 +298,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [chsum] column. - * + * * @param string $v new value * @return CcAccess The current object (for fluent API support) */ @@ -318,7 +318,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [ext] column. - * + * * @param string $v new value * @return CcAccess The current object (for fluent API support) */ @@ -338,7 +338,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [type] column. - * + * * @param string $v new value * @return CcAccess The current object (for fluent API support) */ @@ -358,7 +358,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [parent] column. - * + * * @param string $v new value * @return CcAccess The current object (for fluent API support) */ @@ -378,7 +378,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Set the value of [owner] column. - * + * * @param int $v new value * @return CcAccess The current object (for fluent API support) */ @@ -402,7 +402,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent /** * Sets the value of [ts] column to a normalized version of the date/time value specified. - * + * * @param mixed $v string, integer (timestamp), or DateTime value. Empty string will * be treated as NULL for temporal objects. * @return CcAccess The current object (for fluent API support) @@ -438,7 +438,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent $currNorm = ($this->ts !== null && $tmpDt = new DateTime($this->ts)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; - if ( ($currNorm !== $newNorm) // normalized values don't match + if ( ($currNorm !== $newNorm) // normalized values don't match ) { $this->ts = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); @@ -597,7 +597,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcAccessPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -639,7 +639,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcAccessPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -877,7 +877,7 @@ abstract class BaseCcAccess extends BaseObject implements Persistent * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. diff --git a/legacy/application/models/airtime/om/BaseCcAccessPeer.php b/legacy/application/models/airtime/om/BaseCcAccessPeer.php index c14312b14..64bf375dd 100644 --- a/legacy/application/models/airtime/om/BaseCcAccessPeer.php +++ b/legacy/application/models/airtime/om/BaseCcAccessPeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_access' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcAccessPeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcAccessTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 9; @@ -361,7 +361,7 @@ abstract class BaseCcAccessPeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -371,7 +371,7 @@ abstract class BaseCcAccessPeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_access * by a foreign key with ON DELETE CASCADE @@ -400,7 +400,7 @@ abstract class BaseCcAccessPeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -412,7 +412,7 @@ abstract class BaseCcAccessPeer { { return (int) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -423,7 +423,7 @@ abstract class BaseCcAccessPeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcAccessPeer::getOMClass(false); // populate the object(s) @@ -496,9 +496,9 @@ abstract class BaseCcAccessPeer { if (!$criteria->hasSelectClause()) { CcAccessPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -612,9 +612,9 @@ abstract class BaseCcAccessPeer { if (!$criteria->hasSelectClause()) { CcAccessPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -901,7 +901,7 @@ abstract class BaseCcAccessPeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcAccessPeer::clearRelatedInstancePool(); $con->commit(); @@ -1005,4 +1005,3 @@ abstract class BaseCcAccessPeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcAccessPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcAccessQuery.php b/legacy/application/models/airtime/om/BaseCcAccessQuery.php index 652550f18..bea95dc8e 100644 --- a/legacy/application/models/airtime/om/BaseCcAccessQuery.php +++ b/legacy/application/models/airtime/om/BaseCcAccessQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_access' table. * - * + * * * @method CcAccessQuery orderById($order = Criteria::ASC) Order by the id column * @method CcAccessQuery orderByGunid($order = Criteria::ASC) Order by the gunid column @@ -134,7 +134,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -167,7 +167,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the id column - * + * * @param int|array $id The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -184,7 +184,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the gunid column - * + * * @param string $gunid The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -206,7 +206,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the token column - * + * * @param string|array $token The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -237,7 +237,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the chsum column - * + * * @param string $chsum The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -259,7 +259,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the ext column - * + * * @param string $ext The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -281,7 +281,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the type column - * + * * @param string $type The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -303,7 +303,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the parent column - * + * * @param string|array $parent The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -334,7 +334,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the owner column - * + * * @param int|array $owner The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -365,7 +365,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Filter the query on the ts column - * + * * @param string|array $ts The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -410,7 +410,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcSubjs relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -420,7 +420,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcSubjs'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -428,7 +428,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -436,7 +436,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcSubjs'); } - + return $this; } @@ -444,7 +444,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria * Use the CcSubjs relation CcSubjs object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -470,7 +470,7 @@ abstract class BaseCcAccessQuery extends ModelCriteria if ($ccAccess) { $this->addUsingAlias(CcAccessPeer::ID, $ccAccess->getId(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcBackup.php b/legacy/application/models/airtime/om/BaseCcBackup.php index 41be024bb..76d3744f5 100644 --- a/legacy/application/models/airtime/om/BaseCcBackup.php +++ b/legacy/application/models/airtime/om/BaseCcBackup.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_backup' table. * - * + * * * @package propel.generator.airtime.om */ @@ -70,7 +70,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Get the [token] column value. - * + * * @return string */ public function getToken() @@ -80,7 +80,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Get the [sessionid] column value. - * + * * @return string */ public function getSessionid() @@ -90,7 +90,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Get the [status] column value. - * + * * @return string */ public function getStatus() @@ -100,7 +100,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Get the [optionally formatted] temporal [fromtime] column value. - * + * * * @param string $format The date/time format string (either date()-style or strftime()-style). * If format is NULL, then the raw DateTime object will be returned. @@ -133,7 +133,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Get the [optionally formatted] temporal [totime] column value. - * + * * * @param string $format The date/time format string (either date()-style or strftime()-style). * If format is NULL, then the raw DateTime object will be returned. @@ -166,7 +166,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Set the value of [token] column. - * + * * @param string $v new value * @return CcBackup The current object (for fluent API support) */ @@ -186,7 +186,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Set the value of [sessionid] column. - * + * * @param string $v new value * @return CcBackup The current object (for fluent API support) */ @@ -206,7 +206,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Set the value of [status] column. - * + * * @param string $v new value * @return CcBackup The current object (for fluent API support) */ @@ -226,7 +226,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Sets the value of [fromtime] column to a normalized version of the date/time value specified. - * + * * @param mixed $v string, integer (timestamp), or DateTime value. Empty string will * be treated as NULL for temporal objects. * @return CcBackup The current object (for fluent API support) @@ -262,7 +262,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent $currNorm = ($this->fromtime !== null && $tmpDt = new DateTime($this->fromtime)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; - if ( ($currNorm !== $newNorm) // normalized values don't match + if ( ($currNorm !== $newNorm) // normalized values don't match ) { $this->fromtime = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); @@ -275,7 +275,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent /** * Sets the value of [totime] column to a normalized version of the date/time value specified. - * + * * @param mixed $v string, integer (timestamp), or DateTime value. Empty string will * be treated as NULL for temporal objects. * @return CcBackup The current object (for fluent API support) @@ -311,7 +311,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent $currNorm = ($this->totime !== null && $tmpDt = new DateTime($this->totime)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; - if ( ($currNorm !== $newNorm) // normalized values don't match + if ( ($currNorm !== $newNorm) // normalized values don't match ) { $this->totime = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); @@ -450,7 +450,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcBackupPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -492,7 +492,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcBackupPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -686,7 +686,7 @@ abstract class BaseCcBackup extends BaseObject implements Persistent * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * diff --git a/legacy/application/models/airtime/om/BaseCcBackupPeer.php b/legacy/application/models/airtime/om/BaseCcBackupPeer.php index 304acc302..bba7c0150 100644 --- a/legacy/application/models/airtime/om/BaseCcBackupPeer.php +++ b/legacy/application/models/airtime/om/BaseCcBackupPeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_backup' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcBackupPeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcBackupTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 5; @@ -341,7 +341,7 @@ abstract class BaseCcBackupPeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -351,7 +351,7 @@ abstract class BaseCcBackupPeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_backup * by a foreign key with ON DELETE CASCADE @@ -380,7 +380,7 @@ abstract class BaseCcBackupPeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -392,7 +392,7 @@ abstract class BaseCcBackupPeer { { return (string) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -403,7 +403,7 @@ abstract class BaseCcBackupPeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcBackupPeer::getOMClass(false); // populate the object(s) @@ -643,7 +643,7 @@ abstract class BaseCcBackupPeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcBackupPeer::clearRelatedInstancePool(); $con->commit(); @@ -747,4 +747,3 @@ abstract class BaseCcBackupPeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcBackupPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcBackupQuery.php b/legacy/application/models/airtime/om/BaseCcBackupQuery.php index 2e80333fb..f39e9a499 100644 --- a/legacy/application/models/airtime/om/BaseCcBackupQuery.php +++ b/legacy/application/models/airtime/om/BaseCcBackupQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_backup' table. * - * + * * * @method CcBackupQuery orderByToken($order = Criteria::ASC) Order by the token column * @method CcBackupQuery orderBySessionid($order = Criteria::ASC) Order by the sessionid column @@ -114,7 +114,7 @@ abstract class BaseCcBackupQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -147,7 +147,7 @@ abstract class BaseCcBackupQuery extends ModelCriteria /** * Filter the query on the token column - * + * * @param string $token The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -169,7 +169,7 @@ abstract class BaseCcBackupQuery extends ModelCriteria /** * Filter the query on the sessionid column - * + * * @param string $sessionid The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -191,7 +191,7 @@ abstract class BaseCcBackupQuery extends ModelCriteria /** * Filter the query on the status column - * + * * @param string $status The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -213,7 +213,7 @@ abstract class BaseCcBackupQuery extends ModelCriteria /** * Filter the query on the fromtime column - * + * * @param string|array $fromtime The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -244,7 +244,7 @@ abstract class BaseCcBackupQuery extends ModelCriteria /** * Filter the query on the totime column - * + * * @param string|array $totime The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -285,7 +285,7 @@ abstract class BaseCcBackupQuery extends ModelCriteria if ($ccBackup) { $this->addUsingAlias(CcBackupPeer::TOKEN, $ccBackup->getToken(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcBlockPeer.php b/legacy/application/models/airtime/om/BaseCcBlockPeer.php index 403a64747..033dd521b 100644 --- a/legacy/application/models/airtime/om/BaseCcBlockPeer.php +++ b/legacy/application/models/airtime/om/BaseCcBlockPeer.php @@ -1035,4 +1035,3 @@ abstract class BaseCcBlockPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcBlockPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcBlockcontentsPeer.php b/legacy/application/models/airtime/om/BaseCcBlockcontentsPeer.php index e3917377c..f7caa832d 100644 --- a/legacy/application/models/airtime/om/BaseCcBlockcontentsPeer.php +++ b/legacy/application/models/airtime/om/BaseCcBlockcontentsPeer.php @@ -1429,4 +1429,3 @@ abstract class BaseCcBlockcontentsPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcBlockcontentsPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcBlockcriteriaPeer.php b/legacy/application/models/airtime/om/BaseCcBlockcriteriaPeer.php index 27dd9ac29..6d4ca4108 100644 --- a/legacy/application/models/airtime/om/BaseCcBlockcriteriaPeer.php +++ b/legacy/application/models/airtime/om/BaseCcBlockcriteriaPeer.php @@ -1021,4 +1021,3 @@ abstract class BaseCcBlockcriteriaPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcBlockcriteriaPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcCountryPeer.php b/legacy/application/models/airtime/om/BaseCcCountryPeer.php index 2970e29e0..30ab1d6c3 100644 --- a/legacy/application/models/airtime/om/BaseCcCountryPeer.php +++ b/legacy/application/models/airtime/om/BaseCcCountryPeer.php @@ -754,4 +754,3 @@ abstract class BaseCcCountryPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcCountryPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcFileTag.php b/legacy/application/models/airtime/om/BaseCcFileTag.php index eea6b63e0..c3c0cd596 100644 --- a/legacy/application/models/airtime/om/BaseCcFileTag.php +++ b/legacy/application/models/airtime/om/BaseCcFileTag.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_file_tag' table. * - * + * * * @package propel.generator.airtime.om */ @@ -68,7 +68,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent /** * Get the [id] column value. - * + * * @return int */ public function getDbId() @@ -78,7 +78,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent /** * Get the [file_id] column value. - * + * * @return int */ public function getDbFileId() @@ -88,7 +88,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent /** * Get the [tag_id] column value. - * + * * @return int */ public function getDbTagId() @@ -98,7 +98,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent /** * Set the value of [id] column. - * + * * @param int $v new value * @return CcFileTag The current object (for fluent API support) */ @@ -118,7 +118,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent /** * Set the value of [file_id] column. - * + * * @param int $v new value * @return CcFileTag The current object (for fluent API support) */ @@ -142,7 +142,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent /** * Set the value of [tag_id] column. - * + * * @param int $v new value * @return CcFileTag The current object (for fluent API support) */ @@ -298,7 +298,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcFileTagPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -340,7 +340,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcFileTagPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -573,7 +573,7 @@ abstract class BaseCcFileTag extends BaseObject implements Persistent * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. diff --git a/legacy/application/models/airtime/om/BaseCcFileTagPeer.php b/legacy/application/models/airtime/om/BaseCcFileTagPeer.php index e4454a44f..eba4cfdcb 100644 --- a/legacy/application/models/airtime/om/BaseCcFileTagPeer.php +++ b/legacy/application/models/airtime/om/BaseCcFileTagPeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_file_tag' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcFileTagPeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcFileTagTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 3; @@ -331,7 +331,7 @@ abstract class BaseCcFileTagPeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -341,7 +341,7 @@ abstract class BaseCcFileTagPeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_file_tag * by a foreign key with ON DELETE CASCADE @@ -370,7 +370,7 @@ abstract class BaseCcFileTagPeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -382,7 +382,7 @@ abstract class BaseCcFileTagPeer { { return (int) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -393,7 +393,7 @@ abstract class BaseCcFileTagPeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcFileTagPeer::getOMClass(false); // populate the object(s) @@ -466,9 +466,9 @@ abstract class BaseCcFileTagPeer { if (!$criteria->hasSelectClause()) { CcFileTagPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -516,9 +516,9 @@ abstract class BaseCcFileTagPeer { if (!$criteria->hasSelectClause()) { CcFileTagPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -698,9 +698,9 @@ abstract class BaseCcFileTagPeer { if (!$criteria->hasSelectClause()) { CcFileTagPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -833,7 +833,7 @@ abstract class BaseCcFileTagPeer { // it will be impossible for the BasePeer::createSelectSql() method to determine which // tables go into the FROM clause. $criteria->setPrimaryTableName(CcFileTagPeer::TABLE_NAME); - + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->setDistinct(); } @@ -841,16 +841,16 @@ abstract class BaseCcFileTagPeer { if (!$criteria->hasSelectClause()) { CcFileTagPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY should not affect count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); if ($con === null) { $con = Propel::getConnection(CcFileTagPeer::DATABASE_NAME, Propel::CONNECTION_READ); } - + $criteria->addJoin(CcFileTagPeer::TAG_ID, CcTagPeer::ID, $join_behavior); $stmt = BasePeer::doCount($criteria, $con); @@ -883,7 +883,7 @@ abstract class BaseCcFileTagPeer { // it will be impossible for the BasePeer::createSelectSql() method to determine which // tables go into the FROM clause. $criteria->setPrimaryTableName(CcFileTagPeer::TABLE_NAME); - + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->setDistinct(); } @@ -891,16 +891,16 @@ abstract class BaseCcFileTagPeer { if (!$criteria->hasSelectClause()) { CcFileTagPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY should not affect count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); if ($con === null) { $con = Propel::getConnection(CcFileTagPeer::DATABASE_NAME, Propel::CONNECTION_READ); } - + $criteria->addJoin(CcFileTagPeer::FILE_ID, CcFilesPeer::ID, $join_behavior); $stmt = BasePeer::doCount($criteria, $con); @@ -968,7 +968,7 @@ abstract class BaseCcFileTagPeer { if ($key2 !== null) { $obj2 = CcTagPeer::getInstanceFromPool($key2); if (!$obj2) { - + $cls = CcTagPeer::getOMClass(false); $obj2 = new $cls(); @@ -1041,7 +1041,7 @@ abstract class BaseCcFileTagPeer { if ($key2 !== null) { $obj2 = CcFilesPeer::getInstanceFromPool($key2); if (!$obj2) { - + $cls = CcFilesPeer::getOMClass(false); $obj2 = new $cls(); @@ -1258,7 +1258,7 @@ abstract class BaseCcFileTagPeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcFileTagPeer::clearRelatedInstancePool(); $con->commit(); @@ -1362,4 +1362,3 @@ abstract class BaseCcFileTagPeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcFileTagPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcFileTagQuery.php b/legacy/application/models/airtime/om/BaseCcFileTagQuery.php index 991c4e05a..c7cc18e98 100644 --- a/legacy/application/models/airtime/om/BaseCcFileTagQuery.php +++ b/legacy/application/models/airtime/om/BaseCcFileTagQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_file_tag' table. * - * + * * * @method CcFileTagQuery orderByDbId($order = Criteria::ASC) Order by the id column * @method CcFileTagQuery orderByDbFileId($order = Criteria::ASC) Order by the file_id column @@ -114,7 +114,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -147,7 +147,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria /** * Filter the query on the id column - * + * * @param int|array $dbId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -164,7 +164,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria /** * Filter the query on the file_id column - * + * * @param int|array $dbFileId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -195,7 +195,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria /** * Filter the query on the tag_id column - * + * * @param int|array $dbTagId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -240,7 +240,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcFiles relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -250,7 +250,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcFiles'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -258,7 +258,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -266,7 +266,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcFiles'); } - + return $this; } @@ -274,7 +274,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria * Use the CcFiles relation CcFiles object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -304,7 +304,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcTag relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -314,7 +314,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcTag'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -322,7 +322,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -330,7 +330,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcTag'); } - + return $this; } @@ -338,7 +338,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria * Use the CcTag relation CcTag object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -364,7 +364,7 @@ abstract class BaseCcFileTagQuery extends ModelCriteria if ($ccFileTag) { $this->addUsingAlias(CcFileTagPeer::ID, $ccFileTag->getDbId(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcFilesPeer.php b/legacy/application/models/airtime/om/BaseCcFilesPeer.php index 7e103d83b..cce7baef8 100644 --- a/legacy/application/models/airtime/om/BaseCcFilesPeer.php +++ b/legacy/application/models/airtime/om/BaseCcFilesPeer.php @@ -2042,4 +2042,3 @@ abstract class BaseCcFilesPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcFilesPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcListenerCountPeer.php b/legacy/application/models/airtime/om/BaseCcListenerCountPeer.php index 22898a8dd..42a5ebc5a 100644 --- a/legacy/application/models/airtime/om/BaseCcListenerCountPeer.php +++ b/legacy/application/models/airtime/om/BaseCcListenerCountPeer.php @@ -1399,4 +1399,3 @@ abstract class BaseCcListenerCountPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcListenerCountPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcLiveLogPeer.php b/legacy/application/models/airtime/om/BaseCcLiveLogPeer.php index 1d564519d..64b732b8f 100644 --- a/legacy/application/models/airtime/om/BaseCcLiveLogPeer.php +++ b/legacy/application/models/airtime/om/BaseCcLiveLogPeer.php @@ -768,4 +768,3 @@ abstract class BaseCcLiveLogPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcLiveLogPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcLocalePeer.php b/legacy/application/models/airtime/om/BaseCcLocalePeer.php index 73658ced3..c21f7ecab 100644 --- a/legacy/application/models/airtime/om/BaseCcLocalePeer.php +++ b/legacy/application/models/airtime/om/BaseCcLocalePeer.php @@ -763,4 +763,3 @@ abstract class BaseCcLocalePeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcLocalePeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcLoginAttemptsPeer.php b/legacy/application/models/airtime/om/BaseCcLoginAttemptsPeer.php index b9fcca697..55f7be63a 100644 --- a/legacy/application/models/airtime/om/BaseCcLoginAttemptsPeer.php +++ b/legacy/application/models/airtime/om/BaseCcLoginAttemptsPeer.php @@ -754,4 +754,3 @@ abstract class BaseCcLoginAttemptsPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcLoginAttemptsPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcMountNamePeer.php b/legacy/application/models/airtime/om/BaseCcMountNamePeer.php index ebbdb596e..66ef56b3b 100644 --- a/legacy/application/models/airtime/om/BaseCcMountNamePeer.php +++ b/legacy/application/models/airtime/om/BaseCcMountNamePeer.php @@ -761,4 +761,3 @@ abstract class BaseCcMountNamePeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcMountNamePeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcMusicDirsPeer.php b/legacy/application/models/airtime/om/BaseCcMusicDirsPeer.php index 8e4ca38b1..edd85f475 100644 --- a/legacy/application/models/airtime/om/BaseCcMusicDirsPeer.php +++ b/legacy/application/models/airtime/om/BaseCcMusicDirsPeer.php @@ -773,4 +773,3 @@ abstract class BaseCcMusicDirsPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcMusicDirsPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPermsPeer.php b/legacy/application/models/airtime/om/BaseCcPermsPeer.php index ce8abcd4a..3907d15bb 100644 --- a/legacy/application/models/airtime/om/BaseCcPermsPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPermsPeer.php @@ -1007,4 +1007,3 @@ abstract class BaseCcPermsPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPermsPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlaylistPeer.php b/legacy/application/models/airtime/om/BaseCcPlaylistPeer.php index d1482249c..8c7bcb92e 100644 --- a/legacy/application/models/airtime/om/BaseCcPlaylistPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlaylistPeer.php @@ -1027,4 +1027,3 @@ abstract class BaseCcPlaylistPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlaylistPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlaylistcontentsPeer.php b/legacy/application/models/airtime/om/BaseCcPlaylistcontentsPeer.php index 5f55d962f..097580054 100644 --- a/legacy/application/models/airtime/om/BaseCcPlaylistcontentsPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlaylistcontentsPeer.php @@ -1790,4 +1790,3 @@ abstract class BaseCcPlaylistcontentsPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlaylistcontentsPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlaylistcriteria.php b/legacy/application/models/airtime/om/BaseCcPlaylistcriteria.php index 52359cc90..6ee4ee1a0 100644 --- a/legacy/application/models/airtime/om/BaseCcPlaylistcriteria.php +++ b/legacy/application/models/airtime/om/BaseCcPlaylistcriteria.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_playlistcriteria' table. * - * + * * * @package propel.generator.airtime.om */ @@ -87,7 +87,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Get the [id] column value. - * + * * @return int */ public function getDbId() @@ -97,7 +97,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Get the [criteria] column value. - * + * * @return string */ public function getDbCriteria() @@ -107,7 +107,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Get the [modifier] column value. - * + * * @return string */ public function getDbModifier() @@ -117,7 +117,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Get the [value] column value. - * + * * @return string */ public function getDbValue() @@ -127,7 +127,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Get the [extra] column value. - * + * * @return string */ public function getDbExtra() @@ -137,7 +137,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Get the [playlist_id] column value. - * + * * @return int */ public function getDbPlaylistId() @@ -147,7 +147,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Get the [set_number] column value. - * + * * @return int */ public function getDbSetNumber() @@ -157,7 +157,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Set the value of [id] column. - * + * * @param int $v new value * @return CcPlaylistcriteria The current object (for fluent API support) */ @@ -177,7 +177,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Set the value of [criteria] column. - * + * * @param string $v new value * @return CcPlaylistcriteria The current object (for fluent API support) */ @@ -197,7 +197,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Set the value of [modifier] column. - * + * * @param string $v new value * @return CcPlaylistcriteria The current object (for fluent API support) */ @@ -217,7 +217,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Set the value of [value] column. - * + * * @param string $v new value * @return CcPlaylistcriteria The current object (for fluent API support) */ @@ -237,7 +237,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Set the value of [extra] column. - * + * * @param string $v new value * @return CcPlaylistcriteria The current object (for fluent API support) */ @@ -257,7 +257,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Set the value of [playlist_id] column. - * + * * @param int $v new value * @return CcPlaylistcriteria The current object (for fluent API support) */ @@ -281,7 +281,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent /** * Set the value of [set_number] column. - * + * * @param int $v new value * @return CcPlaylistcriteria The current object (for fluent API support) */ @@ -433,7 +433,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcPlaylistcriteriaPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -475,7 +475,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcPlaylistcriteriaPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -707,7 +707,7 @@ abstract class BaseCcPlaylistcriteria extends BaseObject implements Persistent * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. diff --git a/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaPeer.php b/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaPeer.php index 8ab217965..0fcdd6ccc 100644 --- a/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaPeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_playlistcriteria' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcPlaylistcriteriaPeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcPlaylistcriteriaTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 7; @@ -351,7 +351,7 @@ abstract class BaseCcPlaylistcriteriaPeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -361,7 +361,7 @@ abstract class BaseCcPlaylistcriteriaPeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_playlistcriteria * by a foreign key with ON DELETE CASCADE @@ -390,7 +390,7 @@ abstract class BaseCcPlaylistcriteriaPeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -402,7 +402,7 @@ abstract class BaseCcPlaylistcriteriaPeer { { return (int) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -413,7 +413,7 @@ abstract class BaseCcPlaylistcriteriaPeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcPlaylistcriteriaPeer::getOMClass(false); // populate the object(s) @@ -486,9 +486,9 @@ abstract class BaseCcPlaylistcriteriaPeer { if (!$criteria->hasSelectClause()) { CcPlaylistcriteriaPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -602,9 +602,9 @@ abstract class BaseCcPlaylistcriteriaPeer { if (!$criteria->hasSelectClause()) { CcPlaylistcriteriaPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -891,7 +891,7 @@ abstract class BaseCcPlaylistcriteriaPeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcPlaylistcriteriaPeer::clearRelatedInstancePool(); $con->commit(); @@ -995,4 +995,3 @@ abstract class BaseCcPlaylistcriteriaPeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlaylistcriteriaPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaQuery.php b/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaQuery.php index 42cd8ecbd..e47118ce8 100644 --- a/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaQuery.php +++ b/legacy/application/models/airtime/om/BaseCcPlaylistcriteriaQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_playlistcriteria' table. * - * + * * * @method CcPlaylistcriteriaQuery orderByDbId($order = Criteria::ASC) Order by the id column * @method CcPlaylistcriteriaQuery orderByDbCriteria($order = Criteria::ASC) Order by the criteria column @@ -126,7 +126,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -159,7 +159,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Filter the query on the id column - * + * * @param int|array $dbId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -176,7 +176,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Filter the query on the criteria column - * + * * @param string $dbCriteria The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -198,7 +198,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Filter the query on the modifier column - * + * * @param string $dbModifier The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -220,7 +220,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Filter the query on the value column - * + * * @param string $dbValue The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -242,7 +242,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Filter the query on the extra column - * + * * @param string $dbExtra The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -264,7 +264,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Filter the query on the playlist_id column - * + * * @param int|array $dbPlaylistId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -295,7 +295,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Filter the query on the set_number column - * + * * @param int|array $dbSetNumber The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -340,7 +340,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcPlaylist relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -350,7 +350,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcPlaylist'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -358,7 +358,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -366,7 +366,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcPlaylist'); } - + return $this; } @@ -374,7 +374,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria * Use the CcPlaylist relation CcPlaylist object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -400,7 +400,7 @@ abstract class BaseCcPlaylistcriteriaQuery extends ModelCriteria if ($ccPlaylistcriteria) { $this->addUsingAlias(CcPlaylistcriteriaPeer::ID, $ccPlaylistcriteria->getDbId(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaDataPeer.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaDataPeer.php index f4d8560f8..4ec29fd3c 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaDataPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryMetaDataPeer.php @@ -1006,4 +1006,3 @@ abstract class BaseCcPlayoutHistoryMetaDataPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlayoutHistoryMetaDataPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryPeer.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryPeer.php index 7ff20cbce..511a58f17 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryPeer.php @@ -1407,4 +1407,3 @@ abstract class BaseCcPlayoutHistoryPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlayoutHistoryPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateFieldPeer.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateFieldPeer.php index cd33ca808..07a45c6d3 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateFieldPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateFieldPeer.php @@ -1021,4 +1021,3 @@ abstract class BaseCcPlayoutHistoryTemplateFieldPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlayoutHistoryTemplateFieldPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php index 89c7cdc9d..13aaeb6d9 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php @@ -766,4 +766,3 @@ abstract class BaseCcPlayoutHistoryTemplatePeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlayoutHistoryTemplatePeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTag.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTag.php index bd2530992..7e0a2d46c 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTag.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTag.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_playout_history_template_field' table. * - * + * * * @package propel.generator.airtime.om */ @@ -103,7 +103,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Get the [id] column value. - * + * * @return int */ public function getDbId() @@ -113,7 +113,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Get the [template_id] column value. - * + * * @return int */ public function getDbTemplateId() @@ -123,7 +123,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Get the [name] column value. - * + * * @return string */ public function getDbName() @@ -133,7 +133,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Get the [type] column value. - * + * * @return string */ public function getDbType() @@ -143,7 +143,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Get the [is_file_md] column value. - * + * * @return boolean */ public function getDbIsFileMD() @@ -153,7 +153,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Get the [position] column value. - * + * * @return int */ public function getDbTagPosition() @@ -163,7 +163,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Set the value of [id] column. - * + * * @param int $v new value * @return CcPlayoutHistoryTemplateTag The current object (for fluent API support) */ @@ -183,7 +183,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Set the value of [template_id] column. - * + * * @param int $v new value * @return CcPlayoutHistoryTemplateTag The current object (for fluent API support) */ @@ -207,7 +207,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Set the value of [name] column. - * + * * @param string $v new value * @return CcPlayoutHistoryTemplateTag The current object (for fluent API support) */ @@ -227,7 +227,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Set the value of [type] column. - * + * * @param string $v new value * @return CcPlayoutHistoryTemplateTag The current object (for fluent API support) */ @@ -247,7 +247,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Set the value of [is_file_md] column. - * + * * @param boolean $v new value * @return CcPlayoutHistoryTemplateTag The current object (for fluent API support) */ @@ -267,7 +267,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe /** * Set the value of [position] column. - * + * * @param int $v new value * @return CcPlayoutHistoryTemplateTag The current object (for fluent API support) */ @@ -422,7 +422,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe if ($con === null) { $con = Propel::getConnection(CcPlayoutHistoryTemplateTagPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -464,7 +464,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe if ($con === null) { $con = Propel::getConnection(CcPlayoutHistoryTemplateTagPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -693,7 +693,7 @@ abstract class BaseCcPlayoutHistoryTemplateTag extends BaseObject implements Pe * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagPeer.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagPeer.php index 617bcf2dc..b21bd3e99 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagPeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_playout_history_template_field' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcPlayoutHistoryTemplateTagTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 6; @@ -346,7 +346,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -356,7 +356,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_playout_history_template_field * by a foreign key with ON DELETE CASCADE @@ -385,7 +385,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -397,7 +397,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { { return (int) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -408,7 +408,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcPlayoutHistoryTemplateTagPeer::getOMClass(false); // populate the object(s) @@ -481,9 +481,9 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { if (!$criteria->hasSelectClause()) { CcPlayoutHistoryTemplateTagPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -597,9 +597,9 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { if (!$criteria->hasSelectClause()) { CcPlayoutHistoryTemplateTagPeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -886,7 +886,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcPlayoutHistoryTemplateTagPeer::clearRelatedInstancePool(); $con->commit(); @@ -990,4 +990,3 @@ abstract class BaseCcPlayoutHistoryTemplateTagPeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPlayoutHistoryTemplateTagPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagQuery.php b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagQuery.php index 62b7eff77..0546ad050 100644 --- a/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagQuery.php +++ b/legacy/application/models/airtime/om/BaseCcPlayoutHistoryTemplateTagQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_playout_history_template_field' table. * - * + * * * @method CcPlayoutHistoryTemplateTagQuery orderByDbId($order = Criteria::ASC) Order by the id column * @method CcPlayoutHistoryTemplateTagQuery orderByDbTemplateId($order = Criteria::ASC) Order by the template_id column @@ -122,7 +122,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -155,7 +155,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria /** * Filter the query on the id column - * + * * @param int|array $dbId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -172,7 +172,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria /** * Filter the query on the template_id column - * + * * @param int|array $dbTemplateId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -203,7 +203,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria /** * Filter the query on the name column - * + * * @param string $dbName The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -225,7 +225,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria /** * Filter the query on the type column - * + * * @param string $dbType The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -247,7 +247,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria /** * Filter the query on the is_file_md column - * + * * @param boolean|string $dbIsFileMD The value to use as filter. * Accepts strings ('false', 'off', '-', 'no', 'n', and '0' are false, the rest is true) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -264,7 +264,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria /** * Filter the query on the position column - * + * * @param int|array $dbTagPosition The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -309,7 +309,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcPlayoutHistoryTemplate relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -319,7 +319,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcPlayoutHistoryTemplate'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -327,7 +327,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -335,7 +335,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcPlayoutHistoryTemplate'); } - + return $this; } @@ -343,7 +343,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria * Use the CcPlayoutHistoryTemplate relation CcPlayoutHistoryTemplate object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -369,7 +369,7 @@ abstract class BaseCcPlayoutHistoryTemplateTagQuery extends ModelCriteria if ($ccPlayoutHistoryTemplateTag) { $this->addUsingAlias(CcPlayoutHistoryTemplateTagPeer::ID, $ccPlayoutHistoryTemplateTag->getDbId(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcPrefPeer.php b/legacy/application/models/airtime/om/BaseCcPrefPeer.php index 4dceb1f21..a247ed125 100644 --- a/legacy/application/models/airtime/om/BaseCcPrefPeer.php +++ b/legacy/application/models/airtime/om/BaseCcPrefPeer.php @@ -1006,4 +1006,3 @@ abstract class BaseCcPrefPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcPrefPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcSchedulePeer.php b/legacy/application/models/airtime/om/BaseCcSchedulePeer.php index 981588831..da3f06b98 100644 --- a/legacy/application/models/airtime/om/BaseCcSchedulePeer.php +++ b/legacy/application/models/airtime/om/BaseCcSchedulePeer.php @@ -1803,4 +1803,3 @@ abstract class BaseCcSchedulePeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcSchedulePeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcServiceRegisterPeer.php b/legacy/application/models/airtime/om/BaseCcServiceRegisterPeer.php index 7fd300190..e94950248 100644 --- a/legacy/application/models/airtime/om/BaseCcServiceRegisterPeer.php +++ b/legacy/application/models/airtime/om/BaseCcServiceRegisterPeer.php @@ -754,4 +754,3 @@ abstract class BaseCcServiceRegisterPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcServiceRegisterPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcSessPeer.php b/legacy/application/models/airtime/om/BaseCcSessPeer.php index 219315ed9..2a13ba21e 100644 --- a/legacy/application/models/airtime/om/BaseCcSessPeer.php +++ b/legacy/application/models/airtime/om/BaseCcSessPeer.php @@ -1002,4 +1002,3 @@ abstract class BaseCcSessPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcSessPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcShowDaysPeer.php b/legacy/application/models/airtime/om/BaseCcShowDaysPeer.php index cb76ec2a3..bdcc60309 100644 --- a/legacy/application/models/airtime/om/BaseCcShowDaysPeer.php +++ b/legacy/application/models/airtime/om/BaseCcShowDaysPeer.php @@ -1041,4 +1041,3 @@ abstract class BaseCcShowDaysPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcShowDaysPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcShowHostsPeer.php b/legacy/application/models/airtime/om/BaseCcShowHostsPeer.php index c21c3e985..139506907 100644 --- a/legacy/application/models/airtime/om/BaseCcShowHostsPeer.php +++ b/legacy/application/models/airtime/om/BaseCcShowHostsPeer.php @@ -1394,4 +1394,3 @@ abstract class BaseCcShowHostsPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcShowHostsPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcShowInstancesPeer.php b/legacy/application/models/airtime/om/BaseCcShowInstancesPeer.php index 7b25c5763..b1c52fa39 100644 --- a/legacy/application/models/airtime/om/BaseCcShowInstancesPeer.php +++ b/legacy/application/models/airtime/om/BaseCcShowInstancesPeer.php @@ -1609,4 +1609,3 @@ abstract class BaseCcShowInstancesPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcShowInstancesPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcShowPeer.php b/legacy/application/models/airtime/om/BaseCcShowPeer.php index 1cb49fedb..d34d3f0a2 100644 --- a/legacy/application/models/airtime/om/BaseCcShowPeer.php +++ b/legacy/application/models/airtime/om/BaseCcShowPeer.php @@ -1083,4 +1083,3 @@ abstract class BaseCcShowPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcShowPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcShowRebroadcastPeer.php b/legacy/application/models/airtime/om/BaseCcShowRebroadcastPeer.php index 8f5c1e883..2b61cf731 100644 --- a/legacy/application/models/airtime/om/BaseCcShowRebroadcastPeer.php +++ b/legacy/application/models/airtime/om/BaseCcShowRebroadcastPeer.php @@ -1006,4 +1006,3 @@ abstract class BaseCcShowRebroadcastPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcShowRebroadcastPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcShowSchedule.php b/legacy/application/models/airtime/om/BaseCcShowSchedule.php index bf8b384e6..513bbd402 100644 --- a/legacy/application/models/airtime/om/BaseCcShowSchedule.php +++ b/legacy/application/models/airtime/om/BaseCcShowSchedule.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_show_schedule' table. * - * + * * * @package propel.generator.airtime.om */ @@ -69,7 +69,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Get the [id] column value. - * + * * @return int */ public function getDbId() @@ -79,7 +79,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Get the [instance_id] column value. - * + * * @return int */ public function getDbInstanceId() @@ -89,7 +89,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Get the [position] column value. - * + * * @return int */ public function getDbPosition() @@ -99,7 +99,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Get the [group_id] column value. - * + * * @return int */ public function getDbGroupId() @@ -109,7 +109,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Set the value of [id] column. - * + * * @param int $v new value * @return CcShowSchedule The current object (for fluent API support) */ @@ -129,7 +129,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Set the value of [instance_id] column. - * + * * @param int $v new value * @return CcShowSchedule The current object (for fluent API support) */ @@ -153,7 +153,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Set the value of [position] column. - * + * * @param int $v new value * @return CcShowSchedule The current object (for fluent API support) */ @@ -173,7 +173,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent /** * Set the value of [group_id] column. - * + * * @param int $v new value * @return CcShowSchedule The current object (for fluent API support) */ @@ -322,7 +322,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcShowSchedulePeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -364,7 +364,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcShowSchedulePeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -587,7 +587,7 @@ abstract class BaseCcShowSchedule extends BaseObject implements Persistent * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. diff --git a/legacy/application/models/airtime/om/BaseCcShowSchedulePeer.php b/legacy/application/models/airtime/om/BaseCcShowSchedulePeer.php index 677ff8447..01ba73272 100644 --- a/legacy/application/models/airtime/om/BaseCcShowSchedulePeer.php +++ b/legacy/application/models/airtime/om/BaseCcShowSchedulePeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_show_schedule' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcShowSchedulePeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcShowScheduleTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 4; @@ -336,7 +336,7 @@ abstract class BaseCcShowSchedulePeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -346,7 +346,7 @@ abstract class BaseCcShowSchedulePeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_show_schedule * by a foreign key with ON DELETE CASCADE @@ -375,7 +375,7 @@ abstract class BaseCcShowSchedulePeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -387,7 +387,7 @@ abstract class BaseCcShowSchedulePeer { { return (int) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -398,7 +398,7 @@ abstract class BaseCcShowSchedulePeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcShowSchedulePeer::getOMClass(false); // populate the object(s) @@ -471,9 +471,9 @@ abstract class BaseCcShowSchedulePeer { if (!$criteria->hasSelectClause()) { CcShowSchedulePeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -587,9 +587,9 @@ abstract class BaseCcShowSchedulePeer { if (!$criteria->hasSelectClause()) { CcShowSchedulePeer::addSelectColumns($criteria); } - + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count - + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); @@ -876,7 +876,7 @@ abstract class BaseCcShowSchedulePeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcShowSchedulePeer::clearRelatedInstancePool(); $con->commit(); @@ -980,4 +980,3 @@ abstract class BaseCcShowSchedulePeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcShowSchedulePeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcShowScheduleQuery.php b/legacy/application/models/airtime/om/BaseCcShowScheduleQuery.php index 2cb1b65c8..d0822ebfe 100644 --- a/legacy/application/models/airtime/om/BaseCcShowScheduleQuery.php +++ b/legacy/application/models/airtime/om/BaseCcShowScheduleQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_show_schedule' table. * - * + * * * @method CcShowScheduleQuery orderByDbId($order = Criteria::ASC) Order by the id column * @method CcShowScheduleQuery orderByDbInstanceId($order = Criteria::ASC) Order by the instance_id column @@ -114,7 +114,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -147,7 +147,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria /** * Filter the query on the id column - * + * * @param int|array $dbId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -164,7 +164,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria /** * Filter the query on the instance_id column - * + * * @param int|array $dbInstanceId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -195,7 +195,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria /** * Filter the query on the position column - * + * * @param int|array $dbPosition The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -226,7 +226,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria /** * Filter the query on the group_id column - * + * * @param int|array $dbGroupId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -271,7 +271,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcShowInstances relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -281,7 +281,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcShowInstances'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -289,7 +289,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -297,7 +297,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcShowInstances'); } - + return $this; } @@ -305,7 +305,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria * Use the CcShowInstances relation CcShowInstances object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -331,7 +331,7 @@ abstract class BaseCcShowScheduleQuery extends ModelCriteria if ($ccShowSchedule) { $this->addUsingAlias(CcShowSchedulePeer::ID, $ccShowSchedule->getDbId(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcStreamSettingPeer.php b/legacy/application/models/airtime/om/BaseCcStreamSettingPeer.php index 5fa81eaf3..b869d7dec 100644 --- a/legacy/application/models/airtime/om/BaseCcStreamSettingPeer.php +++ b/legacy/application/models/airtime/om/BaseCcStreamSettingPeer.php @@ -759,4 +759,3 @@ abstract class BaseCcStreamSettingPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcStreamSettingPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcSubjsPeer.php b/legacy/application/models/airtime/om/BaseCcSubjsPeer.php index 2f3d3b502..e6baad439 100644 --- a/legacy/application/models/airtime/om/BaseCcSubjsPeer.php +++ b/legacy/application/models/airtime/om/BaseCcSubjsPeer.php @@ -837,4 +837,3 @@ abstract class BaseCcSubjsPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcSubjsPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcSubjsTokenPeer.php b/legacy/application/models/airtime/om/BaseCcSubjsTokenPeer.php index f8c54b2c0..36e11cbb9 100644 --- a/legacy/application/models/airtime/om/BaseCcSubjsTokenPeer.php +++ b/legacy/application/models/airtime/om/BaseCcSubjsTokenPeer.php @@ -1011,4 +1011,3 @@ abstract class BaseCcSubjsTokenPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcSubjsTokenPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcTag.php b/legacy/application/models/airtime/om/BaseCcTag.php index af656868b..6ef428de5 100644 --- a/legacy/application/models/airtime/om/BaseCcTag.php +++ b/legacy/application/models/airtime/om/BaseCcTag.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_tag' table. * - * + * * * @package propel.generator.airtime.om */ @@ -95,7 +95,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent /** * Get the [id] column value. - * + * * @return int */ public function getDbId() @@ -105,7 +105,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent /** * Get the [tag_name] column value. - * + * * @return string */ public function getDbTagName() @@ -115,7 +115,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent /** * Get the [tag_type] column value. - * + * * @return string */ public function getDbTagType() @@ -125,7 +125,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent /** * Set the value of [id] column. - * + * * @param int $v new value * @return CcTag The current object (for fluent API support) */ @@ -145,7 +145,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent /** * Set the value of [tag_name] column. - * + * * @param string $v new value * @return CcTag The current object (for fluent API support) */ @@ -165,7 +165,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent /** * Set the value of [tag_type] column. - * + * * @param string $v new value * @return CcTag The current object (for fluent API support) */ @@ -319,7 +319,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcTagPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -361,7 +361,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcTagPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -605,7 +605,7 @@ abstract class BaseCcTag extends BaseObject implements Persistent * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * diff --git a/legacy/application/models/airtime/om/BaseCcTagPeer.php b/legacy/application/models/airtime/om/BaseCcTagPeer.php index 6a68b6ede..eff951435 100644 --- a/legacy/application/models/airtime/om/BaseCcTagPeer.php +++ b/legacy/application/models/airtime/om/BaseCcTagPeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_tag' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcTagPeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcTagTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 3; @@ -331,7 +331,7 @@ abstract class BaseCcTagPeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -341,20 +341,20 @@ abstract class BaseCcTagPeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_tag * by a foreign key with ON DELETE CASCADE */ public static function clearRelatedInstancePool() { - // Invalidate objects in CcFileTagPeer instance pool, + // Invalidate objects in CcFileTagPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcFileTagPeer::clearInstancePool(); - // Invalidate objects in CcPlayoutHistoryMetaDataPeer instance pool, + // Invalidate objects in CcPlayoutHistoryMetaDataPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcPlayoutHistoryMetaDataPeer::clearInstancePool(); - // Invalidate objects in CcPlayoutHistoryTemplateTagPeer instance pool, + // Invalidate objects in CcPlayoutHistoryTemplateTagPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcPlayoutHistoryTemplateTagPeer::clearInstancePool(); } @@ -379,7 +379,7 @@ abstract class BaseCcTagPeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -391,7 +391,7 @@ abstract class BaseCcTagPeer { { return (int) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -402,7 +402,7 @@ abstract class BaseCcTagPeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcTagPeer::getOMClass(false); // populate the object(s) @@ -646,7 +646,7 @@ abstract class BaseCcTagPeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcTagPeer::clearRelatedInstancePool(); $con->commit(); @@ -750,4 +750,3 @@ abstract class BaseCcTagPeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcTagPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcTagQuery.php b/legacy/application/models/airtime/om/BaseCcTagQuery.php index c90d8cb09..8b4b78785 100644 --- a/legacy/application/models/airtime/om/BaseCcTagQuery.php +++ b/legacy/application/models/airtime/om/BaseCcTagQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_tag' table. * - * + * * * @method CcTagQuery orderByDbId($order = Criteria::ASC) Order by the id column * @method CcTagQuery orderByDbTagName($order = Criteria::ASC) Order by the tag_name column @@ -118,7 +118,7 @@ abstract class BaseCcTagQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -151,7 +151,7 @@ abstract class BaseCcTagQuery extends ModelCriteria /** * Filter the query on the id column - * + * * @param int|array $dbId The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -168,7 +168,7 @@ abstract class BaseCcTagQuery extends ModelCriteria /** * Filter the query on the tag_name column - * + * * @param string $dbTagName The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -190,7 +190,7 @@ abstract class BaseCcTagQuery extends ModelCriteria /** * Filter the query on the tag_type column - * + * * @param string $dbTagType The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -226,7 +226,7 @@ abstract class BaseCcTagQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcFileTag relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -236,7 +236,7 @@ abstract class BaseCcTagQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcFileTag'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -244,7 +244,7 @@ abstract class BaseCcTagQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -252,7 +252,7 @@ abstract class BaseCcTagQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcFileTag'); } - + return $this; } @@ -260,7 +260,7 @@ abstract class BaseCcTagQuery extends ModelCriteria * Use the CcFileTag relation CcFileTag object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -290,7 +290,7 @@ abstract class BaseCcTagQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcPlayoutHistoryMetaData relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -300,7 +300,7 @@ abstract class BaseCcTagQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcPlayoutHistoryMetaData'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -308,7 +308,7 @@ abstract class BaseCcTagQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -316,7 +316,7 @@ abstract class BaseCcTagQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcPlayoutHistoryMetaData'); } - + return $this; } @@ -324,7 +324,7 @@ abstract class BaseCcTagQuery extends ModelCriteria * Use the CcPlayoutHistoryMetaData relation CcPlayoutHistoryMetaData object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -354,7 +354,7 @@ abstract class BaseCcTagQuery extends ModelCriteria /** * Adds a JOIN clause to the query using the CcPlayoutHistoryTemplateTag relation - * + * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * @@ -364,7 +364,7 @@ abstract class BaseCcTagQuery extends ModelCriteria { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcPlayoutHistoryTemplateTag'); - + // create a ModelJoin object for this join $join = new ModelJoin(); $join->setJoinType($joinType); @@ -372,7 +372,7 @@ abstract class BaseCcTagQuery extends ModelCriteria if ($previousJoin = $this->getPreviousJoin()) { $join->setPreviousJoin($previousJoin); } - + // add the ModelJoin to the current object if($relationAlias) { $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); @@ -380,7 +380,7 @@ abstract class BaseCcTagQuery extends ModelCriteria } else { $this->addJoinObject($join, 'CcPlayoutHistoryTemplateTag'); } - + return $this; } @@ -388,7 +388,7 @@ abstract class BaseCcTagQuery extends ModelCriteria * Use the CcPlayoutHistoryTemplateTag relation CcPlayoutHistoryTemplateTag object * * @see useQuery() - * + * * @param string $relationAlias optional alias for the relation, * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' @@ -414,7 +414,7 @@ abstract class BaseCcTagQuery extends ModelCriteria if ($ccTag) { $this->addUsingAlias(CcTagPeer::ID, $ccTag->getDbId(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcTimestampPeer.php b/legacy/application/models/airtime/om/BaseCcTimestampPeer.php index 961ad255c..e09565840 100644 --- a/legacy/application/models/airtime/om/BaseCcTimestampPeer.php +++ b/legacy/application/models/airtime/om/BaseCcTimestampPeer.php @@ -761,4 +761,3 @@ abstract class BaseCcTimestampPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcTimestampPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php b/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php index 583344f1f..8fc96a88a 100644 --- a/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php +++ b/legacy/application/models/airtime/om/BaseCcTracktypesPeer.php @@ -777,4 +777,3 @@ abstract class BaseCcTracktypesPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcTracktypesPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcTrans.php b/legacy/application/models/airtime/om/BaseCcTrans.php index 2ea4f7c20..1387984a8 100644 --- a/legacy/application/models/airtime/om/BaseCcTrans.php +++ b/legacy/application/models/airtime/om/BaseCcTrans.php @@ -4,7 +4,7 @@ /** * Base class that represents a row from the 'cc_trans' table. * - * + * * * @package propel.generator.airtime.om */ @@ -206,7 +206,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [id] column value. - * + * * @return int */ public function getId() @@ -216,7 +216,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [trtok] column value. - * + * * @return string */ public function getTrtok() @@ -226,7 +226,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [direction] column value. - * + * * @return string */ public function getDirection() @@ -236,7 +236,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [state] column value. - * + * * @return string */ public function getState() @@ -246,7 +246,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [trtype] column value. - * + * * @return string */ public function getTrtype() @@ -256,7 +256,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [lock] column value. - * + * * @return string */ public function getLock() @@ -266,7 +266,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [target] column value. - * + * * @return string */ public function getTarget() @@ -276,7 +276,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [rtrtok] column value. - * + * * @return string */ public function getRtrtok() @@ -286,7 +286,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [mdtrtok] column value. - * + * * @return string */ public function getMdtrtok() @@ -296,7 +296,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [gunid] column value. - * + * * @return string */ public function getGunid() @@ -306,7 +306,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [pdtoken] column value. - * + * * @return string */ public function getPdtoken() @@ -316,7 +316,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [url] column value. - * + * * @return string */ public function getUrl() @@ -326,7 +326,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [localfile] column value. - * + * * @return string */ public function getLocalfile() @@ -336,7 +336,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [fname] column value. - * + * * @return string */ public function getFname() @@ -346,7 +346,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [title] column value. - * + * * @return string */ public function getTitle() @@ -356,7 +356,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [expectedsum] column value. - * + * * @return string */ public function getExpectedsum() @@ -366,7 +366,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [realsum] column value. - * + * * @return string */ public function getRealsum() @@ -376,7 +376,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [expectedsize] column value. - * + * * @return int */ public function getExpectedsize() @@ -386,7 +386,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [realsize] column value. - * + * * @return int */ public function getRealsize() @@ -396,7 +396,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [uid] column value. - * + * * @return int */ public function getUid() @@ -406,7 +406,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [errmsg] column value. - * + * * @return string */ public function getErrmsg() @@ -416,7 +416,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [jobpid] column value. - * + * * @return int */ public function getJobpid() @@ -426,7 +426,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [optionally formatted] temporal [start] column value. - * + * * * @param string $format The date/time format string (either date()-style or strftime()-style). * If format is NULL, then the raw DateTime object will be returned. @@ -459,7 +459,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Get the [optionally formatted] temporal [ts] column value. - * + * * * @param string $format The date/time format string (either date()-style or strftime()-style). * If format is NULL, then the raw DateTime object will be returned. @@ -492,7 +492,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [id] column. - * + * * @param int $v new value * @return CcTrans The current object (for fluent API support) */ @@ -512,7 +512,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [trtok] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -532,7 +532,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [direction] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -552,7 +552,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [state] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -572,7 +572,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [trtype] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -592,7 +592,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [lock] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -612,7 +612,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [target] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -632,7 +632,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [rtrtok] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -652,7 +652,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [mdtrtok] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -672,7 +672,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [gunid] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -692,7 +692,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [pdtoken] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -712,7 +712,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [url] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -732,7 +732,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [localfile] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -752,7 +752,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [fname] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -772,7 +772,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [title] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -792,7 +792,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [expectedsum] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -812,7 +812,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [realsum] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -832,7 +832,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [expectedsize] column. - * + * * @param int $v new value * @return CcTrans The current object (for fluent API support) */ @@ -852,7 +852,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [realsize] column. - * + * * @param int $v new value * @return CcTrans The current object (for fluent API support) */ @@ -872,7 +872,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [uid] column. - * + * * @param int $v new value * @return CcTrans The current object (for fluent API support) */ @@ -892,7 +892,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [errmsg] column. - * + * * @param string $v new value * @return CcTrans The current object (for fluent API support) */ @@ -912,7 +912,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Set the value of [jobpid] column. - * + * * @param int $v new value * @return CcTrans The current object (for fluent API support) */ @@ -932,7 +932,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Sets the value of [start] column to a normalized version of the date/time value specified. - * + * * @param mixed $v string, integer (timestamp), or DateTime value. Empty string will * be treated as NULL for temporal objects. * @return CcTrans The current object (for fluent API support) @@ -968,7 +968,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent $currNorm = ($this->start !== null && $tmpDt = new DateTime($this->start)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; - if ( ($currNorm !== $newNorm) // normalized values don't match + if ( ($currNorm !== $newNorm) // normalized values don't match ) { $this->start = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); @@ -981,7 +981,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent /** * Sets the value of [ts] column to a normalized version of the date/time value specified. - * + * * @param mixed $v string, integer (timestamp), or DateTime value. Empty string will * be treated as NULL for temporal objects. * @return CcTrans The current object (for fluent API support) @@ -1017,7 +1017,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent $currNorm = ($this->ts !== null && $tmpDt = new DateTime($this->ts)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; - if ( ($currNorm !== $newNorm) // normalized values don't match + if ( ($currNorm !== $newNorm) // normalized values don't match ) { $this->ts = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); @@ -1179,7 +1179,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcTransPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); try { $ret = $this->preDelete($con); @@ -1221,7 +1221,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent if ($con === null) { $con = Propel::getConnection(CcTransPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); } - + $con->beginTransaction(); $isInsert = $this->isNew(); try { @@ -1480,7 +1480,7 @@ abstract class BaseCcTrans extends BaseObject implements Persistent * type constants. * * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, - * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. * Defaults to BasePeer::TYPE_PHPNAME. * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. * diff --git a/legacy/application/models/airtime/om/BaseCcTransPeer.php b/legacy/application/models/airtime/om/BaseCcTransPeer.php index bac6b9ed8..63c301d8a 100644 --- a/legacy/application/models/airtime/om/BaseCcTransPeer.php +++ b/legacy/application/models/airtime/om/BaseCcTransPeer.php @@ -4,7 +4,7 @@ /** * Base static class for performing query and update operations on the 'cc_trans' table. * - * + * * * @package propel.generator.airtime.om */ @@ -24,7 +24,7 @@ abstract class BaseCcTransPeer { /** the related TableMap class for this table */ const TM_CLASS = 'CcTransTableMap'; - + /** The total number of columns. */ const NUM_COLUMNS = 24; @@ -436,7 +436,7 @@ abstract class BaseCcTransPeer { } return null; // just to be explicit } - + /** * Clear the instance pool. * @@ -446,7 +446,7 @@ abstract class BaseCcTransPeer { { self::$instances = array(); } - + /** * Method to invalidate the instance pool of all tables related to cc_trans * by a foreign key with ON DELETE CASCADE @@ -475,7 +475,7 @@ abstract class BaseCcTransPeer { } /** - * Retrieves the primary key from the DB resultset row + * Retrieves the primary key from the DB resultset row * For tables with a single-column primary key, that simple pkey value will be returned. For tables with * a multi-column primary key, an array of the primary key columns will be returned. * @@ -487,7 +487,7 @@ abstract class BaseCcTransPeer { { return (int) $row[$startcol]; } - + /** * The returned array will contain objects of the default type or * objects that inherit from the default. @@ -498,7 +498,7 @@ abstract class BaseCcTransPeer { public static function populateObjects(PDOStatement $stmt) { $results = array(); - + // set the class once to avoid overhead in the loop $cls = CcTransPeer::getOMClass(false); // populate the object(s) @@ -742,7 +742,7 @@ abstract class BaseCcTransPeer { // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->beginTransaction(); - + $affectedRows += BasePeer::doDelete($criteria, $con); CcTransPeer::clearRelatedInstancePool(); $con->commit(); @@ -846,4 +846,3 @@ abstract class BaseCcTransPeer { // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcTransPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcTransQuery.php b/legacy/application/models/airtime/om/BaseCcTransQuery.php index 0bbccae2f..e506fab4b 100644 --- a/legacy/application/models/airtime/om/BaseCcTransQuery.php +++ b/legacy/application/models/airtime/om/BaseCcTransQuery.php @@ -4,7 +4,7 @@ /** * Base class that represents a query for the 'cc_trans' table. * - * + * * * @method CcTransQuery orderById($order = Criteria::ASC) Order by the id column * @method CcTransQuery orderByTrtok($order = Criteria::ASC) Order by the trtok column @@ -190,7 +190,7 @@ abstract class BaseCcTransQuery extends ModelCriteria * @return PropelObjectCollection|array|mixed the list of results, formatted by the current formatter */ public function findPks($keys, $con = null) - { + { $criteria = $this->isKeepQuery() ? clone $this : $this; return $this ->filterByPrimaryKeys($keys) @@ -223,7 +223,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the id column - * + * * @param int|array $id The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -240,7 +240,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the trtok column - * + * * @param string $trtok The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -262,7 +262,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the direction column - * + * * @param string $direction The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -284,7 +284,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the state column - * + * * @param string $state The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -306,7 +306,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the trtype column - * + * * @param string $trtype The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -328,7 +328,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the lock column - * + * * @param string $lock The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -350,7 +350,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the target column - * + * * @param string $target The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -372,7 +372,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the rtrtok column - * + * * @param string $rtrtok The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -394,7 +394,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the mdtrtok column - * + * * @param string $mdtrtok The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -416,7 +416,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the gunid column - * + * * @param string $gunid The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -438,7 +438,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the pdtoken column - * + * * @param string|array $pdtoken The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -469,7 +469,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the url column - * + * * @param string $url The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -491,7 +491,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the localfile column - * + * * @param string $localfile The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -513,7 +513,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the fname column - * + * * @param string $fname The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -535,7 +535,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the title column - * + * * @param string $title The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -557,7 +557,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the expectedsum column - * + * * @param string $expectedsum The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -579,7 +579,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the realsum column - * + * * @param string $realsum The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -601,7 +601,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the expectedsize column - * + * * @param int|array $expectedsize The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -632,7 +632,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the realsize column - * + * * @param int|array $realsize The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -663,7 +663,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the uid column - * + * * @param int|array $uid The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -694,7 +694,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the errmsg column - * + * * @param string $errmsg The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -716,7 +716,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the jobpid column - * + * * @param int|array $jobpid The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -747,7 +747,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the start column - * + * * @param string|array $start The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -778,7 +778,7 @@ abstract class BaseCcTransQuery extends ModelCriteria /** * Filter the query on the ts column - * + * * @param string|array $ts The value to use as filter. * Accepts an associative array('min' => $minValue, 'max' => $maxValue) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL @@ -819,7 +819,7 @@ abstract class BaseCcTransQuery extends ModelCriteria if ($ccTrans) { $this->addUsingAlias(CcTransPeer::ID, $ccTrans->getId(), Criteria::NOT_EQUAL); } - + return $this; } diff --git a/legacy/application/models/airtime/om/BaseCcWebstreamMetadataPeer.php b/legacy/application/models/airtime/om/BaseCcWebstreamMetadataPeer.php index b34c28fc6..411e1b6f6 100644 --- a/legacy/application/models/airtime/om/BaseCcWebstreamMetadataPeer.php +++ b/legacy/application/models/airtime/om/BaseCcWebstreamMetadataPeer.php @@ -1006,4 +1006,3 @@ abstract class BaseCcWebstreamMetadataPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcWebstreamMetadataPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCcWebstreamPeer.php b/legacy/application/models/airtime/om/BaseCcWebstreamPeer.php index 6c4dedf93..de0f6e0ed 100644 --- a/legacy/application/models/airtime/om/BaseCcWebstreamPeer.php +++ b/legacy/application/models/airtime/om/BaseCcWebstreamPeer.php @@ -801,4 +801,3 @@ abstract class BaseCcWebstreamPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCcWebstreamPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCeleryTasksPeer.php b/legacy/application/models/airtime/om/BaseCeleryTasksPeer.php index b6dff77b4..07b3300ad 100644 --- a/legacy/application/models/airtime/om/BaseCeleryTasksPeer.php +++ b/legacy/application/models/airtime/om/BaseCeleryTasksPeer.php @@ -1016,4 +1016,3 @@ abstract class BaseCeleryTasksPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCeleryTasksPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseCloudFilePeer.php b/legacy/application/models/airtime/om/BaseCloudFilePeer.php index 4a1b641c1..40e4c486a 100644 --- a/legacy/application/models/airtime/om/BaseCloudFilePeer.php +++ b/legacy/application/models/airtime/om/BaseCloudFilePeer.php @@ -1006,4 +1006,3 @@ abstract class BaseCloudFilePeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseCloudFilePeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseImportedPodcastPeer.php b/legacy/application/models/airtime/om/BaseImportedPodcastPeer.php index dc79b2a2b..6119bcff5 100644 --- a/legacy/application/models/airtime/om/BaseImportedPodcastPeer.php +++ b/legacy/application/models/airtime/om/BaseImportedPodcastPeer.php @@ -1011,4 +1011,3 @@ abstract class BaseImportedPodcastPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseImportedPodcastPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BasePodcastEpisodesPeer.php b/legacy/application/models/airtime/om/BasePodcastEpisodesPeer.php index 91fcbeee2..7b7d57a45 100644 --- a/legacy/application/models/airtime/om/BasePodcastEpisodesPeer.php +++ b/legacy/application/models/airtime/om/BasePodcastEpisodesPeer.php @@ -1419,4 +1419,3 @@ abstract class BasePodcastEpisodesPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BasePodcastEpisodesPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BasePodcastPeer.php b/legacy/application/models/airtime/om/BasePodcastPeer.php index 5bf6d4a6b..3a171884d 100644 --- a/legacy/application/models/airtime/om/BasePodcastPeer.php +++ b/legacy/application/models/airtime/om/BasePodcastPeer.php @@ -1070,4 +1070,3 @@ abstract class BasePodcastPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BasePodcastPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseStationPodcastPeer.php b/legacy/application/models/airtime/om/BaseStationPodcastPeer.php index 85adc56ee..6bd2bba27 100644 --- a/legacy/application/models/airtime/om/BaseStationPodcastPeer.php +++ b/legacy/application/models/airtime/om/BaseStationPodcastPeer.php @@ -996,4 +996,3 @@ abstract class BaseStationPodcastPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseStationPodcastPeer::buildTableMap(); - diff --git a/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php b/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php index 38c8ddbd9..8e4616240 100644 --- a/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php +++ b/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php @@ -1019,4 +1019,3 @@ abstract class BaseThirdPartyTrackReferencesPeer // This is the static code needed to register the TableMap for this table with the main Propel class. // BaseThirdPartyTrackReferencesPeer::buildTableMap(); - diff --git a/legacy/application/models/tests/plistEmbedded.xml b/legacy/application/models/tests/plistEmbedded.xml index db9b7ce03..a1af05a3f 100644 --- a/legacy/application/models/tests/plistEmbedded.xml +++ b/legacy/application/models/tests/plistEmbedded.xml @@ -1,8 +1,8 @@ - @@ -23,4 +23,3 @@ 01:30:11.500000 - diff --git a/legacy/application/views/scripts/api/status.phtml b/legacy/application/views/scripts/api/status.phtml index b597b4b71..4d1027337 100644 --- a/legacy/application/views/scripts/api/status.phtml +++ b/legacy/application/views/scripts/api/status.phtml @@ -1,3 +1,3 @@

-" . PRODUCT_NAME @@ -12,7 +12,7 @@ echo sprintf(_('%1$s %2$s, the open radio software for scheduling and remote sta ?>

© -" . COMPANY_NAME . " " . COMPANY_SUFFIX . ""; diff --git a/legacy/application/views/scripts/dashboard/help.phtml b/legacy/application/views/scripts/dashboard/help.phtml index c354eb01d..c2736ed8e 100644 --- a/legacy/application/views/scripts/dashboard/help.phtml +++ b/legacy/application/views/scripts/dashboard/help.phtml @@ -14,12 +14,11 @@


-"; echo sprintf(_("For more detailed help, read the %suser manual%s."), - $userManualAnchorOpen, "") + $userManualAnchorOpen, "") ?>

- diff --git a/legacy/application/views/scripts/dashboard/stream-player.phtml b/legacy/application/views/scripts/dashboard/stream-player.phtml index 4a3e8abc8..3da914a46 100644 --- a/legacy/application/views/scripts/dashboard/stream-player.phtml +++ b/legacy/application/views/scripts/dashboard/stream-player.phtml @@ -1,6 +1,6 @@