~xibo-maintainers/xibo/tuttle

« back to all changes in this revision

Viewing changes to server/lib/pages/index.class.php

Committer: Dan Garner
Date: 2014-10-21 16:07:57 UTC
mfrom: (345.2.61 server-170-alpha2)
Revision ID: dan@xibo.org.uk-20141021160757-vbg562lzvp24dxm4

[cms] Merged lp:~dangarner/xibo/server-170-alpha2

files added:
server/install/database/81.sql

server/lib/app/cache.class.php

server/manual/content/admin/release_notes_1.7.0-alpha2.php

server/modules/3rdparty

server/modules/3rdparty/forecast.php

server/modules/font.module.php

server/modules/forecastio.module.php

server/modules/preview/Html4TransitionalTemplate.html

server/modules/preview/fonts.css

server/modules/preview/vendor/jquery-cycle-2.1.6.min.js

server/modules/preview/vendor/jquery.marquee.min.js

server/modules/preview/xibo-dataset-render.js

server/modules/preview/xibo-layout-scaler.js

server/modules/theme/forecastio

server/modules/theme/forecastio/weather_icons

server/modules/theme/forecastio/weather_icons/WeatherIcons-Regular.otf

server/modules/theme/forecastio/weather_icons/weather-icons.min.css

server/modules/theme/forecastio/weather_icons/weathericons-regular-webfont.eot

server/modules/theme/forecastio/weather_icons/weathericons-regular-webfont.svg

server/modules/theme/forecastio/weather_icons/weathericons-regular-webfont.ttf

server/modules/theme/forecastio/weather_icons/weathericons-regular-webfont.woff

server/theme/default/css/client.css

server/theme/default/html/stats_page_availability.php

server/theme/default/img/forms/weather.png

server/theme/default/libraries/bootstrap-ekko-lightbox

server/theme/default/libraries/bootstrap-ekko-lightbox/ekko-lightbox.min.css

server/theme/default/libraries/bootstrap-ekko-lightbox/ekko-lightbox.min.js

server/theme/default/libraries/calendar/js/language/de.js

server/theme/default/libraries/jquery-message-queuing

server/theme/default/libraries/jquery-message-queuing/jquery.ba-jqmq.min.js

server/theme/default/libraries/jquery-tablesorter

server/theme/default/libraries/jquery-tablesorter/addons

server/theme/default/libraries/jquery-tablesorter/addons/pager

server/theme/default/libraries/jquery-tablesorter/addons/pager/icons

server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/first.png

server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/last.png

server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/loading.gif

server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/next.png

server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/prev.png

server/theme/default/libraries/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css

server/theme/default/libraries/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js

server/theme/default/libraries/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.min.js

server/theme/default/libraries/jquery-tablesorter/css

server/theme/default/libraries/jquery-tablesorter/css/bootstrap.less

server/theme/default/libraries/jquery-tablesorter/css/filter.formatter.css

server/theme/default/libraries/jquery-tablesorter/css/images

server/theme/default/libraries/jquery-tablesorter/css/images/black-asc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/black-desc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/black-unsorted.gif

server/theme/default/libraries/jquery-tablesorter/css/images/bootstrap-black-unsorted.png

server/theme/default/libraries/jquery-tablesorter/css/images/bootstrap-white-unsorted.png

server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-asc-hovered.png

server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-asc.png

server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-desc-hovered.png

server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-desc.png

server/theme/default/libraries/jquery-tablesorter/css/images/green-asc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/green-desc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/green-header.gif

server/theme/default/libraries/jquery-tablesorter/css/images/green-unsorted.gif

server/theme/default/libraries/jquery-tablesorter/css/images/ice-asc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/ice-desc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/ice-unsorted.gif

server/theme/default/libraries/jquery-tablesorter/css/images/metro-black-asc.png

server/theme/default/libraries/jquery-tablesorter/css/images/metro-black-desc.png

server/theme/default/libraries/jquery-tablesorter/css/images/metro-loading.gif

server/theme/default/libraries/jquery-tablesorter/css/images/metro-unsorted.png

server/theme/default/libraries/jquery-tablesorter/css/images/metro-white-asc.png

server/theme/default/libraries/jquery-tablesorter/css/images/metro-white-desc.png

server/theme/default/libraries/jquery-tablesorter/css/images/white-asc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/white-desc.gif

server/theme/default/libraries/jquery-tablesorter/css/images/white-unsorted.gif

server/theme/default/libraries/jquery-tablesorter/css/metro.less

server/theme/default/libraries/jquery-tablesorter/css/theme.black-ice.css

server/theme/default/libraries/jquery-tablesorter/css/theme.blue.css

server/theme/default/libraries/jquery-tablesorter/css/theme.bootstrap.css

server/theme/default/libraries/jquery-tablesorter/css/theme.bootstrap_2.css

server/theme/default/libraries/jquery-tablesorter/css/theme.dark.css

server/theme/default/libraries/jquery-tablesorter/css/theme.default.css

server/theme/default/libraries/jquery-tablesorter/css/theme.dropbox.css

server/theme/default/libraries/jquery-tablesorter/css/theme.green.css

server/theme/default/libraries/jquery-tablesorter/css/theme.grey.css

server/theme/default/libraries/jquery-tablesorter/css/theme.ice.css

server/theme/default/libraries/jquery-tablesorter/css/theme.jui.css

server/theme/default/libraries/jquery-tablesorter/css/theme.less

server/theme/default/libraries/jquery-tablesorter/css/theme.metro-dark.css

server/theme/default/libraries/jquery-tablesorter/js

server/theme/default/libraries/jquery-tablesorter/js/extras

server/theme/default/libraries/jquery-tablesorter/js/extras/jquery.quicksearch.js

server/theme/default/libraries/jquery-tablesorter/js/extras/semver-mod.js

server/theme/default/libraries/jquery-tablesorter/js/extras/semver.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.metadata.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.tablesorter.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.tablesorter.min.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.tablesorter.widgets-filter-formatter-select2.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.tablesorter.widgets-filter-formatter.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.tablesorter.widgets-filter-formatter.min.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.tablesorter.widgets.js

server/theme/default/libraries/jquery-tablesorter/js/jquery.tablesorter.widgets.min.js

server/theme/default/libraries/jquery-tablesorter/js/parsers

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-date-extract.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-date-iso8601.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-date-month.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-date-weekday.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-date.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-duration.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-file-type.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-ignore-articles.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-image.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-input-select.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-ipv6.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-metric.js

server/theme/default/libraries/jquery-tablesorter/js/parsers/parser-roman.js

server/theme/default/libraries/jquery-tablesorter/js/widgets

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-alignChar.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-build-table.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-columnSelector.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-editable.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-grouping.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-headerTitles.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-math.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-output.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-pager.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-print.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-reflow.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-repeatheaders.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-scroller.js

server/theme/default/libraries/jquery-tablesorter/js/widgets/widget-staticRow.js

files removed:
server/modules/preview/HtmlTemplateForGetResource.html

server/theme/default/html/campaign_form_layout_assign_list.php

server/theme/default/html/form_grid_pager.php

server/theme/default/img/weather_rss

server/theme/default/libraries/calendar/js/language/de-DE.js

server/theme/default/libraries/jquery/jquery.metadata.js

server/theme/default/libraries/jquery/jquery.tablesorter.pack.js

server/theme/default/libraries/jquery/jquery.tablesorter.pager.css

server/theme/default/libraries/jquery/jquery.tablesorter.pager.js

files renamed:
server/theme/default/img/weather_rss/circ-e.png => server/modules/theme/forecastio/circ-e.png

server/theme/default/img/weather_rss/circ-n.png => server/modules/theme/forecastio/circ-n.png

server/theme/default/img/weather_rss/circ-ne.png => server/modules/theme/forecastio/circ-ne.png

server/theme/default/img/weather_rss/circ-nw.png => server/modules/theme/forecastio/circ-nw.png

server/theme/default/img/weather_rss/circ-s.png => server/modules/theme/forecastio/circ-s.png

server/theme/default/img/weather_rss/circ-se.png => server/modules/theme/forecastio/circ-se.png

server/theme/default/img/weather_rss/circ-sw.png => server/modules/theme/forecastio/circ-sw.png

server/theme/default/img/weather_rss/circ-w.png => server/modules/theme/forecastio/circ-w.png

server/theme/default/img/weather_rss/circ.png => server/modules/theme/forecastio/circ.png

server/theme/default/img/weather_rss/cloudy.png => server/modules/theme/forecastio/cloudy.png

server/theme/default/img/weather_rss/frame.gif => server/modules/theme/forecastio/frame.gif

server/theme/default/img/weather_rss/heavy rain.png => server/modules/theme/forecastio/heavy rain.png

server/theme/default/img/weather_rss/heavy showers.png => server/modules/theme/forecastio/heavy showers.png

server/theme/default/img/weather_rss/heavy snow.png => server/modules/theme/forecastio/heavy snow.png

server/theme/default/img/weather_rss/light rain.png => server/modules/theme/forecastio/light rain.png

server/theme/default/img/weather_rss/light showers.png => server/modules/theme/forecastio/light showers.png

server/theme/default/img/weather_rss/light snow showers.png => server/modules/theme/forecastio/light snow showers.png

server/theme/default/img/weather_rss/light snow.png => server/modules/theme/forecastio/light snow.png

server/theme/default/img/weather_rss/snow showers.png => server/modules/theme/forecastio/snow showers.png

server/theme/default/img/weather_rss/sunny intervals.png => server/modules/theme/forecastio/sunny intervals.png

server/theme/default/img/weather_rss/sunny.png => server/modules/theme/forecastio/sunny.png

server/theme/default/img/weather_rss/temp-blue.png => server/modules/theme/forecastio/temp-blue.png

server/theme/default/img/weather_rss/temp-orange.png => server/modules/theme/forecastio/temp-orange.png

server/theme/default/img/weather_rss/temp-red.png => server/modules/theme/forecastio/temp-red.png

server/theme/default/img/weather_rss/temp-yellow.png => server/modules/theme/forecastio/temp-yellow.png

server/theme/default/img/weather_rss/thundery showers.png => server/modules/theme/forecastio/thundery showers.png

server/modules/preview/html-preview.css => server/theme/default/css/html-preview.css

files modified:
example_oauth/index.php

server/config/client.config.php

server/config/config.class.php

server/install/database/80.sql

server/install/master/data.sql

server/install/master/structure.sql

server/lib/app/debug.class.php

server/lib/app/kit.class.php

server/lib/app/modulemanager.class.php

server/lib/app/permissionmanager.class.php

server/lib/app/responsemanager.class.php

server/lib/app/session.class.php

server/lib/app/thememanager.class.php

server/lib/app/translationengine.class.php

server/lib/data/campaign.data.class.php

server/lib/data/campaignsecurity.data.class.php

server/lib/data/datasetdata.data.class.php

server/lib/data/datasetgroupsecurity.data.class.php

server/lib/data/display.data.class.php

server/lib/data/displayprofile.data.class.php

server/lib/data/layout.data.class.php

server/lib/data/maintenance.data.class.php

server/lib/data/media.data.class.php

server/lib/data/region.data.class.php

server/lib/data/schedule.data.class.php

server/lib/data/stat.data.class.php

server/lib/data/usergroup.data.class.php

server/lib/include.php

server/lib/modules/module.class.php

server/lib/pages/admin.class.php

server/lib/pages/campaign.class.php

server/lib/pages/content.class.php

server/lib/pages/display.class.php

server/lib/pages/displaygroup.class.php

server/lib/pages/index.class.php

server/lib/pages/install.class.php

server/lib/pages/layout.class.php

server/lib/pages/log.class.php

server/lib/pages/module.class.php

server/lib/pages/oauth.class.php

server/lib/pages/preview.class.php

server/lib/pages/schedule.class.php

server/lib/pages/stats.class.php

server/lib/pages/template.class.php

server/lib/pages/timeline.class.php

server/lib/pages/user.class.php

server/lib/service/rest.class.php

server/lib/service/service.wsdl

server/lib/service/xmdssoap.class.php

server/lib/xmds.inc.php

server/locale/dbtranslate.php

server/maintenance.php

server/manual/content/routes.php

server/manual/content/toc_developer_releasenotes.php

server/manual/template.php

server/modules/clock.module.php

server/modules/datasetview.module.php

server/modules/embedded.module.php

server/modules/module_user_general.php

server/modules/preview/HtmlTemplate.html

server/modules/preview/HtmlTemplateSimple.html

server/modules/preview/html-preview.js

server/modules/preview/xibo-text-render.js

server/modules/preview/xibo-webpage-render.js

server/modules/text.module.php

server/modules/theme/HtmlTemplateForClock.html

server/modules/theme/HtmlTemplateForFlipClock.html

server/modules/ticker.module.php

server/modules/webpage.module.php

server/services.php

server/theme/default/html/campaign_form_layout_assign.php

server/theme/default/html/footer.php

server/theme/default/html/grid_pager.php

server/theme/default/html/grid_render.php

server/theme/default/html/header.php

server/theme/default/html/layout_designer.php

server/theme/default/html/schedule_page.php

server/theme/default/html/settings_page.php

server/theme/default/html/stats_page_grid.php

server/theme/default/html/status_dashboard.php

server/theme/default/html/table_render.php

server/theme/default/js/xibo-calendar.js

server/theme/default/js/xibo-cms.js

server/theme/default/js/xibo-forms.js

server/theme/default/libraries/ckeditor/config.js

server/theme/default/libraries/ckeditor/contents.css

Show diffs side-by-side

added added

removed removed

server/lib/pages/index.class.php

264

$response->AddButton(__('Close'), 'XiboDialogClose()');

265

$response->Respond();

266

}

267

268

function ExchangeGridTokenForFormToken() {

269

270

// Check our grid token against the one provided.

271

if (!Kit::CheckToken('gridToken'))

272

die(__('Sorry the form has expired. Please refresh.'));

273

274

echo Kit::Token('token', false);

275

exit();

276

}

267

277

}

268

278

Older »