From 70f7d61ec3522bd69a954011cadb3b6e2ecd5b68 Mon Sep 17 00:00:00 2001 From: Kevin Russell Date: Mon, 18 Jul 2011 23:07:04 -0600 Subject: [PATCH 1/8] Provied a better error message for files that are too large --- admin/app/content/controller.php | 42 +++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/admin/app/content/controller.php b/admin/app/content/controller.php index 532cd7a..0ee4155 100644 --- a/admin/app/content/controller.php +++ b/admin/app/content/controller.php @@ -150,11 +150,47 @@ function createAction() $dat = $_POST['content']; if($_POST['submit']!='Add another feed') { - if($dat['upload_type']=='file') + if($dat['upload_type']=='file'){ $content_val = $_FILES['content_file']; - else + if( $content_val['error'] != UPLOAD_ERR_OK ){ + switch( $content_val['error'] ){ + case UPLOAD_ERR_INI_SIZE: + $this->flash('Your content submission failed. '. + 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'); + break; + case UPLOAD_ERR_FORM_SIZE: + $this->flash('Your content submission failed. '. + 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the form.'); + break; + case UPLOAD_ERR_PARTIAL: + $this->flash('Your content submission failed. '. + 'The uploaded file was only partially uploaded.'); + break; + case UPLOAD_ERR_NO_FILE: + $this->flash('Your content submission failed. '. + 'No file was uploaded.'); + break; + case UPLOAD_ERR_NO_TMP_DIR: + $this->flash('Your content submission failed. '. + 'Missing a temporary folder.'); + break; + case UPLOAD_ERR_CANT_WRITE: + $this->flash('Your content submission failed. '. + 'Failed to write file to disk.'); + break; + case UPLOAD_ERR_EXTENSION: + $this->flash('Your content submission failed. '. + 'File upload stopped by extension.'); + break; + default: + $this->flash('Your content submission failed. '. + 'Unknown upload error.'); + } + redirect_to(ADMIN_URL.'/content/new'); + } + }else $content_val = $dat['content']; - + if(is_array($dat['feeds'])) $feed_ids=array_unique(array_values($dat['feeds'])); else $feed_ids=Array(); From 19f7b8f19f87a12805529b6008c6dc625c6ddb66 Mon Sep 17 00:00:00 2001 From: Kevin Russell Date: Mon, 18 Jul 2011 23:08:47 -0600 Subject: [PATCH 2/8] Fix a bug where content could be added, but not to a feed --- admin/app/content/controller.php | 34 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/admin/app/content/controller.php b/admin/app/content/controller.php index 0ee4155..8109b38 100644 --- a/admin/app/content/controller.php +++ b/admin/app/content/controller.php @@ -210,22 +210,26 @@ function createAction() if($dat['upload_type'] == 'dynamic') { $this->flash('Your content was successfully added. It will be automatically processed and will appear on the live feed shortly. '.$uploader->status); } else { - $content = new Content($uploader->cid); - $feeds = $content->list_feeds(); - $approved=0; - $waiting=0; - foreach ($feeds as $feed) { - if($feed['moderation_flag']==1){ - $approved ++; - } elseif($feed['moderation_flag']==NULL) { - $waiting ++; + if( !$feeds ){ + $this->flash('Your content submission failed. '. + 'You must submit to at least one feed. Please try again. '.$uploader->status, 'error'); + redirect_to(ADMIN_URL.'/content/new'); + }else{ + $approved=0; + $waiting=0; + foreach ($feeds as $feed) { + if($feed['moderation_flag']==1){ + $approved ++; + } elseif($feed['moderation_flag']==NULL) { + $waiting ++; + } + } + if($approved>0) { + $this->flash('Your content was successfuly added. It has been automatically approved on feeds for which you are a moderator. '.$uploader->status); + } else { + $this->flash('Your content was succesfully uploaded! It will be active on the '. + 'system as soon as it is approved for the feed(s) you chose. '.$uploader->status); } - } - if($approved>0) { - $this->flash('Your content was successfuly added. It has been automatically approved on feeds for which you are a moderator. '.$uploader->status); - } else { - $this->flash('Your content was succesfully uploaded! It will be active on the '. - 'system as soon as it is approved for the feed(s) you chose. '.$uploader->status); } } redirect_to(ADMIN_URL.'/content/show/'.$uploader->cid); From 9de6c831ccddf8af0048f672677aae92e7499000 Mon Sep 17 00:00:00 2001 From: Kevin Russell Date: Tue, 19 Jul 2011 22:53:01 -0600 Subject: [PATCH 3/8] Changed the PHP tags from short tags to long tags --- admin/app/browse/details.php | 26 +- admin/app/browse/feed.php | 52 ++-- admin/app/browse/list.php | 36 +-- admin/app/browse/show.php | 32 +- admin/app/content/_form.php | 18 +- admin/app/content/edit.php | 4 +- admin/app/content/list.php | 28 +- admin/app/content/new.php | 26 +- admin/app/content/new_dynamic.php | 18 +- admin/app/content/new_image.php | 6 +- admin/app/content/new_preview.php | 2 +- admin/app/content/new_ticker.php | 6 +- admin/app/content/show.php | 16 +- admin/app/content/signup.php | 2 +- admin/app/feeds/_form.php | 8 +- admin/app/feeds/edit.php | 2 +- admin/app/feeds/list.php | 18 +- admin/app/feeds/moderate.php | 24 +- admin/app/feeds/new.php | 2 +- admin/app/feeds/request.php | 4 +- admin/app/feeds/show.php | 24 +- admin/app/frontpage/addtemplate.php | 2 +- admin/app/frontpage/admin.php | 24 +- admin/app/frontpage/dashboard.php | 86 +++--- admin/app/frontpage/index.php | 8 +- admin/app/frontpage/login.php | 8 +- admin/app/frontpage/mailer.php | 10 +- admin/app/frontpage/miniscreen.php | 2 +- admin/app/groups/_form.php | 2 +- admin/app/groups/add.php | 4 +- admin/app/groups/edit.php | 2 +- admin/app/groups/list.php | 10 +- admin/app/groups/new.php | 2 +- admin/app/groups/remove.php | 2 +- admin/app/groups/show.php | 46 +-- admin/app/moderate/confirm.php | 28 +- admin/app/moderate/feed.php | 44 +-- admin/app/page_categories/_form.php | 8 +- admin/app/page_categories/edit.php | 2 +- admin/app/page_categories/list.php | 6 +- admin/app/page_categories/moderate.php | 24 +- admin/app/page_categories/new.php | 2 +- admin/app/page_categories/show.php | 14 +- admin/app/pages/_feedback.php | 14 +- admin/app/pages/_form.php | 14 +- admin/app/pages/edit.php | 2 +- admin/app/pages/list.php | 26 +- admin/app/pages/new.php | 2 +- admin/app/pages/show.php | 2 +- admin/app/screens/_form.php | 82 ++--- admin/app/screens/edit.php | 2 +- admin/app/screens/list.php | 20 +- admin/app/screens/livecd.php | 14 +- admin/app/screens/new.php | 2 +- admin/app/screens/show.php | 44 +-- admin/app/screens/subscriptions.php | 22 +- admin/app/users/_form.php | 20 +- admin/app/users/edit.php | 2 +- admin/app/users/list.php | 8 +- admin/app/users/new.php | 2 +- admin/app/users/newsfeed.php | 42 +-- admin/app/users/notifications.php | 2 +- admin/app/users/password.php | 4 +- admin/app/users/show.php | 52 ++-- admin/app/users/signup.php | 2 +- admin/app/wall/ext.php | 26 +- admin/app/wall/feedgrid.php | 20 +- admin/app/wall/index.php | 16 +- admin/docs_layout.php | 34 +- admin/ds_layout.php | 44 +-- admin/fpnew_layout.php | 42 +-- admin/includes/left_menu.php | 53 ++-- admin/includes/menu_tabs.php | 24 +- admin/js/ui.jquery.js | 0 admin/js/ui.progressbar-custom.min.js | 0 admin/livecd_layout.php | 26 +- admin/stripped_ds_layout.php | 22 +- common/content.php | 2 +- common/dynamic.php | 2 +- common/feed.php | 2 +- common/field.php | 2 +- common/group.php | 2 +- common/newsfeed.php | 2 +- common/notification.php | 2 +- common/position.php | 2 +- common/screen.php | 2 +- common/scripts/cron.php | 412 ++++++++++++------------- common/scripts/mail.php | 2 +- common/scripts/notifications.php | 2 +- common/scripts/template_exp.php | 38 +-- common/template.php | 2 +- common/upload.php | 2 +- common/user.php | 2 +- content/render/api/000.php | 2 +- content/render/api/005.php | 2 +- content/render/api/006.php | 2 +- content/render/api/007.php | 84 ++--- content/render/api/008.php | 102 +++--- content/render/api/009.php | 102 +++--- content/render/index.php | 2 +- content/render/render.php | 2 +- hardware/admin/class.php | 6 +- hardware/admin/override.php | 2 +- install/diagnostics.php | 22 +- install/schema.sql | 0 screen/index.php | 2 +- screen/missing.php | 4 +- 107 files changed, 1094 insertions(+), 1095 deletions(-) mode change 100755 => 100644 admin/app/frontpage/login.php mode change 100755 => 100644 admin/app/users/password.php mode change 100755 => 100644 admin/js/ui.jquery.js mode change 100755 => 100644 admin/js/ui.progressbar-custom.min.js mode change 100755 => 100644 content/render/api/005.php mode change 100755 => 100644 install/schema.sql diff --git a/admin/app/browse/details.php b/admin/app/browse/details.php index 9c79407..427edaa 100644 --- a/admin/app/browse/details.php +++ b/admin/app/browse/details.php @@ -25,15 +25,15 @@ */ ?> -
" style="width:250px"> -content->mime_type)) { ?> - -content->mime_type)) { ?> - content->content ?> - +" style="width:250px"> +content->mime_type)) { ?> + +content->mime_type)) { ?> + content->content ?> + -

content->name ?> +

content->name ?> feed->user_priv($_SESSION['user'], 'moderate')) { if($this->status==0) { @@ -43,12 +43,12 @@ } } ?>

- content->start_time)) ?> - content->end_time)) ?> week_range > 1) echo "({$this->week_range} Weeks)" ?> -

Display duration: Duration dur_str?>

-

Submitted by submitter->name ?>

-moderator->id != false) { ?> -

Moderated by moderator->name ?>

- + content->start_time)) ?> - content->end_time)) ?> week_range > 1) echo "({$this->week_range} Weeks)" ?> +

Display duration: Duration dur_str?>

+

Submitted by submitter->name ?>

+moderator->id != false) { ?> +

Moderated by moderator->name ?>

+
diff --git a/admin/app/browse/feed.php b/admin/app/browse/feed.php index 1de4873..d925c90 100644 --- a/admin/app/browse/feed.php +++ b/admin/app/browse/feed.php @@ -24,46 +24,46 @@ * @version $Revision$ */ ?> -feed->user_priv($_SESSION['user'], "edit")) { ?> -
Edit Feed
 -
Delete Feed
 +feed->user_priv($_SESSION['user'], "edit")) { ?> +
Edit Feed
 +
Delete Feed
- + feed->user_priv($_SESSION['user'], "moderate")){ ?> -feed->description)>0) { ?> +feed->description)>0) { ?>

Description:

-

feed->description ?>

- -

Moderation status: waiting > 0 ? $this->waiting : "No" ?> items awaiting moderation

-feed->description ?>

+ +

Moderation status: waiting > 0 ? $this->waiting : "No" ?> items awaiting moderation

+ -

This feed is moderated by group->name) ?>.

-This feed is moderated by group->name) ?>.

+feed->type == 4) && ($this->feed->dyn->needs_update() > 0)){ ?> -

Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

-Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

+

Content

    -feed->get_types())) foreach($this->feed->get_types() as $type_id => $type){ ?> -
  • args[2]}" : "" ?>">
    • - +feed->get_types())) foreach($this->feed->get_types() as $type_id => $type){ ?> +
  • args[2]}" : "" ?>">
    • +

Feed Statistics

    -
  • Active and Future Content: active_content ?>
    • -
  • Expired Content: expired_content ?>
    • +
  • Active and Future Content: active_content ?>
    • +
  • Expired Content: expired_content ?>
-feed->get_screens(); ?> -0) { ?> +feed->get_screens(); ?> +0) { ?>

Active Screens

    id; ?> -
  • name ?> -(name ?> +( -field_name ?> - -field_name ?> + +'; } ?>
- + diff --git a/admin/app/browse/list.php b/admin/app/browse/list.php index 9b135d7..b27fce2 100644 --- a/admin/app/browse/list.php +++ b/admin/app/browse/list.php @@ -26,24 +26,24 @@ ?>
-
+
- -

-

Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

+ +

+

Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

-
+
-
+
-
New Feed
 - -
Request a Feed
 - +
New Feed
 + +
Request a Feed
 +
feeds[$feed_key['key']]) > 0){ ?> -

-

+

+

- - + + - + - +

name) ?> Feed

Moderated by group_id) ?>name ?>

name) ?> Feed

Moderated by group_id) ?>name ?>

description ?>

description ?>
@@ -98,12 +98,12 @@ ?>

-


-

Would you like to see a feed for another category of content? Request a feed today!

+

Would you like to see a feed for another category of content? Request a feed today!

diff --git a/admin/app/browse/show.php b/admin/app/browse/show.php index 48fd3ea..a9d83df 100644 --- a/admin/app/browse/show.php +++ b/admin/app/browse/show.php @@ -31,9 +31,9 @@ $(this).data("loaded", 0); var parent = this; $.ajax({type: "POST", - url: "/browse/details", + url: "/browse/details", data: {"content_id": $(parent).attr("id").replace(/c/,""), - "feed_id": feed->id?> + "feed_id": feed->id?> }, success: function(html){ $("").attr("class", "details") @@ -42,8 +42,8 @@ .insertAfter(parent) .find("#i-preview").lightBox({ overlayBgColor: "#000", - imageLoading: "images/lightbox-ico-loading.gif", - imageBtnClose: "images/lightbox-btn-close.gif" + imageLoading: "images/lightbox-ico-loading.gif", + imageBtnClose: "images/lightbox-btn-close.gif" }); $(parent).data("loaded", 1).expand_details(); }, @@ -103,21 +103,21 @@ }); })(jQuery); //--> -feed->type == 4) && ($this->feed->dyn->needs_update() > 0)){ ?> -

Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

-Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

+
    -

  • Active

    • -
  • middlelastargs[4] == "expired") { ?> ui-tabs-selected">

    Expired

    • +

  • Active

    • +
  • middlelastargs[4] == "expired") { ?> ui-tabs-selected">

    Expired

    • feed->user_priv($_SESSION['user'], "moderate")) { ?> -
  • ui-tabs-selected">

    Declined

    • +
  • ui-tabs-selected">

    Declined

@@ -129,7 +129,7 @@

-
+
@@ -148,7 +148,7 @@ foreach($this->contents as $content) { $submitter = new User($content->user_id); ?> - + - - + + -
+
diff --git a/admin/app/content/_form.php b/admin/app/content/_form.php index 9774b07..cb2faf0 100644 --- a/admin/app/content/_form.php +++ b/admin/app/content/_form.php @@ -35,13 +35,13 @@
mime_type)) { echo "id?width=50&height=37\" alt=\"Icon\" />"; @@ -158,10 +158,10 @@ echo " "; } ?> - name ?> + name ?> start_time))?>end_time))?>start_time))?>end_time))?> user_id); echo htmlspecialchars($user->name) ?>
Title

Enter some words that describe this piece of content to others.

 - +
Start Date

When should this piece of content start to be displayed on Concerto?

 - +

Starting at the beginning of the day (12:00am)

 Set a different start time @@ -75,7 +75,7 @@
End Date

When should this piece of content expire? This might be the date of the event you are advertising.

 - +

Showing through the end of the day (11:59pm)

 Set a different end time @@ -109,15 +109,15 @@
Duration

For how long should this piece of content be displayed on a screen?

 -
Default is seconds
- +
Default is seconds
+ 		Set a different duration


-

Not sure what feeds are? Read this first!

+

Not sure what feeds are? Read this first!

@@ -143,10 +143,10 @@ $scrcnt = count($screens); ?> + title="description ? $feed->description : ' '?> Displays on screen0) ? ': '.join(', ',$screens) : '. ' ?>" + value="id?>">name)?> - +

diff --git a/admin/app/content/edit.php b/admin/app/content/edit.php index 6e08f32..6adfa59 100644 --- a/admin/app/content/edit.php +++ b/admin/app/content/edit.php @@ -23,9 +23,9 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
View user->firstname?>'s Profile
+?>
View user->firstname?>'s Profile
-
+ diff --git a/admin/app/content/list.php b/admin/app/content/list.php index 59be601..81dce1a 100644 --- a/admin/app/content/list.php +++ b/admin/app/content/list.php @@ -23,7 +23,7 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
Submit Content
+?>
Submit Content

All active content in the system is shown. Click on a title for details.

contents) && count($this->contents>1)) @@ -31,7 +31,7 @@ foreach(array_keys($this->contents) as $field) $urls[]=''.$field.''; ?> -

Jump to: +

Jump to:

- + -
name ?> start_time)) ?> - end_time)) ?>
+ name ?> start_time)) ?> - end_time)) ?> - > - - + > + + - > - -

name?>

+ > + +

name?>

mime_type == "text/plain") echo "$content->content
\n"; ?> - start_time))?> - end_time))?> - ( ) -

Submitted by name?>

+ start_time))?> - end_time))?> + ( ) +

Submitted by name?>

diff --git a/admin/app/content/new.php b/admin/app/content/new.php index 53a124c..538b84e 100644 --- a/admin/app/content/new.php +++ b/admin/app/content/new.php @@ -30,7 +30,7 @@ $.datepicker.setDefaults({showOn: 'both', buttonImageOnly: true, - buttonImage: 'images/cal_icon.gif', + buttonImage: 'images/cal_icon.gif', buttonText: 'Calendar', showAnum: "fadeIn"}); @@ -90,7 +90,7 @@ $("#content").keyup(function() { var length = $(this).val().length; - var limit = ; + var limit = ; if( length > limit ) { $(this).val($(this).val().substring(0, limit)); return false; @@ -125,7 +125,7 @@ function update(child, desc) { if(count == undefined) count = 0; var feeddiv = $(this).parents("tr").find(".feeddiv:last"); - $("

").html("We strongly encourage you to submit to just one feed in most situations.

Adding your content to multiple feeds does NOT necessarily mean that it will appear on multiple screens. Please review the help page for more details. Are you sure you want to continue?") + $("

").html("We strongly encourage you to submit to just one feed in most situations.

Adding your content to multiple feeds does NOT necessarily mean that it will appear on multiple screens. Please review the help page for more details. Are you sure you want to continue?") .dialog({ autoResize: true, buttons: { @@ -156,25 +156,25 @@ function update(child, desc) { //-->


-
+
- - + +
- - + +
- has_ndc_rights()) { $content_type = NULL; //hmm. @@ -184,6 +184,6 @@ function update(child, desc) {
-
+
diff --git a/admin/app/content/new_dynamic.php b/admin/app/content/new_dynamic.php index 5d33003..2b32fdc 100644 --- a/admin/app/content/new_dynamic.php +++ b/admin/app/content/new_dynamic.php @@ -37,7 +37,7 @@ title: "Loading..." }); $.ajax({type: "GET", - url: "/content/new_preview/", + url: "/content/new_preview/", data: {"feed_id": $("#dd_feed", form).val(), "name": $("#dd_name", form).val(), "content": $("#dd_content", form).val(), @@ -79,12 +79,12 @@ })(jQuery); //-->
- +

Add Dynamic Text

Fill in these details to post a dynamic data item to Concerto.

- +

@@ -100,10 +100,10 @@ foreach ($this->ndc_feeds as $arr) { list($feed, $value) = $arr;?> + title="description ? $feed->description : ' '?>" + value="id?>">name?> - +
@@ -118,7 +118,7 @@ @@ -140,7 +140,7 @@ @@ -53,7 +53,7 @@ if(is_array($groups)) foreach($groups as $group) { ?> - + @@ -67,7 +67,7 @@ $types[3] = "Private"; foreach($types as $t_id => $t_name) { ?> - + diff --git a/admin/app/feeds/edit.php b/admin/app/feeds/edit.php index a8fa7f7..db3a3e0 100644 --- a/admin/app/feeds/edit.php +++ b/admin/app/feeds/edit.php @@ -24,7 +24,7 @@ * @version $Revision$ */ ?> +action="/feeds/update/feed->id?>"> diff --git a/admin/app/feeds/list.php b/admin/app/feeds/list.php index b7beb4b..40fb4ff 100644 --- a/admin/app/feeds/list.php +++ b/admin/app/feeds/list.php @@ -24,22 +24,22 @@ * @version $Revision$ */ ?> -
New Feed
 - -
Request a Feed
 - +
New Feed
 + +
Request a Feed
 +
-

Click on a feed for more information. Extra Help

+

Click on a feed for more information. Extra Help

Title

Enter the title.

 - +
Start Date

When does the event start?

 Date: - + Time:
End Date

When does the event end?

 Date: - + Time: diff --git a/admin/app/content/new_preview.php b/admin/app/content/new_preview.php index af4f199..61ed395 100644 --- a/admin/app/content/new_preview.php +++ b/admin/app/content/new_preview.php @@ -24,7 +24,7 @@ * @version $Revision$ */ ?>
-set){ diff --git a/admin/app/content/new_ticker.php b/admin/app/content/new_ticker.php index ad2f649..a992bcd 100644 --- a/admin/app/content/new_ticker.php +++ b/admin/app/content/new_ticker.php @@ -24,19 +24,19 @@ * @version $Revision$ */ ?>
- +

Add Ticker Text

Fill in these details to post a text announcement to Concerto.

- +

File to Upload

Specify the file you would like to upload to Concerto.

Ticker Text

Enter the text announcement or message that will be displayed.

 -

Please limit your ticker to characters of plain text.

+

Please limit your ticker to characters of plain text.
diff --git a/admin/app/content/show.php b/admin/app/content/show.php index 157dbcf..2ee48ff 100644 --- a/admin/app/content/show.php +++ b/admin/app/content/show.php @@ -24,29 +24,29 @@ * @version $Revision$ */ ?>canEdit) {?> - -
Delete Item
+ +
Delete Item

content->mime_type)) { ?> - -Content Image + +Content Image -
-content->content ?> +
+content->content ?>
-

Run dates: content->start_time))?> - content->end_time))?>

+

Run dates: content->start_time))?> - content->end_time))?>

-

Submitted By: submitter->name?>

+

Submitted By: submitter->name?>


Welcome to Concerto!

Please enter some information about yourself to get started.

- + diff --git a/admin/app/feeds/_form.php b/admin/app/feeds/_form.php index d630d12..f3116c6 100644 --- a/admin/app/feeds/_form.php +++ b/admin/app/feeds/_form.php @@ -36,13 +36,13 @@
Feed Name
 - +
Description
 - +
feeds){ foreach($this->feeds as $feed){ ?> contents) as $field) $urls[]=''.$field.''; ?> -

Jump to: +

Jump to:

mime_type)) { $has_imagecol=1; ?> - > - - + > + + - diff --git a/admin/app/feeds/new.php b/admin/app/feeds/new.php index 0a4de92..54de0de 100644 --- a/admin/app/feeds/new.php +++ b/admin/app/feeds/new.php @@ -25,7 +25,7 @@ */ ?>

Please fill out all fields to create a new Feed.

- + diff --git a/admin/app/feeds/request.php b/admin/app/feeds/request.php index e175d40..c4a5736 100644 --- a/admin/app/feeds/request.php +++ b/admin/app/feeds/request.php @@ -25,8 +25,8 @@ */ ?>

Please fill out all fields to request a new feed.

-

Feeds in Concerto are broad categories for content submission. Most content at should fit into one of our existing feeds, but if you think your content fits into a specific category that should be separate from existing feeds on Concerto, we'd love to hear about it.

-

See the Support Center for more information about feeds.

+

Feeds in Concerto are broad categories for content submission. Most content at should fit into one of our existing feeds, but if you think your content fits into a specific category that should be separate from existing feeds on Concerto, we'd love to hear about it.

+

See the Support Center for more information about feeds.

If your feed request is approved, we'll be contacting you shortly about setting up a controlling group for the feed.

diff --git a/admin/app/feeds/show.php b/admin/app/feeds/show.php index 3f3ab3f..06488f6 100644 --- a/admin/app/feeds/show.php +++ b/admin/app/feeds/show.php @@ -23,19 +23,19 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>feed->user_priv($_SESSION['user'], "edit")) { ?> -
Edit Feed
 -
Delete Feed
 - -
Browse Feed
 +?>feed->user_priv($_SESSION['user'], "edit")) { ?> +
Edit Feed
 +
Delete Feed
 + +
Browse Feed
-

Feed Name: feed->name ?>

-

Group: group->name ?>

-feed->description)>0) { ?> +

Feed Name: feed->name ?>

+

Group: group->name ?>

+feed->description)>0) { ?>

Description:

-

feed->description ?>

- +

feed->description ?>

+

Feed Statistics:

-

feed->id}"?>">Active and Future Content: active_content ?>

-

feed->id}/expired"?>">Expired Content: expired_content ?>

+

feed->id}"?>">Active and Future Content: active_content ?>

+

feed->id}/expired"?>">Expired Content: expired_content ?>

diff --git a/admin/app/frontpage/addtemplate.php b/admin/app/frontpage/addtemplate.php index 387471e..e3c436f 100644 --- a/admin/app/frontpage/addtemplate.php +++ b/admin/app/frontpage/addtemplate.php @@ -25,7 +25,7 @@ */ ?>

Please upload a template file and the descriptor file to add a new template.

- +
-

name ?>

- description)>0) { ?> -

description ?>

- +

name ?>

+ description)>0) { ?> +

description ?>

+
> - -

name?>

+ 		> + +

name?>

mime_type == "text/plain") echo "$content->content
\n"; ?> - start_time))?> - end_time))?> -

Submitted by name?>

-

Approve | - Deny

+ start_time))?> - end_time))?> +

Submitted by name?>

+

Approve | + Deny
diff --git a/admin/app/frontpage/admin.php b/admin/app/frontpage/admin.php index 1205eff..65e175e 100644 --- a/admin/app/frontpage/admin.php +++ b/admin/app/frontpage/admin.php @@ -26,10 +26,10 @@ ?>

Please use these utilities wisely.

-
+

Masquerade (su)

- + +
-
+
-

Admin Privs:

-

Reset Session: reset

-

Admin Revision:

-PHP Info
-Send Mail
-Template Importer
+

Admin Privs:

+

Reset Session: reset

+

Admin Revision:

+PHP Info
+Send Mail
+Template Importer
diff --git a/admin/app/frontpage/dashboard.php b/admin/app/frontpage/dashboard.php index 0f02997..c0ac3a7 100644 --- a/admin/app/frontpage/dashboard.php +++ b/admin/app/frontpage/dashboard.php @@ -36,7 +36,7 @@ event.preventDefault(); if($(this).data("news")) return; - $.post("/users/notifications/username ?>", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { + $.post("/users/notifications/username ?>", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { $("
").css("overflow", "hidden").html(data).hide().appendTo($("#news_expand")).slideDown("slow"); $("#news_expand").data('items',$("#news_expand").data('items')+5); if( data == "" ) { @@ -63,24 +63,24 @@ //-->
-
+
- -

-

Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

+ +

+

Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

-
+
-
+
-
+

News Feed

@@ -88,7 +88,7 @@ if(is_array($this->notifications)) { foreach($this->notifications as $newsfeed) { ?> -

text ?>timestamp) ?> +

text ?>timestamp) ?> has_extra){ echo '
'.$newsfeed->additional.''; @@ -101,50 +101,50 @@

- +
-
+
-
-

Concerto is currently at Version . For more information, check out the release notes.

+
+

Concerto is currently at Version . For more information, check out the release notes.

-
+
-
+
-
+

Operational Status

- - - - - - - + + + + + + +
-

- 		-

screen_stats[3] ?> screens

- 		-

screen_stats[0] ?>

-
-

online

- 		-

screen_stats[2]; ?>

-
-

asleep

- 		-

screen_stats[1]; ?>

-
-

offline

-
+

+ 		+

screen_stats[3] ?> screens

+ 		+

screen_stats[0] ?>

+
+

online

+ 		+

screen_stats[2]; ?>

+
+

asleep

+ 		+

screen_stats[1]; ?>

+
+

offline

+
@@ -200,9 +200,9 @@ ?>
- <?= $status ?> + <?php echo $status ?>
- name?>, a width.'x'.$screen->height?> display in location?> + name?>, a width.'x'.$screen->height?> display in location?>
-
+
diff --git a/admin/app/frontpage/index.php b/admin/app/frontpage/index.php index 9553b21..4fba7c5 100644 --- a/admin/app/frontpage/index.php +++ b/admin/app/frontpage/index.php @@ -27,19 +27,19 @@ -
+
-
+

This is digital signage for everyone.

Concerto is a free, Web-based broadcast medium for digital announcements that just works. Using Concerto, it's easy to engage large communities of people with graphical and text-based flyers, alerts, and other messages.

-
+
diff --git a/admin/app/frontpage/login.php b/admin/app/frontpage/login.php old mode 100755 new mode 100644 index ac939a1..03bdef3 --- a/admin/app/frontpage/login.php +++ b/admin/app/frontpage/login.php @@ -1,7 +1,7 @@
-
+
-
+

-
-
\ No newline at end of file +
+
diff --git a/admin/app/frontpage/mailer.php b/admin/app/frontpage/mailer.php index 748777c..14893f9 100644 --- a/admin/app/frontpage/mailer.php +++ b/admin/app/frontpage/mailer.php @@ -26,9 +26,9 @@ ?>

Use this form to send mail to users & groups

-
+
-
+

Users

users)) @@ -52,8 +52,8 @@ All Users

From

- Concerto System () - fromyou ?> + Concerto System () + fromyou ?>

Subject

@@ -68,5 +68,5 @@ Don't worry, only one email will be sent to each person, even if you select them twice.
-
+
diff --git a/admin/app/frontpage/miniscreen.php b/admin/app/frontpage/miniscreen.php index 9e6f98b..b9d3a91 100644 --- a/admin/app/frontpage/miniscreen.php +++ b/admin/app/frontpage/miniscreen.php @@ -1,4 +1,4 @@ -
Group Name
- + diff --git a/admin/app/groups/add.php b/admin/app/groups/add.php index a3c5b16..41b5a98 100644 --- a/admin/app/groups/add.php +++ b/admin/app/groups/add.php @@ -23,8 +23,8 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>

Select a user from the RCS-sorted list on the left, and click the "Add" button to add that user to your group. Extra Help

-
+?>

Select a user from the RCS-sorted list on the left, and click the "Add" button to add that user to your group. Extra Help

+ canEdit) {?> -
Add a User
 -
Remove a User
 -
Delete Group
+
Add a User
 +
Remove a User
 +
Delete Group

Members:

    - group->get_members())) + group->get_members())) foreach ($this->group->get_members() as $user) { ?> -
  • name ?> - canEdit) { ?> - ( Remove ) - +
  • name ?> + canEdit) { ?> + ( Remove ) +
    • - None

    ";?> + None

    ";?>
- feeds)&&count($this->feeds)>0) { ?> + feeds)&&count($this->feeds)>0) { ?>

Feeds:

@@ -55,7 +55,7 @@ ?> -

name) ?> Feed

+

name) ?> Feed

$type_name) { @@ -71,17 +71,17 @@ ?> -

Expired Content: content_count('1','expired');?>

+

Expired Content: content_count('1','expired');?>

- + - + - screens)&&count($this->screens)>0) { ?> + screens)&&count($this->screens)>0) { ?>

Screens:

- +
-
+
-
+
-

-

name?>

-

location?>

+

+

name?>

+

location?>

-
+
- + diff --git a/admin/app/moderate/confirm.php b/admin/app/moderate/confirm.php index 7481e18..7080f15 100755 --- a/admin/app/moderate/confirm.php +++ b/admin/app/moderate/confirm.php @@ -23,34 +23,34 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?> - - - -args[1]=="approve") { ?> +?> + + + +args[1]=="approve") { ?>

Duration:

-

- +

+

Reason for Rejection:

- +

Additional Message to Send to Submitter:

-args[4] != "ajax") { ?> +args[4] != "ajax") { ?> - + - +
diff --git a/admin/app/moderate/feed.php b/admin/app/moderate/feed.php index 5d328cd..229aa1c 100644 --- a/admin/app/moderate/feed.php +++ b/admin/app/moderate/feed.php @@ -38,7 +38,7 @@ title: "Loading..." }); $.ajax({type: "GET", - url: "/moderate/confirm/" + action + "/feed->id?>/" + content_id + "/ajax", + url: "/moderate/confirm/" + action + "/feed->id?>/" + content_id + "/ajax", success: function(html){ $(html) .dialog({ @@ -48,10 +48,10 @@ var posts = $(this).serializeArray(); var actions = $(parent).prev().find("td.actions"); var onError = function(){ - window.location = "/moderate/confirm/" + action + "/feed->id?>/" + content_id; + window.location = "/moderate/confirm/" + action + "/feed->id?>/" + content_id; }; $.ajax({type: "POST", - url: "/moderate/post", + url: "/moderate/post", data: posts, success: function(json){ if(json == true) { @@ -103,8 +103,8 @@ $(".i-preview").each(function(){ $(this).lightBox({ overlayBgColor: "#000", - imageLoading: "images/lightbox-ico-loading.gif", - imageBtnClose: "images/lightbox-btn-close.gif" + imageLoading: "images/lightbox-ico-loading.gif", + imageBtnClose: "images/lightbox-btn-close.gif" }); }); }); @@ -140,31 +140,31 @@ echo " "; } ?> - name ?> + name ?> - start_time))?> - end_time))?> + start_time))?> + end_time))?> user_id); echo $user->name ?> - + - Approve - Deny + Approve + Deny - - - diff --git a/admin/app/page_categories/_form.php b/admin/app/page_categories/_form.php index 501124a..bce6414 100644 --- a/admin/app/page_categories/_form.php +++ b/admin/app/page_categories/_form.php @@ -32,19 +32,19 @@ - + +action="/page_categories/update/category['id']?>"> diff --git a/admin/app/page_categories/list.php b/admin/app/page_categories/list.php index 786de98..ffaed63 100644 --- a/admin/app/page_categories/list.php +++ b/admin/app/page_categories/list.php @@ -23,8 +23,8 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
New Category
 -
View Pages
 +?>
New Category
 +
View Pages
@@ -34,7 +34,7 @@ if($this->categories){ foreach($this->categories as $cat){ ?> - + contents) as $field) $urls[]=''.$field.''; ?> -

Jump to: +

Jump to:

mime_type)) { $has_imagecol=1; ?> - > - - + > + + - diff --git a/admin/app/page_categories/new.php b/admin/app/page_categories/new.php index df48da9..9a578d9 100644 --- a/admin/app/page_categories/new.php +++ b/admin/app/page_categories/new.php @@ -25,7 +25,7 @@ */ ?>

Please fill out all fields to create a new category for pages.

- + diff --git a/admin/app/page_categories/show.php b/admin/app/page_categories/show.php index 14219ce..d2cc4eb 100644 --- a/admin/app/page_categories/show.php +++ b/admin/app/page_categories/show.php @@ -23,11 +23,11 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
Edit Category
 -
Delete Category
+?>
Edit Category
 +
Delete Category
-

Category Name: category['name'] ?>

-

Path: category['path'] ?>

-

Layout: category['layout']?>

-

Default Page: category['default_page_name'] ?>

-

Pages: count ?> (see listing of pages)

+

Category Name: category['name'] ?>

+

Path: category['path'] ?>

+

Layout: category['layout']?>

+

Default Page: category['default_page_name'] ?>

+

Pages: count ?> (see listing of pages)

diff --git a/admin/app/pages/_feedback.php b/admin/app/pages/_feedback.php index 4e8b8a1..04228e0 100644 --- a/admin/app/pages/_feedback.php +++ b/admin/app/pages/_feedback.php @@ -50,12 +50,12 @@ //Do the actual submit, output status. $('#feedback_form').submit(function() { - jQuery.post('/pages/feedback', { + jQuery.post('/pages/feedback', { 'helpful': $('input[name=helpful]:checked').val(), 'message': $('textarea[name=message]').val(), 'email': $('input[name=email]').val(), 'human': $('input[name=human]').val(), - 'page_id': 'page['id']?>', + 'page_id': 'page['id']?>', 'submit': $('input[name=submit]').val() }, function(data) { $('#feedback_form').after(data+"
"); @@ -71,7 +71,7 @@

Was this information helpful?

Your input can help us improve the Concerto Support Center.

- +

@@ -82,17 +82,17 @@



- +
- +



- + - +

diff --git a/admin/app/pages/_form.php b/admin/app/pages/_form.php index b5f1ad7..c5cdca0 100644 --- a/admin/app/pages/_form.php +++ b/admin/app/pages/_form.php @@ -32,7 +32,7 @@ @@ -43,28 +43,28 @@ if(is_array($cats)) foreach($cats as $cat) { ?> - +
" style="width:250px"> -mime_type)) { ?> - -mime_type)) { ?> - content ?> - +" style="width:250px"> +mime_type)) { ?> + +mime_type)) { ?> + content ?> + -

name ?>

- start_time)) ?> - end_time)) ?> 1) echo "({$week_range} Weeks)" ?> -

Submitted by name ?>

+

name ?>

+ start_time)) ?> - end_time)) ?> 1) echo "({$week_range} Weeks)" ?> +

Submitted by name ?>

content = new Content($content->args[1]); ?>

No content awaiting moderation found
Category Name
 - +
Path

Letters, numbers, and hyphens only please. No special characters or spaces. Keep it short.

 - +
Layout

Should be a filesystem path to a valid Concerto php template from the admin directory.

 - +

> - -

name?>

+ 		> + +

name?>

mime_type == "text/plain") echo "$content->content
\n"; ?> - start_time))?> - end_time))?> -

Submitted by name?>

-

Approve | - Deny

+ start_time))?> - end_time))?> +

Submitted by name?>

+

Approve | + Deny
Page Name
 - +
Show in menu
Show feedback form
Page Content (HTML)
 - +
diff --git a/admin/app/pages/edit.php b/admin/app/pages/edit.php index 748cbcd..ac00518 100644 --- a/admin/app/pages/edit.php +++ b/admin/app/pages/edit.php @@ -24,7 +24,7 @@ * @version $Revision$ */ ?>
+action="/pages/update/page['id']?>"> diff --git a/admin/app/pages/list.php b/admin/app/pages/list.php index 7928811..8f93436 100644 --- a/admin/app/pages/list.php +++ b/admin/app/pages/list.php @@ -24,9 +24,9 @@ * @version $Revision$ */ ?>canEdit) { ?> -
New Page
 -
Manage Categories
- +
New Page
 +
Manage Categories
+

Click on a page for more information and contents.

An asterisk (*) represents items that will not show up in the menu.

@@ -41,16 +41,16 @@ -

+

canEdit) { ?> -(edit)

+(edit) canEdit) { ?> - + Default page: +
Screen Location
- +
Screen Latitude, Longitude
-   ,   - +   ,   +
Screen Size
(W x H, in pixels)
-   x   +   x  
MAC Address
- + @@ -138,29 +138,29 @@ if(is_array($groups)) foreach($groups as $group) { ?> - + -id)) { ?> +id)) { ?>
Controls display

Whether or not the machine controls the power state of the display.

- -id) && (isAdmin() || $screen->controls_display)) { ?> + +id) && (isAdmin() || $screen->controls_display)) { ?>
Display On/Off Times

What time should the system turn the screen on and off? Please specify hh:mm in 24-hour time, e.g. 18:00 for 6:00 pm, 00:00 for the very beginning of the day, or 23:59 for the end of the day.

-   to   +   to   - +
@@ -182,15 +182,15 @@

Normal Templates - Designed to fit your screen best

- avail_templates as $template) { ?> + avail_templates as $template) { ?>
- template_id==$template->id) echo ' checked'; ?>> - - " alt="name ?>"/> + template_id==$template->id) echo ' checked'; ?>> + + " alt="name ?>"/> -

name ?>
- creator) > 0){ echo "Created by: $template->creator
"; } ?> - modified) > 0){echo "Last Updated: " . date("M j, Y", strtotime($template->modified));} ?> +

name ?>
+ creator) > 0){ echo "Created by: $template->creator
"; } ?> + modified) > 0){echo "Last Updated: " . date("M j, Y", strtotime($template->modified));} ?>

@@ -202,15 +202,15 @@

Other Templates - Might look skewed or stretched on your screen

@@ -67,14 +67,14 @@ @@ -84,7 +84,7 @@ if(is_array($this->groups)) foreach($this->groups as $group) { ?> - + @@ -93,5 +93,5 @@
-nogroups) echo "disabled=disabled"; ?>/> +nogroups) echo "disabled=disabled"; ?>/> diff --git a/admin/app/screens/new.php b/admin/app/screens/new.php index 6efc218..e58f62d 100644 --- a/admin/app/screens/new.php +++ b/admin/app/screens/new.php @@ -25,7 +25,7 @@ */ ?>

Please fill out all fields to create a new screen.

-
+ diff --git a/admin/app/screens/show.php b/admin/app/screens/show.php index 2b0d6aa..0cc6627 100644 --- a/admin/app/screens/show.php +++ b/admin/app/screens/show.php @@ -28,16 +28,16 @@ $(document).ready(function() { $('a.t-preview').lightBox({ overlayBgColor: "#000", - imageLoading: "images/lightbox-ico-loading.gif", - imageBtnClose: "images/lightbox-btn-close.gif" + imageLoading: "images/lightbox-ico-loading.gif", + imageBtnClose: "images/lightbox-btn-close.gif" }); }); })(jQuery); //--> -canEdit) {?> -
Edit Screen
 -
Manage Subscriptions
 -
Delete Screen
+canEdit) {?> +
Edit Screen
 +
Manage Subscriptions
 +
Delete Screen
-

+


-

Location: screen->location?>

+

Location: screen->location?>

Size: screen->width.' x '.$this->screen->height.' ('.$ratio; ?>)

Status: screen->is_connected()) { ?> - screen->get_powerstate()) { ?> + screen->get_powerstate()) { ?> Online - + Asleep - + Offline (Last updated: screen->last_updated?>)

Group: - screen->group_id) ?> - name?> + screen->group_id) ?> + name?>

Template: - screen->template_id) ?> - name?> + screen->template_id) ?> + name?>

canEdit && $this->screen->controls_display) { ?> -

Hours of Operation: screen->time_on ?> - screen->time_off ?>

+

Hours of Operation: screen->time_on ?> - screen->time_off ?>

@@ -123,8 +123,8 @@ $mac=str_pad($this->screen->mac_inhex,12,'0',STR_PAD_LEFT); $mac=join(str_split($mac,2),':'); ?> -

MAC:

-

Last IP: screen->last_ip?>

+

MAC:

+

Last IP: screen->last_ip?>

@@ -139,9 +139,9 @@ ?>
-
+
-

name ?> (Field)

+

name ?> (Field)

    list_positions(); @@ -149,14 +149,14 @@ foreach($positions as $position) { $feed = new Feed($position->feed_id); ?> -
  • name?>
    • +
  • name?>
    • (no subscriptions)"; ?>
-
+
display content from ' + feed_name + ' (remove)') + .append('
  • display content from ' + feed_name + ' (remove)
    • ') .find("a.remove_feed").click(remove_feed); } return false; @@ -58,12 +58,12 @@ }); })(jQuery); //--> -preview +preview

    Your screen is divided up into several areas, called fields, each of which can display different types of content. Use these controls to select feeds (categories of content, i.e. Student Union, which contains student clubs' content) to place in each field, and how often to display each.


    - + screen->list_fields(); if(is_array($fields_list)){ @@ -71,10 +71,10 @@ ?>
    -
    +
    - -

    name ?> (Field)

    + +

    name ?> (Field)

      Very Often'; echo ''; echo ''; -?> display content from name)?> (remove) +?> display content from name)?> (remove) (no current subscriptions)'; ?> @@ -101,15 +101,15 @@ Add a feed to this field: Add

    -
    +

    - + - username != $user->username) { ?> + username != $user->username) { ?> @@ -89,17 +89,17 @@ - + - +
    Screen Size
    (W x H, in pixels)
    		 -   x   - +   x   +
    MAC Address
    		 - livecd['mac'] ?> + livecd['mac'] ?>
    Full Name
    		 - +
    Email
    		 - +
    System Notifications
    		 - allow_email) echo " CHECKED"?>> Yes, I want to recieve e-mail notices about system activity that concerns me (recommended). + allow_email) echo " CHECKED"?>> Yes, I want to recieve e-mail notices about system activity that concerns me (recommended).
    Username
    		 @@ -67,11 +67,11 @@
    Username
    		 - +
    Admin Privileges
    		 - admin_privileges) echo " CHECKED"?>> + admin_privileges) echo " CHECKED"?>>
    Username
    		 - username ?> + username ?>

    diff --git a/admin/app/users/edit.php b/admin/app/users/edit.php index 355a863..200076e 100644 --- a/admin/app/users/edit.php +++ b/admin/app/users/edit.php @@ -23,7 +23,7 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?> +?> diff --git a/admin/app/users/list.php b/admin/app/users/list.php index 0a04305..7f0c0fb 100644 --- a/admin/app/users/list.php +++ b/admin/app/users/list.php @@ -24,8 +24,8 @@ * @version $Revision$ */ ?> -
    New User
    - +
    New User
    +

    Click on a user to view his or her profile.

    users as $user){ ?> - > -

    name ?>

    + > +

    name ?>

    ").attr("class", "details") @@ -42,8 +42,8 @@ .insertAfter(parent) .find("#i-preview").lightBox({ overlayBgColor: "#000", - imageLoading: "images/lightbox-ico-loading.gif", - imageBtnClose: "images/lightbox-btn-close.gif" + imageLoading: "images/lightbox-ico-loading.gif", + imageBtnClose: "images/lightbox-btn-close.gif" }); $(parent).data("loaded", 1).expand_details(); }, @@ -103,21 +103,21 @@ }); })(jQuery); //--> -feed->type == 4) && ($this->feed->dyn->needs_update() > 0)){ ?> -

    Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

    -Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

    +
      -

    • Active

      • -
    • middlelastargs[4] == "expired") { ?> ui-tabs-selected">

      Expired

      • +

    • Active

      • +
    • middlelastargs[4] == "expired") { ?> ui-tabs-selected">

      Expired

      • feed->user_priv($_SESSION['user'], "moderate")) { ?> -
    • ui-tabs-selected">

      Declined

      • +
    • ui-tabs-selected">

      Declined

    @@ -129,7 +129,7 @@

    -
    +

     

    Please fill out all fields to create a new user.

    - + diff --git a/admin/app/users/newsfeed.php b/admin/app/users/newsfeed.php index a01482d..6ff870f 100644 --- a/admin/app/users/newsfeed.php +++ b/admin/app/users/newsfeed.php @@ -29,7 +29,7 @@ $("#news_expand").data('items',5); $("#news_expand").click(function(event) { - $.post("/users/notifications", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { + $.post("/users/notifications", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { var x = $("
    "+data+"
    "); $("#news_expand").before(x.hide()); x.slideDown("slow"); @@ -42,30 +42,30 @@
    -
    +
    - notifications) ?> - page > 0) { ?> -
    |<
     - - page > 0) {?> -
    <<
     - - 1) && $this->page < floor($this->notification_count / 25)) {?> -
    >>
     - - page < $num && $this->page < floor($this->notification_count / 25)) { ?> -
    >|
     - + notifications) ?> + page > 0) { ?> +
    |<
     + + page > 0) {?> +
    <<
     + + 1) && $this->page < floor($this->notification_count / 25)) {?> +
    >>
     + + page < $num && $this->page < floor($this->notification_count / 25)) { ?> +
    >|
     +
    -0) { ?> -

    Showing items start+1 ?> to start + count($this->notifications) ?> of notification_count ?> total notifications

    +0) { ?> +

    Showing items start+1 ?> to start + count($this->notifications) ?> of notification_count ?> total notifications

    notifications)) { foreach($this->notifications as $newsfeed) { ?> -

    text ?>timestamp) ?> +

    text ?>timestamp) ?> has_extra){ echo '
    '.$newsfeed->additional.''; @@ -75,9 +75,9 @@ } } ?> - +

    No more items to display.

    - +
    -
    +
    diff --git a/admin/app/users/notifications.php b/admin/app/users/notifications.php index d52f3e0..a41b225 100644 --- a/admin/app/users/notifications.php +++ b/admin/app/users/notifications.php @@ -26,7 +26,7 @@ if (is_array($this->notifications)) { foreach($this->notifications as $notification) { ?> -

    text ?>timestamp) ?> +

    text ?>timestamp) ?> has_extra){ echo '
    '.$notification->additional.''; diff --git a/admin/app/users/password.php b/admin/app/users/password.php old mode 100755 new mode 100644 index 0a09e13..7203a42 --- a/admin/app/users/password.php +++ b/admin/app/users/password.php @@ -1,4 +1,4 @@ - +

    @@ -23,4 +23,4 @@
    - \ No newline at end of file + diff --git a/admin/app/users/show.php b/admin/app/users/show.php index dd88195..d8a6962 100644 --- a/admin/app/users/show.php +++ b/admin/app/users/show.php @@ -37,7 +37,7 @@ event.preventDefault(); if($(this).data("news")) return; - $.post("/users/notifications/user->username ?>", {'start': $("#news_expand").data('items'), 'num': 7}, function(data) { + $.post("/users/notifications/user->username ?>", {'start': $("#news_expand").data('items'), 'num': 7}, function(data) { $("
    ").css("overflow", "hidden").html(data).hide().appendTo($("#news_expand")).slideDown("slow"); $("#news_expand").data('items',$("#news_expand").data('items')+7); if( data == "" ) { @@ -51,11 +51,11 @@ //--> canEdit) {?> -
    Edit Profile
    +
    Edit Profile

    -

    Username: user->username?>

    +

    Username: user->username?>

    Groups:

      Contact: user->email?> user->username == $_SESSION['user']->username) {?>

      user->username?>">Change Password

      - +
      -
      +

      News Feed

      @@ -83,7 +83,7 @@ if(is_array($this->notifications)) { foreach($this->notifications as $newsfeed) { ?> -

      text ?>timestamp) ?> +

      text ?>timestamp) ?> has_extra){ echo '
      '.$newsfeed->additional.''; @@ -96,10 +96,10 @@

      - +
      - +

      -
      +
      @@ -120,7 +120,7 @@ { foreach(array_keys($this->contents['approved']) as $field) $urls[]=''.$field.''; ?> -

      Jump to:

      +

      Jump to:

      This user has had no content approved on one or more feeds.

      "; @@ -145,7 +145,7 @@ if($contents){ foreach($contents as $content) { $submitter = new User($content->user_id); ?> -
    + - - + + contents['denied']) as $field) $urls[]=''.$field.''; ?> -

    Jump to:

    +

    Jump to:

    This user has had no content denied on all feeds.

    "; @@ -211,7 +211,7 @@ if($contents){ foreach($contents as $content) { $submitter = new User($content->user_id); ?> - + - - + + contents['pending']) as $field) $urls[]=''.$field.''; ?> -

    Jump to:

    +

    Jump to:

    This user has had no content pending moderation on all feeds.

    "; @@ -277,7 +277,7 @@ if($contents){ foreach($contents as $content) { $submitter = new User($content->user_id); ?> - + - - + + -
    +
    diff --git a/admin/app/users/signup.php b/admin/app/users/signup.php index f097bf8..ca0737b 100644 --- a/admin/app/users/signup.php +++ b/admin/app/users/signup.php @@ -25,7 +25,7 @@ */ ?>

    Welcome to Concerto!

    Please enter some information about yourself to get started.

    - + diff --git a/admin/app/wall/ext.php b/admin/app/wall/ext.php index a80edc5..2ec7a75 100644 --- a/admin/app/wall/ext.php +++ b/admin/app/wall/ext.php @@ -1,11 +1,11 @@ -feed->type == 3) || ($this->content->get_moderation_status($this->feed) != 1)){ ?> +feed->type == 3) || ($this->content->get_moderation_status($this->feed) != 1)){ ?> Invalid request. - +
    - <?= $this->content->name ?> + <?php echo $this->content->name ?>
    -submitter->name; } ?> -
    -

    content->start_time)) ?> content->start_time)) ?> to content->end_time)) ?> content->end_time)) ?>

    +
    +

    content->start_time)) ?> content->start_time)) ?> to content->end_time)) ?> content->end_time)) ?>

    -
    -

    Feed: feed->name ?>

    -

    By:

    +
    +

    Feed: feed->name ?>

    +

    By:

    - + - + - + diff --git a/admin/app/wall/feedgrid.php b/admin/app/wall/feedgrid.php index d3434ac..e7e6a7f 100644 --- a/admin/app/wall/feedgrid.php +++ b/admin/app/wall/feedgrid.php @@ -1,25 +1,25 @@
    -feed->name) <= 0 || $this->feed->type == 3) { ?> +feed->name) <= 0 || $this->feed->type == 3) { ?> Invalid request. - +
    - contents as $content) { ?> + contents as $content) { ?>
    - +
    - <?= $content->name ?> + <?php echo $content->name ?>
    - +
    - + - + - +
    diff --git a/admin/app/wall/index.php b/admin/app/wall/index.php index ac66ac0..66d848c 100644 --- a/admin/app/wall/index.php +++ b/admin/app/wall/index.php @@ -39,7 +39,7 @@ function loadFeed(id, feedname) { $.ajax({ type: "GET", - url: "/wall/feedgrid/"+id+"?ajax=1", + url: "/wall/feedgrid/"+id+"?ajax=1", success: function(data){ $('#wall_feed_insert').empty(); $("#progressbar").progressbar({ value: 0 }); @@ -108,9 +108,9 @@ function collapsePanel() {
    - feeds) || empty($this->feeds)) { ?> + feeds) || empty($this->feeds)) { ?> Sorry, there are no browsable feeds in the system at this time. - feeds as $id => $feed ) { $name = htmlspecialchars($feed['name']); @@ -118,8 +118,8 @@ function collapsePanel() { $name = substr($name, 0, 26) . '...'; } ?> -
    -
    +
    @@ -129,13 +129,13 @@ function collapsePanel() {

    Click to Select Feed

    - +
    @@ -153,6 +153,6 @@ function collapsePanel() { diff --git a/admin/docs_layout.php b/admin/docs_layout.php index 8d5cbc3..c3bf4db 100644 --- a/admin/docs_layout.php +++ b/admin/docs_layout.php @@ -28,21 +28,21 @@ -<?=$this->getTitle()?> - Concerto Support +<?php echo $this->getTitle()?> - Concerto Support - + - - - - + + + + - + - - - + + + @@ -52,10 +52,10 @@
    -
    - Concerto Support +
    + Concerto Support
    -

    Control Panel

    +

    Control Panel

      -

      getTitle()?>

      -

      getSubtitle()?>

      +

      getTitle()?>

      +

      getSubtitle()?>

      @@ -95,7 +95,7 @@ @@ -104,7 +104,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/ds_layout.php b/admin/ds_layout.php index 3dab24c..28c635f 100644 --- a/admin/ds_layout.php +++ b/admin/ds_layout.php @@ -29,32 +29,32 @@ <?php echo join(' - ',array($this->getTitle(), 'Concerto Panel'));?> - - - - - + + + + + - - - - + + + + - + - - - + + + @@ -65,14 +65,14 @@
      -

      getTitle()?>

      -

      getCrumbs()?>

      +

      getTitle()?>

      +

      getCrumbs()?>

      @@ -83,14 +83,14 @@
      - + @@ -99,7 +99,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/fpnew_layout.php b/admin/fpnew_layout.php index da96504..8985ed3 100644 --- a/admin/fpnew_layout.php +++ b/admin/fpnew_layout.php @@ -4,33 +4,33 @@ <?php echo join(' - ',array('Concerto Panel', $this->getTitle()));?> - - - - - + + + + + - - - - - + + + + + - + - - - + + + @@ -43,7 +43,7 @@ @@ -53,14 +53,14 @@
      - + @@ -69,7 +69,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/includes/left_menu.php b/admin/includes/left_menu.php index f27ae33..f820d4c 100644 --- a/admin/includes/left_menu.php +++ b/admin/includes/left_menu.php @@ -28,42 +28,41 @@
      -
      ConcertoConcerto
      -
      +
      -
      -
      -
      +
      + -

      Log In

      +

      Log In

      -

      Signup

      +

      Signup

      - - Welcome, '.firstName().'!


      '; ?> - - - - controls_afeed() || $_SESSION[user]->controls_ascreen()) { ?> - - - - Welcome, '.firstName().'!


      '; ?> + + + + controls_afeed() || $_SESSION[user]->controls_ascreen()) { ?> + + + +

      View Account
      -

      Logout

      - Logout +
      -
      +
      -

      Awaiting Moderation

      - - 0 && isAdmin()) {?> -

      items in other feeds...

      - +

      Awaiting Moderation

      + + 0 && isAdmin()) {?> +

      items in other feeds...

      +
      -
    diff --git a/admin/includes/menu_tabs.php b/admin/includes/menu_tabs.php index 55000b1..c1b783e 100644 --- a/admin/includes/menu_tabs.php +++ b/admin/includes/menu_tabs.php @@ -31,18 +31,18 @@ if(isLoggedIn()) { //We will change this! ?> <?php echo join(' - ',array('Concerto', $this->getTitle()));?> - + - - - - - + + + + + - - + + @@ -57,7 +57,7 @@
    -

    getTitle()?>

    +

    getTitle()?>

    @@ -78,7 +78,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/stripped_ds_layout.php b/admin/stripped_ds_layout.php index 6b61cd9..03cb75e 100644 --- a/admin/stripped_ds_layout.php +++ b/admin/stripped_ds_layout.php @@ -29,20 +29,20 @@ <?php echo join(' - ',array($this->getTitle(), 'Concerto Panel'));?> - - - + + + - - - + + + - + - - - + + + @@ -63,7 +63,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/common/content.php b/common/content.php index 888399b..904ed57 100644 --- a/common/content.php +++ b/common/content.php @@ -1,4 +1,4 @@ - $templates){ - $scr = new Screen($key); - $templates = remove_element($templates, $scr->template_id); - $new_key = array_rand($templates,1); - $scr->template_id = $templates[$new_key]; - $scr->set_properties(); - } - echo "Template rotation complete.\n"; - } - echo "Hourly job complete.\n"; - } - //End template rotation -} -function always(){ - //First generate new content for dynamic feeds - $feed_handler = new Feed(); - if($feeds = $feed_handler->get_all("WHERE type = 1 OR type = 4")){ - foreach($feeds as $feed){ - echo "Calling $feed->name for update. \n"; - if($feed->dyn->update()){ - echo "Updated $feed->name OK\n"; - } else { - echo "Error updating $feed->name\n"; - echo "Dynamic Status: {$feed->dyn->status}\n"; - echo ""; - print_r($feed); - echo ""; - } - echo "Status: " . $feed->dyn->status . "\n"; - - } - } - //Then generate the newsfeed! - echo "Begin notification processing...\n"; - $notif = new Notification(); - $notif->process(20); //If more than 20 are generated the system might be under high load. - echo "Done processing notifications. \n"; - - // Send email notifications if the screens are not online - echo "Scanning for recently downed screens...\n"; - screen_offline_mail( ); - echo "Done scanning for downed screens.\n"; -} - -function screen_offline_mail( ) { - # Query all screens and mail a report if any are offline - $screens = Screen::get_all( ); - if(!is_array($screens)){ - return false; - } - $downed_screens = Array( ); - foreach ($screens as $screen) { - if ($screen->went_down() && $screen->type == 0) { - $downed_screens[] = $screen; - } - } - - # construct email report if any screens have gone down in last 2 hours - if (count($downed_screens) > 0) { - $admin = new Group(ADMIN_GROUP_ID); - - $mail_body = "The following Concerto screens have gone offline. Please investigate.\n"; - //$mail_body .= "NOTE: THIS EMAIL IS A TEST, IT IS ONLY A TEST. FEEL FREE TO IGNORE.\n"; - foreach ($downed_screens as $screen) { - $name = $screen->name; - echo "Found downed screen $name.\n"; - $location = $screen->location; - $mac = $screen->mac_inhex; - $last_ip = $screen->last_ip; - - $mail_body .= "$name (at $location, last ip $last_ip mac $mac)\n"; - } - - $admin->send_mail("Screen Outage Detected", $mail_body); - } -} - -//Tiny helper function for the template rotation -function remove_element($arr, $val){ - foreach ($arr as $key => $value){ - if ($arr[$key] == $val){ - unset($arr[$key]); - } - } - return $arr = array_values($arr); -} - -//Scan for content still in the moderation queue that has expired and deny it -function deny_expired(){ - $notification = "The content was denied automatically. A moderator did not review this item before the expiration date."; - $feeds = Feed::get_all(); - foreach($feeds as $feed){ - $contents = $feed->content_get('NULL'); //Content that hasn't been moderated - if($contents){ - foreach($contents as $content){ - if(strtotime($content['content']->end_time) < strtotime('NOW')){ - $feed->content_mod($content['content']->id, 0, 0, $content['content']->get_duration($feed),$notification); - echo "Denied {$content['content']->name} on {$feed->name}\n"; - } - } - } - } -} - -?> + $templates){ + $scr = new Screen($key); + $templates = remove_element($templates, $scr->template_id); + $new_key = array_rand($templates,1); + $scr->template_id = $templates[$new_key]; + $scr->set_properties(); + } + echo "Template rotation complete.\n"; + } + echo "Hourly job complete.\n"; + } + //End template rotation +} +function always(){ + //First generate new content for dynamic feeds + $feed_handler = new Feed(); + if($feeds = $feed_handler->get_all("WHERE type = 1 OR type = 4")){ + foreach($feeds as $feed){ + echo "Calling $feed->name for update. \n"; + if($feed->dyn->update()){ + echo "Updated $feed->name OK\n"; + } else { + echo "Error updating $feed->name\n"; + echo "Dynamic Status: {$feed->dyn->status}\n"; + echo ""; + print_r($feed); + echo ""; + } + echo "Status: " . $feed->dyn->status . "\n"; + + } + } + //Then generate the newsfeed! + echo "Begin notification processing...\n"; + $notif = new Notification(); + $notif->process(20); //If more than 20 are generated the system might be under high load. + echo "Done processing notifications. \n"; + + // Send email notifications if the screens are not online + echo "Scanning for recently downed screens...\n"; + screen_offline_mail( ); + echo "Done scanning for downed screens.\n"; +} + +function screen_offline_mail( ) { + # Query all screens and mail a report if any are offline + $screens = Screen::get_all( ); + if(!is_array($screens)){ + return false; + } + $downed_screens = Array( ); + foreach ($screens as $screen) { + if ($screen->went_down() && $screen->type == 0) { + $downed_screens[] = $screen; + } + } + + # construct email report if any screens have gone down in last 2 hours + if (count($downed_screens) > 0) { + $admin = new Group(ADMIN_GROUP_ID); + + $mail_body = "The following Concerto screens have gone offline. Please investigate.\n"; + //$mail_body .= "NOTE: THIS EMAIL IS A TEST, IT IS ONLY A TEST. FEEL FREE TO IGNORE.\n"; + foreach ($downed_screens as $screen) { + $name = $screen->name; + echo "Found downed screen $name.\n"; + $location = $screen->location; + $mac = $screen->mac_inhex; + $last_ip = $screen->last_ip; + + $mail_body .= "$name (at $location, last ip $last_ip mac $mac)\n"; + } + + $admin->send_mail("Screen Outage Detected", $mail_body); + } +} + +//Tiny helper function for the template rotation +function remove_element($arr, $val){ + foreach ($arr as $key => $value){ + if ($arr[$key] == $val){ + unset($arr[$key]); + } + } + return $arr = array_values($arr); +} + +//Scan for content still in the moderation queue that has expired and deny it +function deny_expired(){ + $notification = "The content was denied automatically. A moderator did not review this item before the expiration date."; + $feeds = Feed::get_all(); + foreach($feeds as $feed){ + $contents = $feed->content_get('NULL'); //Content that hasn't been moderated + if($contents){ + foreach($contents as $content){ + if(strtotime($content['content']->end_time) < strtotime('NOW')){ + $feed->content_mod($content['content']->id, 0, 0, $content['content']->get_duration($feed),$notification); + echo "Denied {$content['content']->name} on {$feed->name}\n"; + } + } + } + } +} + +?> diff --git a/common/scripts/mail.php b/common/scripts/mail.php index f549435..a84a55f 100644 --- a/common/scripts/mail.php +++ b/common/scripts/mail.php @@ -1,4 +1,4 @@ -\n"; ?> - - + diff --git a/common/template.php b/common/template.php index f3b148d..fefbab9 100644 --- a/common/template.php +++ b/common/template.php @@ -1,4 +1,4 @@ - -
    -
    name ?>
    -mime_type,'image')){ ?> -
    content ?>
    - -
    <?= htmlspecialchars($content->name) ?>
    - +
    +
    name ?>
    +mime_type,'image')){ ?> +
    content ?>
    + +
    <?php echo htmlspecialchars($content->name) ?>
    +
    - - <?= htmlspecialchars($feed_title) ?> - http:/// + <?php echo htmlspecialchars($feed_title) ?> + http:/// RSS Feed from Concerto API en-us - + Concerto API 0.07 - + - /images/conc_logowhitebg_sm.jpg + /images/conc_logowhitebg_sm.jpg Concerto - + 700 185 -id . '&select=content&format=rss'; $link = htmlspecialchars($link); $feeds = $content->list_feeds(); @@ -239,39 +239,39 @@ function render_rss($content_arr, $criteria){ } ?> - <?= htmlspecialchars($content->name) ?> - - - submitted) ?> - username ?> (name) ?>) - id ?> -name) ?> + + + submitted) ?> + username ?> (name) ?>) + id ?> +type != 3){ $feed = $feed_obj['feed']; $feed_link = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . '?' . criteria_string($criteria) . "&select=feed&select_id={$feed->id}&format=rss"; ?> - name) ?> -">name) ?> +mime_type,'image') !== false){ ?> - - name) ?> - -" type="mime_type ?>" expression="full" /> + name) ?> + + - start=start_time) ?>; - end=end_time) ?>; + start=start_time) ?>; + end=end_time) ?>; scheme=W3C-DTF - + - - - - + + - - - - - + - -
    -
    name ?>
    -mime_type,'image')){ ?> -
    content ?>
    - -
    <?= htmlspecialchars($content->name) ?>
    - +
    +
    name ?>
    +mime_type,'image')){ ?> +
    content ?>
    + +
    <?php echo htmlspecialchars($content->name) ?>
    +
    - -mime_type,'image')){ ?> - content ?> - - <?= htmlspecialchars($content->name) ?> - -mime_type,'image')){ ?> + content ?> + + <?php echo htmlspecialchars($content->name) ?> + + - <?= htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// RSS Feed from Concerto API en-us - + Concerto API 0.08 - (Concerto Digital Signage) - + (Concerto Digital Signage) + - /images/concerto_48x48.png - <?= htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + /images/concerto_48x48.png + <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// 48 48 - - <?= htmlspecialchars($content->name) ?> - - - submitted) ?> - email ?> (name)) ?>) - /content/show/id ?> -name) ?> + + + submitted) ?> + email ?> (name)) ?>) + /content/show/id ?> +type != 3){ $feed = $feed_obj['feed']; $feed_link = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . '?' . criteria_string($criteria) . "&select=feed&select_id={$feed->id}&format=rss"; ?> - name) ?> -">name) ?> +mime_type,'image') !== false){ ?> - - - name) ?> - -" type="mime_type ?>" length='0'/> + + name) ?> + + - start=start_time) ?>; - end=end_time) ?>; + start=start_time) ?>; + end=end_time) ?>; scheme=W3C-DTF - + - - - - + + - - - - - + - -
    -
    name ?>
    -mime_type,'image')){ ?> -
    content ?>
    - -
    <?= htmlspecialchars($content->name) ?>
    - +
    +
    name ?>
    +mime_type,'image')){ ?> +
    content ?>
    + +
    <?php echo htmlspecialchars($content->name) ?>
    +
    - -mime_type,'image')){ ?> - content ?> - - <?= htmlspecialchars($content->name) ?> - -mime_type,'image')){ ?> + content ?> + + <?php echo htmlspecialchars($content->name) ?> + + - <?= htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// RSS Feed from Concerto API en-us - + Concerto API 0.09 - (Concerto Digital Signage) - + (Concerto Digital Signage) + - /images/concerto_48x48.png - <?= htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + /images/concerto_48x48.png + <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// 48 48 - - <?= htmlspecialchars($content->name) ?> - - - submitted) ?> - email ?> (name)) ?>) - /content/show/id ?> -name) ?> + + + submitted) ?> + email ?> (name)) ?>) + /content/show/id ?> +type != 3){ $feed = $feed_obj['feed']; $feed_link = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . '?' . criteria_string($criteria) . "&select=feed&select_id={$feed->id}&format=rss"; ?> - name) ?> -">name) ?> +mime_type,'image') !== false){ ?> - - - name) ?> - -" type="mime_type ?>" length='0'/> + + name) ?> + + - start=start_time) ?>; - end=end_time) ?>; + start=start_time) ?>; + end=end_time) ?>; scheme=W3C-DTF - + - - - - + + - - - - - + - Rename To: - +

    @@ -175,7 +175,7 @@ function do_remove_file($class_obj) {

    Input MAC Address: - +

    @@ -238,7 +238,7 @@ function do_remove_file($class_obj) { as : - + diff --git a/hardware/admin/override.php b/hardware/admin/override.php index 81e6582..d09e683 100644 --- a/hardware/admin/override.php +++ b/hardware/admin/override.php @@ -78,7 +78,7 @@ function do_write($class_obj, $path) { - +

    diff --git a/install/diagnostics.php b/install/diagnostics.php index ae88a34..5d7b892 100644 --- a/install/diagnostics.php +++ b/install/diagnostics.php @@ -41,19 +41,19 @@

    This page checks some system settings and configuration options to help judge if Concerto will work as intended. It is by no means exhaustive or all inclusive.

    PHP Enviroment

      -
    • PHP Version:
      • -
    • MySQL Support:
      • -
    • GD Support:
      • -
    • JSON Support:
      • -
    • PATH INFO Global:
      • +
    • PHP Version:
      • +
    • MySQL Support:
      • +
    • GD Support:
      • +
    • JSON Support:
      • +
    • PATH INFO Global:

    Concerto Config

      -
    • Config access:
      • -
    • Common Directory:
      • -
    • Image Upload Directory:
      • -
    • Template Upload Directory:
      • -
    • MySQL Connection test:
      • +
    • Config access:
      • +
    • Common Directory:
      • +
    • Image Upload Directory:
      • +
    • Template Upload Directory:
      • +
    • MySQL Connection test:
    @@ -157,4 +157,4 @@ function string_ends_with($string, $ending){ $string_end = substr($string, strlen($string) - $len); return $string_end == $ending; } -?> \ No newline at end of file +?> diff --git a/install/schema.sql b/install/schema.sql old mode 100755 new mode 100644 diff --git a/screen/index.php b/screen/index.php index 7aab3d9..dc7188d 100644 --- a/screen/index.php +++ b/screen/index.php @@ -47,7 +47,7 @@ +$(document).ready(function(){$.signage();});//--> diff --git a/screen/missing.php b/screen/missing.php index b83ef83..d8d7a2f 100644 --- a/screen/missing.php +++ b/screen/missing.php @@ -80,8 +80,8 @@
    From 74f66186e7c429a514d51cc229b01585128e8284 Mon Sep 17 00:00:00 2001 From: Kevin Russell Date: Fri, 29 Jul 2011 08:59:19 -0600 Subject: [PATCH 4/8] Revert "Changed the PHP tags from short tags to long tags" This reverts commit 9de6c831ccddf8af0048f672677aae92e7499000. --- admin/app/browse/details.php | 26 +- admin/app/browse/feed.php | 52 ++-- admin/app/browse/list.php | 36 +-- admin/app/browse/show.php | 32 +- admin/app/content/_form.php | 18 +- admin/app/content/edit.php | 4 +- admin/app/content/list.php | 28 +- admin/app/content/new.php | 26 +- admin/app/content/new_dynamic.php | 18 +- admin/app/content/new_image.php | 6 +- admin/app/content/new_preview.php | 2 +- admin/app/content/new_ticker.php | 6 +- admin/app/content/show.php | 16 +- admin/app/content/signup.php | 2 +- admin/app/feeds/_form.php | 8 +- admin/app/feeds/edit.php | 2 +- admin/app/feeds/list.php | 18 +- admin/app/feeds/moderate.php | 24 +- admin/app/feeds/new.php | 2 +- admin/app/feeds/request.php | 4 +- admin/app/feeds/show.php | 24 +- admin/app/frontpage/addtemplate.php | 2 +- admin/app/frontpage/admin.php | 24 +- admin/app/frontpage/dashboard.php | 86 +++--- admin/app/frontpage/index.php | 8 +- admin/app/frontpage/login.php | 8 +- admin/app/frontpage/mailer.php | 10 +- admin/app/frontpage/miniscreen.php | 2 +- admin/app/groups/_form.php | 2 +- admin/app/groups/add.php | 4 +- admin/app/groups/edit.php | 2 +- admin/app/groups/list.php | 10 +- admin/app/groups/new.php | 2 +- admin/app/groups/remove.php | 2 +- admin/app/groups/show.php | 46 +-- admin/app/moderate/confirm.php | 28 +- admin/app/moderate/feed.php | 44 +-- admin/app/page_categories/_form.php | 8 +- admin/app/page_categories/edit.php | 2 +- admin/app/page_categories/list.php | 6 +- admin/app/page_categories/moderate.php | 24 +- admin/app/page_categories/new.php | 2 +- admin/app/page_categories/show.php | 14 +- admin/app/pages/_feedback.php | 14 +- admin/app/pages/_form.php | 14 +- admin/app/pages/edit.php | 2 +- admin/app/pages/list.php | 26 +- admin/app/pages/new.php | 2 +- admin/app/pages/show.php | 2 +- admin/app/screens/_form.php | 82 ++--- admin/app/screens/edit.php | 2 +- admin/app/screens/list.php | 20 +- admin/app/screens/livecd.php | 14 +- admin/app/screens/new.php | 2 +- admin/app/screens/show.php | 44 +-- admin/app/screens/subscriptions.php | 22 +- admin/app/users/_form.php | 20 +- admin/app/users/edit.php | 2 +- admin/app/users/list.php | 8 +- admin/app/users/new.php | 2 +- admin/app/users/newsfeed.php | 42 +-- admin/app/users/notifications.php | 2 +- admin/app/users/password.php | 4 +- admin/app/users/show.php | 52 ++-- admin/app/users/signup.php | 2 +- admin/app/wall/ext.php | 26 +- admin/app/wall/feedgrid.php | 20 +- admin/app/wall/index.php | 16 +- admin/docs_layout.php | 34 +- admin/ds_layout.php | 44 +-- admin/fpnew_layout.php | 42 +-- admin/includes/left_menu.php | 53 ++-- admin/includes/menu_tabs.php | 24 +- admin/js/ui.jquery.js | 0 admin/js/ui.progressbar-custom.min.js | 0 admin/livecd_layout.php | 26 +- admin/stripped_ds_layout.php | 22 +- common/content.php | 2 +- common/dynamic.php | 2 +- common/feed.php | 2 +- common/field.php | 2 +- common/group.php | 2 +- common/newsfeed.php | 2 +- common/notification.php | 2 +- common/position.php | 2 +- common/screen.php | 2 +- common/scripts/cron.php | 412 ++++++++++++------------- common/scripts/mail.php | 2 +- common/scripts/notifications.php | 2 +- common/scripts/template_exp.php | 38 +-- common/template.php | 2 +- common/upload.php | 2 +- common/user.php | 2 +- content/render/api/000.php | 2 +- content/render/api/005.php | 2 +- content/render/api/006.php | 2 +- content/render/api/007.php | 84 ++--- content/render/api/008.php | 102 +++--- content/render/api/009.php | 102 +++--- content/render/index.php | 2 +- content/render/render.php | 2 +- hardware/admin/class.php | 6 +- hardware/admin/override.php | 2 +- install/diagnostics.php | 22 +- install/schema.sql | 0 screen/index.php | 2 +- screen/missing.php | 4 +- 107 files changed, 1095 insertions(+), 1094 deletions(-) mode change 100644 => 100755 admin/app/frontpage/login.php mode change 100644 => 100755 admin/app/users/password.php mode change 100644 => 100755 admin/js/ui.jquery.js mode change 100644 => 100755 admin/js/ui.progressbar-custom.min.js mode change 100644 => 100755 content/render/api/005.php mode change 100644 => 100755 install/schema.sql diff --git a/admin/app/browse/details.php b/admin/app/browse/details.php index 427edaa..9c79407 100644 --- a/admin/app/browse/details.php +++ b/admin/app/browse/details.php @@ -25,15 +25,15 @@ */ ?>
    mime_type)) { echo "id\">id?width=50&height=37\" alt=\"Icon\" />"; @@ -155,10 +155,10 @@ echo " "; } ?> - name) ?> + name) ?> start_time))?>end_time))?>start_time))?>end_time))?>
    mime_type)) { echo "id\">id?width=50&height=37\" alt=\"Icon\" />"; @@ -221,10 +221,10 @@ echo " "; } ?> - name) ?> + name) ?> start_time))?>end_time))?>start_time))?>end_time))?>
    mime_type)) { echo "id\">id?width=50&height=37\" alt=\"Icon\" />"; @@ -287,10 +287,10 @@ echo " "; } ?> - name) ?> + name) ?> start_time))?>end_time))?>start_time))?>end_time))?>
     
    - The MAC address cannot be found in the database.
    - Please verify that this screen has been added to the system. + The MAC address cannot be found in the database.
    + Please verify that this screen has been added to the system.
    -
    " style="width:250px"> -content->mime_type)) { ?> - -content->mime_type)) { ?> - content->content ?> - +" style="width:250px"> +content->mime_type)) { ?> + +content->mime_type)) { ?> + content->content ?> + -

    content->name ?> +

    content->name ?> feed->user_priv($_SESSION['user'], 'moderate')) { if($this->status==0) { @@ -43,12 +43,12 @@ } } ?>

    - content->start_time)) ?> - content->end_time)) ?> week_range > 1) echo "({$this->week_range} Weeks)" ?> -

    Display duration: Duration dur_str?>

    -

    Submitted by submitter->name ?>

    -moderator->id != false) { ?> -

    Moderated by moderator->name ?>

    - + content->start_time)) ?> - content->end_time)) ?> week_range > 1) echo "({$this->week_range} Weeks)" ?> +

    Display duration: Duration dur_str?>

    +

    Submitted by submitter->name ?>

    +moderator->id != false) { ?> +

    Moderated by moderator->name ?>

    +
    diff --git a/admin/app/browse/feed.php b/admin/app/browse/feed.php index d925c90..1de4873 100644 --- a/admin/app/browse/feed.php +++ b/admin/app/browse/feed.php @@ -24,46 +24,46 @@ * @version $Revision$ */ ?> -feed->user_priv($_SESSION['user'], "edit")) { ?> -
    Edit Feed
     -
    Delete Feed
     +feed->user_priv($_SESSION['user'], "edit")) { ?> +
    Edit Feed
     +
    Delete Feed
    - + feed->user_priv($_SESSION['user'], "moderate")){ ?> -feed->description)>0) { ?> +feed->description)>0) { ?>

    Description:

    -

    feed->description ?>

    - -

    Moderation status: waiting > 0 ? $this->waiting : "No" ?> items awaiting moderation

    -feed->description ?>

    + +

    Moderation status: waiting > 0 ? $this->waiting : "No" ?> items awaiting moderation

    + -

    This feed is moderated by group->name) ?>.

    -This feed is moderated by group->name) ?>.

    +feed->type == 4) && ($this->feed->dyn->needs_update() > 0)){ ?> -

    Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

    -Currently Processing:   This dynamic feed has feed->dyn->needs_update()?> unprocessed item(s). It should be ready within a couple minutes.

    +

    Content

      -feed->get_types())) foreach($this->feed->get_types() as $type_id => $type){ ?> -
    • args[2]}" : "" ?>">
      • - +feed->get_types())) foreach($this->feed->get_types() as $type_id => $type){ ?> +
    • args[2]}" : "" ?>">
      • +

    Feed Statistics

      -
    • Active and Future Content: active_content ?>
      • -
    • Expired Content: expired_content ?>
      • +
    • Active and Future Content: active_content ?>
      • +
    • Expired Content: expired_content ?>
    -feed->get_screens(); ?> -0) { ?> +feed->get_screens(); ?> +0) { ?>

    Active Screens

      id; ?> -
    • name ?> -(name ?> +( -field_name ?> - -field_name ?> + +'; } ?>
    - + diff --git a/admin/app/browse/list.php b/admin/app/browse/list.php index b27fce2..9b135d7 100644 --- a/admin/app/browse/list.php +++ b/admin/app/browse/list.php @@ -26,24 +26,24 @@ ?>
    -
    +
    - -

    -

    Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

    + +

    +

    Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

    -
    +
    -
    +
    -
    New Feed
     - -
    Request a Feed
     - +
    New Feed
     + +
    Request a Feed
     +
    feeds[$feed_key['key']]) > 0){ ?> -

    -

    +

    +

    - - + + - + - +

    name) ?> Feed

    Moderated by group_id) ?>name ?>

    name) ?> Feed

    Moderated by group_id) ?>name ?>

    description ?>

    description ?>
    @@ -98,12 +98,12 @@ ?>

    -


    -

    Would you like to see a feed for another category of content? Request a feed today!

    +

    Would you like to see a feed for another category of content? Request a feed today!

    diff --git a/admin/app/browse/show.php b/admin/app/browse/show.php index a9d83df..48fd3ea 100644 --- a/admin/app/browse/show.php +++ b/admin/app/browse/show.php @@ -31,9 +31,9 @@ $(this).data("loaded", 0); var parent = this; $.ajax({type: "POST", - url: "/browse/details", + url: "/browse/details", data: {"content_id": $(parent).attr("id").replace(/c/,""), - "feed_id": feed->id?> + "feed_id": feed->id?> }, success: function(html){ $("

    @@ -148,7 +148,7 @@ foreach($this->contents as $content) { $submitter = new User($content->user_id); ?> - + - - + + -
    +
    diff --git a/admin/app/content/_form.php b/admin/app/content/_form.php index cb2faf0..9774b07 100644 --- a/admin/app/content/_form.php +++ b/admin/app/content/_form.php @@ -35,13 +35,13 @@
    mime_type)) { echo "id?width=50&height=37\" alt=\"Icon\" />"; @@ -158,10 +158,10 @@ echo " "; } ?> - name ?> + name ?> start_time))?>end_time))?>start_time))?>end_time))?> user_id); echo htmlspecialchars($user->name) ?>
    Title

    Enter some words that describe this piece of content to others.

    		 - +
    Start Date

    When should this piece of content start to be displayed on Concerto?

    		 - +

    Starting at the beginning of the day (12:00am)

    		 Set a different start time @@ -75,7 +75,7 @@
    End Date

    When should this piece of content expire? This might be the date of the event you are advertising.

    		 - +

    Showing through the end of the day (11:59pm)

    		 Set a different end time @@ -109,15 +109,15 @@
    Duration

    For how long should this piece of content be displayed on a screen?

    		 -
    Default is seconds
    - +
    Default is seconds
    +     		Set a different duration


    -

    Not sure what feeds are? Read this first!

    +

    Not sure what feeds are? Read this first!

    @@ -143,10 +143,10 @@ $scrcnt = count($screens); ?> + title="description ? $feed->description : ' '?> Displays on screen0) ? ': '.join(', ',$screens) : '. ' ?>" + value="id?>">name)?> - +

    diff --git a/admin/app/content/edit.php b/admin/app/content/edit.php index 6adfa59..6e08f32 100644 --- a/admin/app/content/edit.php +++ b/admin/app/content/edit.php @@ -23,9 +23,9 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
    View user->firstname?>'s Profile
    +?>
    View user->firstname?>'s Profile
    -
    + diff --git a/admin/app/content/list.php b/admin/app/content/list.php index 81dce1a..59be601 100644 --- a/admin/app/content/list.php +++ b/admin/app/content/list.php @@ -23,7 +23,7 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
    Submit Content
    +?>
    Submit Content

    All active content in the system is shown. Click on a title for details.

    contents) && count($this->contents>1)) @@ -31,7 +31,7 @@ foreach(array_keys($this->contents) as $field) $urls[]=''.$field.''; ?> -

    Jump to: +

    Jump to:

    - + -
    		name ?> start_time)) ?> - end_time)) ?>
    + name ?> start_time)) ?> - end_time)) ?> - > - - + > + + - > - -

    name?>

    + > + +

    name?>

    mime_type == "text/plain") echo "$content->content
    \n"; ?> - start_time))?> - end_time))?>     - ( ) -

    Submitted by name?>

    + start_time))?> - end_time))?> + ( ) +

    Submitted by name?>

    diff --git a/admin/app/content/new.php b/admin/app/content/new.php index 538b84e..53a124c 100644 --- a/admin/app/content/new.php +++ b/admin/app/content/new.php @@ -30,7 +30,7 @@ $.datepicker.setDefaults({showOn: 'both', buttonImageOnly: true, - buttonImage: 'images/cal_icon.gif', + buttonImage: 'images/cal_icon.gif', buttonText: 'Calendar', showAnum: "fadeIn"}); @@ -90,7 +90,7 @@ $("#content").keyup(function() { var length = $(this).val().length; - var limit = ; + var limit = ; if( length > limit ) { $(this).val($(this).val().substring(0, limit)); return false; @@ -125,7 +125,7 @@ function update(child, desc) { if(count == undefined) count = 0; var feeddiv = $(this).parents("tr").find(".feeddiv:last"); - $("

    ").html("We strongly encourage you to submit to just one feed in most situations.

    Adding your content to multiple feeds does NOT necessarily mean that it will appear on multiple screens. Please review the help page for more details. Are you sure you want to continue?") + $("

    ").html("We strongly encourage you to submit to just one feed in most situations.

    Adding your content to multiple feeds does NOT necessarily mean that it will appear on multiple screens. Please review the help page for more details. Are you sure you want to continue?") .dialog({ autoResize: true, buttons: { @@ -156,25 +156,25 @@ function update(child, desc) { //-->


    -
    +
    - - + +
    - - + +
    - has_ndc_rights()) { $content_type = NULL; //hmm. @@ -184,6 +184,6 @@ function update(child, desc) {
    -
    +
    diff --git a/admin/app/content/new_dynamic.php b/admin/app/content/new_dynamic.php index 2b32fdc..5d33003 100644 --- a/admin/app/content/new_dynamic.php +++ b/admin/app/content/new_dynamic.php @@ -37,7 +37,7 @@ title: "Loading..." }); $.ajax({type: "GET", - url: "/content/new_preview/", + url: "/content/new_preview/", data: {"feed_id": $("#dd_feed", form).val(), "name": $("#dd_name", form).val(), "content": $("#dd_content", form).val(), @@ -79,12 +79,12 @@ })(jQuery); //-->
    - +

    Add Dynamic Text

    Fill in these details to post a dynamic data item to Concerto.

    - +

    @@ -100,10 +100,10 @@ foreach ($this->ndc_feeds as $arr) { list($feed, $value) = $arr;?> + title="description ? $feed->description : ' '?>" + value="id?>">name?> - +
    @@ -118,7 +118,7 @@ @@ -140,7 +140,7 @@ @@ -53,7 +53,7 @@ if(is_array($groups)) foreach($groups as $group) { ?> - + @@ -67,7 +67,7 @@ $types[3] = "Private"; foreach($types as $t_id => $t_name) { ?> - + diff --git a/admin/app/feeds/edit.php b/admin/app/feeds/edit.php index db3a3e0..a8fa7f7 100644 --- a/admin/app/feeds/edit.php +++ b/admin/app/feeds/edit.php @@ -24,7 +24,7 @@ * @version $Revision$ */ ?> +action="/feeds/update/feed->id?>"> diff --git a/admin/app/feeds/list.php b/admin/app/feeds/list.php index 40fb4ff..b7beb4b 100644 --- a/admin/app/feeds/list.php +++ b/admin/app/feeds/list.php @@ -24,22 +24,22 @@ * @version $Revision$ */ ?> -
    New Feed
     - -
    Request a Feed
     - +
    New Feed
     + +
    Request a Feed
     +
    -

    Click on a feed for more information. Extra Help

    +

    Click on a feed for more information. Extra Help

    Title

    Enter the title.

    		 - +
    Start Date

    When does the event start?

    		 Date: - + Time:
    End Date

    When does the event end?

    		 Date: - + Time: diff --git a/admin/app/content/new_preview.php b/admin/app/content/new_preview.php index 61ed395..af4f199 100644 --- a/admin/app/content/new_preview.php +++ b/admin/app/content/new_preview.php @@ -24,7 +24,7 @@ * @version $Revision$ */ ?>
    -set){ diff --git a/admin/app/content/new_ticker.php b/admin/app/content/new_ticker.php index a992bcd..ad2f649 100644 --- a/admin/app/content/new_ticker.php +++ b/admin/app/content/new_ticker.php @@ -24,19 +24,19 @@ * @version $Revision$ */ ?>
    - +

    Add Ticker Text

    Fill in these details to post a text announcement to Concerto.

    - +

    File to Upload

    Specify the file you would like to upload to Concerto.

    Ticker Text

    Enter the text announcement or message that will be displayed.

    		 -

    Please limit your ticker to characters of plain text.

    +

    Please limit your ticker to characters of plain text.
    diff --git a/admin/app/content/show.php b/admin/app/content/show.php index 2ee48ff..157dbcf 100644 --- a/admin/app/content/show.php +++ b/admin/app/content/show.php @@ -24,29 +24,29 @@ * @version $Revision$ */ ?>canEdit) {?> - -
    Delete Item
    + +
    Delete Item

    content->mime_type)) { ?> - -Content Image + +Content Image -
    -content->content ?> +
    +content->content ?>
    -

    Run dates: content->start_time))?> - content->end_time))?>

    +

    Run dates: content->start_time))?> - content->end_time))?>

    -

    Submitted By: submitter->name?>

    +

    Submitted By: submitter->name?>


    Welcome to Concerto!

    Please enter some information about yourself to get started.

    - + diff --git a/admin/app/feeds/_form.php b/admin/app/feeds/_form.php index f3116c6..d630d12 100644 --- a/admin/app/feeds/_form.php +++ b/admin/app/feeds/_form.php @@ -36,13 +36,13 @@
    Feed Name
    		 - +
    Description
    		 - +
    feeds){ foreach($this->feeds as $feed){ ?> contents) as $field) $urls[]=''.$field.''; ?> -

    Jump to: +

    Jump to:

    mime_type)) { $has_imagecol=1; ?> - > - - + > + + - diff --git a/admin/app/feeds/new.php b/admin/app/feeds/new.php index 54de0de..0a4de92 100644 --- a/admin/app/feeds/new.php +++ b/admin/app/feeds/new.php @@ -25,7 +25,7 @@ */ ?>

    Please fill out all fields to create a new Feed.

    - + diff --git a/admin/app/feeds/request.php b/admin/app/feeds/request.php index c4a5736..e175d40 100644 --- a/admin/app/feeds/request.php +++ b/admin/app/feeds/request.php @@ -25,8 +25,8 @@ */ ?>

    Please fill out all fields to request a new feed.

    -

    Feeds in Concerto are broad categories for content submission. Most content at should fit into one of our existing feeds, but if you think your content fits into a specific category that should be separate from existing feeds on Concerto, we'd love to hear about it.

    -

    See the Support Center for more information about feeds.

    +

    Feeds in Concerto are broad categories for content submission. Most content at should fit into one of our existing feeds, but if you think your content fits into a specific category that should be separate from existing feeds on Concerto, we'd love to hear about it.

    +

    See the Support Center for more information about feeds.

    If your feed request is approved, we'll be contacting you shortly about setting up a controlling group for the feed.

    diff --git a/admin/app/feeds/show.php b/admin/app/feeds/show.php index 06488f6..3f3ab3f 100644 --- a/admin/app/feeds/show.php +++ b/admin/app/feeds/show.php @@ -23,19 +23,19 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>feed->user_priv($_SESSION['user'], "edit")) { ?> -
    Edit Feed
     -
    Delete Feed
     - -
    Browse Feed
     +?>feed->user_priv($_SESSION['user'], "edit")) { ?> +
    Edit Feed
     +
    Delete Feed
     + +
    Browse Feed
    -

    Feed Name: feed->name ?>

    -

    Group: group->name ?>

    -feed->description)>0) { ?> +

    Feed Name: feed->name ?>

    +

    Group: group->name ?>

    +feed->description)>0) { ?>

    Description:

    -

    feed->description ?>

    - +

    feed->description ?>

    +

    Feed Statistics:

    -

    feed->id}"?>">Active and Future Content: active_content ?>

    -

    feed->id}/expired"?>">Expired Content: expired_content ?>

    +

    feed->id}"?>">Active and Future Content: active_content ?>

    +

    feed->id}/expired"?>">Expired Content: expired_content ?>

    diff --git a/admin/app/frontpage/addtemplate.php b/admin/app/frontpage/addtemplate.php index e3c436f..387471e 100644 --- a/admin/app/frontpage/addtemplate.php +++ b/admin/app/frontpage/addtemplate.php @@ -25,7 +25,7 @@ */ ?>

    Please upload a template file and the descriptor file to add a new template.

    - +
    -

    name ?>

    - description)>0) { ?> -

    description ?>

    - +

    name ?>

    + description)>0) { ?> +

    description ?>

    +
    > - -

    name?>

    +     		> + +

    name?>

    mime_type == "text/plain") echo "$content->content
    \n"; ?> - start_time))?> - end_time))?>     -

    Submitted by name?>

    -

    Approve | - Deny

    + start_time))?> - end_time))?> +

    Submitted by name?>

    +

    Approve | + Deny
    diff --git a/admin/app/frontpage/admin.php b/admin/app/frontpage/admin.php index 65e175e..1205eff 100644 --- a/admin/app/frontpage/admin.php +++ b/admin/app/frontpage/admin.php @@ -26,10 +26,10 @@ ?>

    Please use these utilities wisely.

    -
    +

    Masquerade (su)

    - + +
    -
    +
    -

    Admin Privs:

    -

    Reset Session: reset

    -

    Admin Revision:

    -PHP Info
    -Send Mail
    -Template Importer
    +

    Admin Privs:

    +

    Reset Session: reset

    +

    Admin Revision:

    +PHP Info
    +Send Mail
    +Template Importer
    diff --git a/admin/app/frontpage/dashboard.php b/admin/app/frontpage/dashboard.php index c0ac3a7..0f02997 100644 --- a/admin/app/frontpage/dashboard.php +++ b/admin/app/frontpage/dashboard.php @@ -36,7 +36,7 @@ event.preventDefault(); if($(this).data("news")) return; - $.post("/users/notifications/username ?>", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { + $.post("/users/notifications/username ?>", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { $("
    ").css("overflow", "hidden").html(data).hide().appendTo($("#news_expand")).slideDown("slow"); $("#news_expand").data('items',$("#news_expand").data('items')+5); if( data == "" ) { @@ -63,24 +63,24 @@ //-->
    -
    +
    - -

    -

    Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

    + +

    +

    Concerto Wall is an interactive feature that allows you to view live graphical Concerto content. Visit the Wall now to peruse live content in a completely new way!

    -
    +
    -
    +
    -
    +

    News Feed

    @@ -88,7 +88,7 @@ if(is_array($this->notifications)) { foreach($this->notifications as $newsfeed) { ?> -

    text ?>timestamp) ?> +

    text ?>timestamp) ?> has_extra){ echo '
    '.$newsfeed->additional.''; @@ -101,50 +101,50 @@

    - +
    -
    +
    -
    -

    Concerto is currently at Version . For more information, check out the release notes.

    +
    +

    Concerto is currently at Version . For more information, check out the release notes.

    -
    +
    -
    +
    -
    +

    Operational Status

    - - - - - - - + + + + + + +
    -

    -     		-

    screen_stats[3] ?> screens

    -     		-

    screen_stats[0] ?>

    -
    -

    online

    -     		-

    screen_stats[2]; ?>

    -
    -

    asleep

    -     		-

    screen_stats[1]; ?>

    -
    -

    offline

    -
    +

    +     		+

    screen_stats[3] ?> screens

    +     		+

    screen_stats[0] ?>

    +
    +

    online

    +     		+

    screen_stats[2]; ?>

    +
    +

    asleep

    +     		+

    screen_stats[1]; ?>

    +
    +

    offline

    +
    @@ -200,9 +200,9 @@ ?>
    - <?php echo $status ?> + <?= $status ?>
    - name?>, a width.'x'.$screen->height?> display in location?> + name?>, a width.'x'.$screen->height?> display in location?>
    -
    +
    diff --git a/admin/app/frontpage/index.php b/admin/app/frontpage/index.php index 4fba7c5..9553b21 100644 --- a/admin/app/frontpage/index.php +++ b/admin/app/frontpage/index.php @@ -27,19 +27,19 @@ -
    +
    -
    +

    This is digital signage for everyone.

    Concerto is a free, Web-based broadcast medium for digital announcements that just works. Using Concerto, it's easy to engage large communities of people with graphical and text-based flyers, alerts, and other messages.

    -
    +
    diff --git a/admin/app/frontpage/login.php b/admin/app/frontpage/login.php old mode 100644 new mode 100755 index 03bdef3..ac939a1 --- a/admin/app/frontpage/login.php +++ b/admin/app/frontpage/login.php @@ -1,7 +1,7 @@
    -
    +
    -
    +

    -
    -
    +
    +
    \ No newline at end of file diff --git a/admin/app/frontpage/mailer.php b/admin/app/frontpage/mailer.php index 14893f9..748777c 100644 --- a/admin/app/frontpage/mailer.php +++ b/admin/app/frontpage/mailer.php @@ -26,9 +26,9 @@ ?>

    Use this form to send mail to users & groups

    -
    +
    -
    +

    Users

    users)) @@ -52,8 +52,8 @@ All Users

    From

    - Concerto System () - fromyou ?> + Concerto System () + fromyou ?>

    Subject

    @@ -68,5 +68,5 @@ Don't worry, only one email will be sent to each person, even if you select them twice.
    -
    +
    diff --git a/admin/app/frontpage/miniscreen.php b/admin/app/frontpage/miniscreen.php index b9d3a91..9e6f98b 100644 --- a/admin/app/frontpage/miniscreen.php +++ b/admin/app/frontpage/miniscreen.php @@ -1,4 +1,4 @@ -
    Group Name
    - + diff --git a/admin/app/groups/add.php b/admin/app/groups/add.php index 41b5a98..a3c5b16 100644 --- a/admin/app/groups/add.php +++ b/admin/app/groups/add.php @@ -23,8 +23,8 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>

    Select a user from the RCS-sorted list on the left, and click the "Add" button to add that user to your group. Extra Help

    -
    +?>

    Select a user from the RCS-sorted list on the left, and click the "Add" button to add that user to your group. Extra Help

    + canEdit) {?> -
    Add a User
     -
    Remove a User
     -
    Delete Group
    +
    Add a User
     +
    Remove a User
     +
    Delete Group

    Members:

      - group->get_members())) + group->get_members())) foreach ($this->group->get_members() as $user) { ?> -
    • name ?> - canEdit) { ?> - ( Remove ) - +
    • name ?> + canEdit) { ?> + ( Remove ) +
      • - None

      ";?> + None

      ";?>
    - feeds)&&count($this->feeds)>0) { ?> + feeds)&&count($this->feeds)>0) { ?>

    Feeds:

    @@ -55,7 +55,7 @@ ?> -

    name) ?> Feed

    +

    name) ?> Feed

    $type_name) { @@ -71,17 +71,17 @@ ?> -

    Expired Content: content_count('1','expired');?>

    +

    Expired Content: content_count('1','expired');?>

    - + - + - screens)&&count($this->screens)>0) { ?> + screens)&&count($this->screens)>0) { ?>

    Screens:

    - +
    -
    +
    -
    +
    -

    -

    name?>

    -

    location?>

    +

    +

    name?>

    +

    location?>

    -
    +
    - + diff --git a/admin/app/moderate/confirm.php b/admin/app/moderate/confirm.php index 7080f15..7481e18 100755 --- a/admin/app/moderate/confirm.php +++ b/admin/app/moderate/confirm.php @@ -23,34 +23,34 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?> - - - -args[1]=="approve") { ?> +?> + + + +args[1]=="approve") { ?>

    Duration:

    -

    - +

    +

    Reason for Rejection:

    - +

    Additional Message to Send to Submitter:

    -args[4] != "ajax") { ?> +args[4] != "ajax") { ?> - + - +
    diff --git a/admin/app/moderate/feed.php b/admin/app/moderate/feed.php index 229aa1c..5d328cd 100644 --- a/admin/app/moderate/feed.php +++ b/admin/app/moderate/feed.php @@ -38,7 +38,7 @@ title: "Loading..." }); $.ajax({type: "GET", - url: "/moderate/confirm/" + action + "/feed->id?>/" + content_id + "/ajax", + url: "/moderate/confirm/" + action + "/feed->id?>/" + content_id + "/ajax", success: function(html){ $(html) .dialog({ @@ -48,10 +48,10 @@ var posts = $(this).serializeArray(); var actions = $(parent).prev().find("td.actions"); var onError = function(){ - window.location = "/moderate/confirm/" + action + "/feed->id?>/" + content_id; + window.location = "/moderate/confirm/" + action + "/feed->id?>/" + content_id; }; $.ajax({type: "POST", - url: "/moderate/post", + url: "/moderate/post", data: posts, success: function(json){ if(json == true) { @@ -103,8 +103,8 @@ $(".i-preview").each(function(){ $(this).lightBox({ overlayBgColor: "#000", - imageLoading: "images/lightbox-ico-loading.gif", - imageBtnClose: "images/lightbox-btn-close.gif" + imageLoading: "images/lightbox-ico-loading.gif", + imageBtnClose: "images/lightbox-btn-close.gif" }); }); }); @@ -140,31 +140,31 @@ echo " "; } ?> - name ?> + name ?> - start_time))?> - end_time))?> + start_time))?> + end_time))?> user_id); echo $user->name ?> - + - Approve - Deny + Approve + Deny - - - diff --git a/admin/app/page_categories/_form.php b/admin/app/page_categories/_form.php index bce6414..501124a 100644 --- a/admin/app/page_categories/_form.php +++ b/admin/app/page_categories/_form.php @@ -32,19 +32,19 @@ - + +action="/page_categories/update/category['id']?>"> diff --git a/admin/app/page_categories/list.php b/admin/app/page_categories/list.php index ffaed63..786de98 100644 --- a/admin/app/page_categories/list.php +++ b/admin/app/page_categories/list.php @@ -23,8 +23,8 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
    New Category
     -
    View Pages
     +?>
    New Category
     +
    View Pages
    @@ -34,7 +34,7 @@ if($this->categories){ foreach($this->categories as $cat){ ?> - + contents) as $field) $urls[]=''.$field.''; ?> -

    Jump to: +

    Jump to:

    mime_type)) { $has_imagecol=1; ?> - > - - + > + + - diff --git a/admin/app/page_categories/new.php b/admin/app/page_categories/new.php index 9a578d9..df48da9 100644 --- a/admin/app/page_categories/new.php +++ b/admin/app/page_categories/new.php @@ -25,7 +25,7 @@ */ ?>

    Please fill out all fields to create a new category for pages.

    - + diff --git a/admin/app/page_categories/show.php b/admin/app/page_categories/show.php index d2cc4eb..14219ce 100644 --- a/admin/app/page_categories/show.php +++ b/admin/app/page_categories/show.php @@ -23,11 +23,11 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?>
    Edit Category
     -
    Delete Category
    +?>
    Edit Category
     +
    Delete Category
    -

    Category Name: category['name'] ?>

    -

    Path: category['path'] ?>

    -

    Layout: category['layout']?>

    -

    Default Page: category['default_page_name'] ?>

    -

    Pages: count ?> (see listing of pages)

    +

    Category Name: category['name'] ?>

    +

    Path: category['path'] ?>

    +

    Layout: category['layout']?>

    +

    Default Page: category['default_page_name'] ?>

    +

    Pages: count ?> (see listing of pages)

    diff --git a/admin/app/pages/_feedback.php b/admin/app/pages/_feedback.php index 04228e0..4e8b8a1 100644 --- a/admin/app/pages/_feedback.php +++ b/admin/app/pages/_feedback.php @@ -50,12 +50,12 @@ //Do the actual submit, output status. $('#feedback_form').submit(function() { - jQuery.post('/pages/feedback', { + jQuery.post('/pages/feedback', { 'helpful': $('input[name=helpful]:checked').val(), 'message': $('textarea[name=message]').val(), 'email': $('input[name=email]').val(), 'human': $('input[name=human]').val(), - 'page_id': 'page['id']?>', + 'page_id': 'page['id']?>', 'submit': $('input[name=submit]').val() }, function(data) { $('#feedback_form').after(data+"
    "); @@ -71,7 +71,7 @@

    Was this information helpful?

    Your input can help us improve the Concerto Support Center.

    - +

    @@ -82,17 +82,17 @@



    - +
    - +



    - + - +

    diff --git a/admin/app/pages/_form.php b/admin/app/pages/_form.php index c5cdca0..b5f1ad7 100644 --- a/admin/app/pages/_form.php +++ b/admin/app/pages/_form.php @@ -32,7 +32,7 @@ @@ -43,28 +43,28 @@ if(is_array($cats)) foreach($cats as $cat) { ?> - +
    " style="width:250px"> -mime_type)) { ?> - -mime_type)) { ?> - content ?> - +" style="width:250px"> +mime_type)) { ?> + +mime_type)) { ?> + content ?> + -

    name ?>

    - start_time)) ?> - end_time)) ?> 1) echo "({$week_range} Weeks)" ?> -

    Submitted by name ?>

    +

    name ?>

    + start_time)) ?> - end_time)) ?> 1) echo "({$week_range} Weeks)" ?> +

    Submitted by name ?>

    content = new Content($content->args[1]); ?>

    No content awaiting moderation found
    Category Name
    		 - +
    Path

    Letters, numbers, and hyphens only please. No special characters or spaces. Keep it short.

    		 - +
    Layout

    Should be a filesystem path to a valid Concerto php template from the admin directory.

    		 - +

    > - -

    name?>

    +     		> + +

    name?>

    mime_type == "text/plain") echo "$content->content
    \n"; ?> - start_time))?> - end_time))?>     -

    Submitted by name?>

    -

    Approve | - Deny

    + start_time))?> - end_time))?> +

    Submitted by name?>

    +

    Approve | + Deny
    Page Name
    		 - +
    Show in menu
    Show feedback form
    Page Content (HTML)
    		 - +
    diff --git a/admin/app/pages/edit.php b/admin/app/pages/edit.php index ac00518..748cbcd 100644 --- a/admin/app/pages/edit.php +++ b/admin/app/pages/edit.php @@ -24,7 +24,7 @@ * @version $Revision$ */ ?>
    +action="/pages/update/page['id']?>"> diff --git a/admin/app/pages/list.php b/admin/app/pages/list.php index 8f93436..7928811 100644 --- a/admin/app/pages/list.php +++ b/admin/app/pages/list.php @@ -24,9 +24,9 @@ * @version $Revision$ */ ?>canEdit) { ?> -
    New Page
     -
    Manage Categories
    - +
    New Page
     +
    Manage Categories
    +

    Click on a page for more information and contents.

    An asterisk (*) represents items that will not show up in the menu.

    @@ -41,16 +41,16 @@ -

    +

    canEdit) { ?> -(edit)

    +(edit) canEdit) { ?> - + Default page: +
    Screen Location
    - +
    Screen Latitude, Longitude
    -   ,   - +   ,   +
    Screen Size
    (W x H, in pixels)
    -   x   +   x  
    MAC Address
    - + @@ -138,29 +138,29 @@ if(is_array($groups)) foreach($groups as $group) { ?> - + -id)) { ?> +id)) { ?>
    Controls display

    Whether or not the machine controls the power state of the display.

    - -id) && (isAdmin() || $screen->controls_display)) { ?> + +id) && (isAdmin() || $screen->controls_display)) { ?>
    Display On/Off Times

    What time should the system turn the screen on and off? Please specify hh:mm in 24-hour time, e.g. 18:00 for 6:00 pm, 00:00 for the very beginning of the day, or 23:59 for the end of the day.

    -   to   +   to   - +
    @@ -182,15 +182,15 @@

    Normal Templates - Designed to fit your screen best

    - avail_templates as $template) { ?> + avail_templates as $template) { ?>
    - template_id==$template->id) echo ' checked'; ?>> - - " alt="name ?>"/> + template_id==$template->id) echo ' checked'; ?>> + + " alt="name ?>"/> -

    name ?>
    - creator) > 0){ echo "Created by: $template->creator
    "; } ?> - modified) > 0){echo "Last Updated: " . date("M j, Y", strtotime($template->modified));} ?> +

    name ?>
    + creator) > 0){ echo "Created by: $template->creator
    "; } ?> + modified) > 0){echo "Last Updated: " . date("M j, Y", strtotime($template->modified));} ?>

    @@ -202,15 +202,15 @@

    Other Templates - Might look skewed or stretched on your screen

    @@ -67,14 +67,14 @@ @@ -84,7 +84,7 @@ if(is_array($this->groups)) foreach($this->groups as $group) { ?> - + @@ -93,5 +93,5 @@
    -nogroups) echo "disabled=disabled"; ?>/> +nogroups) echo "disabled=disabled"; ?>/> diff --git a/admin/app/screens/new.php b/admin/app/screens/new.php index e58f62d..6efc218 100644 --- a/admin/app/screens/new.php +++ b/admin/app/screens/new.php @@ -25,7 +25,7 @@ */ ?>

    Please fill out all fields to create a new screen.

    -
    + diff --git a/admin/app/screens/show.php b/admin/app/screens/show.php index 0cc6627..2b0d6aa 100644 --- a/admin/app/screens/show.php +++ b/admin/app/screens/show.php @@ -28,16 +28,16 @@ $(document).ready(function() { $('a.t-preview').lightBox({ overlayBgColor: "#000", - imageLoading: "images/lightbox-ico-loading.gif", - imageBtnClose: "images/lightbox-btn-close.gif" + imageLoading: "images/lightbox-ico-loading.gif", + imageBtnClose: "images/lightbox-btn-close.gif" }); }); })(jQuery); //--> -canEdit) {?> -
    Edit Screen
     -
    Manage Subscriptions
     -
    Delete Screen
    +canEdit) {?> +
    Edit Screen
     +
    Manage Subscriptions
     +
    Delete Screen
    -

    +


    -

    Location: screen->location?>

    +

    Location: screen->location?>

    Size: screen->width.' x '.$this->screen->height.' ('.$ratio; ?>)

    Status: screen->is_connected()) { ?> - screen->get_powerstate()) { ?> + screen->get_powerstate()) { ?> Online - + Asleep - + Offline (Last updated: screen->last_updated?>)

    Group: - screen->group_id) ?> - name?> + screen->group_id) ?> + name?>

    Template: - screen->template_id) ?> - name?> + screen->template_id) ?> + name?>

    canEdit && $this->screen->controls_display) { ?> -

    Hours of Operation: screen->time_on ?> - screen->time_off ?>

    +

    Hours of Operation: screen->time_on ?> - screen->time_off ?>

    @@ -123,8 +123,8 @@ $mac=str_pad($this->screen->mac_inhex,12,'0',STR_PAD_LEFT); $mac=join(str_split($mac,2),':'); ?> -

    MAC:

    -

    Last IP: screen->last_ip?>

    +

    MAC:

    +

    Last IP: screen->last_ip?>

    @@ -139,9 +139,9 @@ ?>
    -
    +
    -

    name ?> (Field)

    +

    name ?> (Field)

      list_positions(); @@ -149,14 +149,14 @@ foreach($positions as $position) { $feed = new Feed($position->feed_id); ?> -
    • name?>
      • +
    • name?>
      • (no subscriptions)"; ?>
    -
    +
    display content from ' + feed_name + ' (remove)') + .append('
  • display content from ' + feed_name + ' (remove)
    • ') .find("a.remove_feed").click(remove_feed); } return false; @@ -58,12 +58,12 @@ }); })(jQuery); //--> -preview +preview

    Your screen is divided up into several areas, called fields, each of which can display different types of content. Use these controls to select feeds (categories of content, i.e. Student Union, which contains student clubs' content) to place in each field, and how often to display each.


    - + screen->list_fields(); if(is_array($fields_list)){ @@ -71,10 +71,10 @@ ?>
    -
    +
    - -

    name ?> (Field)

    + +

    name ?> (Field)

      Very Often'; echo ''; echo ''; -?> display content from name)?> (remove) +?> display content from name)?> (remove) (no current subscriptions)'; ?> @@ -101,15 +101,15 @@ Add a feed to this field: Add

    -
    +

    - + - username != $user->username) { ?> + username != $user->username) { ?> @@ -89,17 +89,17 @@ - + - +
    Screen Size
    (W x H, in pixels)
    		 -   x   - +   x   +
    MAC Address
    		 - livecd['mac'] ?> + livecd['mac'] ?>
    Full Name
    		 - +
    Email
    		 - +
    System Notifications
    		 - allow_email) echo " CHECKED"?>> Yes, I want to recieve e-mail notices about system activity that concerns me (recommended). + allow_email) echo " CHECKED"?>> Yes, I want to recieve e-mail notices about system activity that concerns me (recommended).
    Username
    		 @@ -67,11 +67,11 @@
    Username
    		 - +
    Admin Privileges
    		 - admin_privileges) echo " CHECKED"?>> + admin_privileges) echo " CHECKED"?>>
    Username
    		 - username ?> + username ?>

    diff --git a/admin/app/users/edit.php b/admin/app/users/edit.php index 200076e..355a863 100644 --- a/admin/app/users/edit.php +++ b/admin/app/users/edit.php @@ -23,7 +23,7 @@ * @license GPLv2, see www.gnu.org/licenses/gpl-2.0.html * @version $Revision$ */ -?> +?> diff --git a/admin/app/users/list.php b/admin/app/users/list.php index 7f0c0fb..0a04305 100644 --- a/admin/app/users/list.php +++ b/admin/app/users/list.php @@ -24,8 +24,8 @@ * @version $Revision$ */ ?> -
    New User
    - +
    New User
    +

    Click on a user to view his or her profile.

    users as $user){ ?> - > -

    name ?>

    + > +

    name ?>

     

    Please fill out all fields to create a new user.

    - + diff --git a/admin/app/users/newsfeed.php b/admin/app/users/newsfeed.php index 6ff870f..a01482d 100644 --- a/admin/app/users/newsfeed.php +++ b/admin/app/users/newsfeed.php @@ -29,7 +29,7 @@ $("#news_expand").data('items',5); $("#news_expand").click(function(event) { - $.post("/users/notifications", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { + $.post("/users/notifications", {'start': $("#news_expand").data('items'), 'num': 5}, function(data) { var x = $("
    "+data+"
    "); $("#news_expand").before(x.hide()); x.slideDown("slow"); @@ -42,30 +42,30 @@
    -
    +
    - notifications) ?> - page > 0) { ?> -
    |<
     - - page > 0) {?> -
    <<
     - - 1) && $this->page < floor($this->notification_count / 25)) {?> -
    >>
     - - page < $num && $this->page < floor($this->notification_count / 25)) { ?> -
    >|
     - + notifications) ?> + page > 0) { ?> +
    |<
     + + page > 0) {?> +
    <<
     + + 1) && $this->page < floor($this->notification_count / 25)) {?> +
    >>
     + + page < $num && $this->page < floor($this->notification_count / 25)) { ?> +
    >|
     +
    -0) { ?> -

    Showing items start+1 ?> to start + count($this->notifications) ?> of notification_count ?> total notifications

    +0) { ?> +

    Showing items start+1 ?> to start + count($this->notifications) ?> of notification_count ?> total notifications

    notifications)) { foreach($this->notifications as $newsfeed) { ?> -

    text ?>timestamp) ?> +

    text ?>timestamp) ?> has_extra){ echo '
    '.$newsfeed->additional.''; @@ -75,9 +75,9 @@ } } ?> - +

    No more items to display.

    - +
    -
    +
    diff --git a/admin/app/users/notifications.php b/admin/app/users/notifications.php index a41b225..d52f3e0 100644 --- a/admin/app/users/notifications.php +++ b/admin/app/users/notifications.php @@ -26,7 +26,7 @@ if (is_array($this->notifications)) { foreach($this->notifications as $notification) { ?> -

    text ?>timestamp) ?> +

    text ?>timestamp) ?> has_extra){ echo '
    '.$notification->additional.''; diff --git a/admin/app/users/password.php b/admin/app/users/password.php old mode 100644 new mode 100755 index 7203a42..0a09e13 --- a/admin/app/users/password.php +++ b/admin/app/users/password.php @@ -1,4 +1,4 @@ - +

    @@ -23,4 +23,4 @@
    - + \ No newline at end of file diff --git a/admin/app/users/show.php b/admin/app/users/show.php index d8a6962..dd88195 100644 --- a/admin/app/users/show.php +++ b/admin/app/users/show.php @@ -37,7 +37,7 @@ event.preventDefault(); if($(this).data("news")) return; - $.post("/users/notifications/user->username ?>", {'start': $("#news_expand").data('items'), 'num': 7}, function(data) { + $.post("/users/notifications/user->username ?>", {'start': $("#news_expand").data('items'), 'num': 7}, function(data) { $("
    ").css("overflow", "hidden").html(data).hide().appendTo($("#news_expand")).slideDown("slow"); $("#news_expand").data('items',$("#news_expand").data('items')+7); if( data == "" ) { @@ -51,11 +51,11 @@ //--> canEdit) {?> -
    Edit Profile
    +
    Edit Profile

    -

    Username: user->username?>

    +

    Username: user->username?>

    Groups:

      Contact: user->email?> user->username == $_SESSION['user']->username) {?>

      user->username?>">Change Password

      - +
      -
      +

      News Feed

      @@ -83,7 +83,7 @@ if(is_array($this->notifications)) { foreach($this->notifications as $newsfeed) { ?> -

      text ?>timestamp) ?> +

      text ?>timestamp) ?> has_extra){ echo '
      '.$newsfeed->additional.''; @@ -96,10 +96,10 @@

      - +
      - +

      -
      +
      @@ -120,7 +120,7 @@ { foreach(array_keys($this->contents['approved']) as $field) $urls[]=''.$field.''; ?> -

      Jump to:

      +

      Jump to:

      This user has had no content approved on one or more feeds.

      "; @@ -145,7 +145,7 @@ if($contents){ foreach($contents as $content) { $submitter = new User($content->user_id); ?> -
    + - - + + contents['denied']) as $field) $urls[]=''.$field.''; ?> -

    Jump to:

    +

    Jump to:

    This user has had no content denied on all feeds.

    "; @@ -211,7 +211,7 @@ if($contents){ foreach($contents as $content) { $submitter = new User($content->user_id); ?> - + - - + + contents['pending']) as $field) $urls[]=''.$field.''; ?> -

    Jump to:

    +

    Jump to:

    This user has had no content pending moderation on all feeds.

    "; @@ -277,7 +277,7 @@ if($contents){ foreach($contents as $content) { $submitter = new User($content->user_id); ?> - + - - + + -
    +
    diff --git a/admin/app/users/signup.php b/admin/app/users/signup.php index ca0737b..f097bf8 100644 --- a/admin/app/users/signup.php +++ b/admin/app/users/signup.php @@ -25,7 +25,7 @@ */ ?>

    Welcome to Concerto!

    Please enter some information about yourself to get started.

    - + diff --git a/admin/app/wall/ext.php b/admin/app/wall/ext.php index 2ec7a75..a80edc5 100644 --- a/admin/app/wall/ext.php +++ b/admin/app/wall/ext.php @@ -1,11 +1,11 @@ -feed->type == 3) || ($this->content->get_moderation_status($this->feed) != 1)){ ?> +feed->type == 3) || ($this->content->get_moderation_status($this->feed) != 1)){ ?> Invalid request. - +
    - <?php echo $this->content->name ?> + <?= $this->content->name ?>
    -submitter->name; } ?> -
    -

    content->start_time)) ?> content->start_time)) ?> to content->end_time)) ?> content->end_time)) ?>

    +
    +

    content->start_time)) ?> content->start_time)) ?> to content->end_time)) ?> content->end_time)) ?>

    -
    -

    Feed: feed->name ?>

    -

    By:

    +
    +

    Feed: feed->name ?>

    +

    By:

    - + - + - + diff --git a/admin/app/wall/feedgrid.php b/admin/app/wall/feedgrid.php index e7e6a7f..d3434ac 100644 --- a/admin/app/wall/feedgrid.php +++ b/admin/app/wall/feedgrid.php @@ -1,25 +1,25 @@
    -feed->name) <= 0 || $this->feed->type == 3) { ?> +feed->name) <= 0 || $this->feed->type == 3) { ?> Invalid request. - +
    - contents as $content) { ?> + contents as $content) { ?>
    - +
    - <?php echo $content->name ?> + <?= $content->name ?>
    - +
    - + - + - +
    diff --git a/admin/app/wall/index.php b/admin/app/wall/index.php index 66d848c..ac66ac0 100644 --- a/admin/app/wall/index.php +++ b/admin/app/wall/index.php @@ -39,7 +39,7 @@ function loadFeed(id, feedname) { $.ajax({ type: "GET", - url: "/wall/feedgrid/"+id+"?ajax=1", + url: "/wall/feedgrid/"+id+"?ajax=1", success: function(data){ $('#wall_feed_insert').empty(); $("#progressbar").progressbar({ value: 0 }); @@ -108,9 +108,9 @@ function collapsePanel() {
    - feeds) || empty($this->feeds)) { ?> + feeds) || empty($this->feeds)) { ?> Sorry, there are no browsable feeds in the system at this time. - feeds as $id => $feed ) { $name = htmlspecialchars($feed['name']); @@ -118,8 +118,8 @@ function collapsePanel() { $name = substr($name, 0, 26) . '...'; } ?> -
    -
    +
    @@ -129,13 +129,13 @@ function collapsePanel() {

    Click to Select Feed

    - +
    @@ -153,6 +153,6 @@ function collapsePanel() { diff --git a/admin/docs_layout.php b/admin/docs_layout.php index c3bf4db..8d5cbc3 100644 --- a/admin/docs_layout.php +++ b/admin/docs_layout.php @@ -28,21 +28,21 @@ -<?php echo $this->getTitle()?> - Concerto Support +<?=$this->getTitle()?> - Concerto Support - + - - - - + + + + - + - - - + + + @@ -52,10 +52,10 @@
    -
    - Concerto Support +
    + Concerto Support
    -

    Control Panel

    +

    Control Panel

      -

      getTitle()?>

      -

      getSubtitle()?>

      +

      getTitle()?>

      +

      getSubtitle()?>

      @@ -95,7 +95,7 @@ @@ -104,7 +104,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/ds_layout.php b/admin/ds_layout.php index 28c635f..3dab24c 100644 --- a/admin/ds_layout.php +++ b/admin/ds_layout.php @@ -29,32 +29,32 @@ <?php echo join(' - ',array($this->getTitle(), 'Concerto Panel'));?> - - - - - + + + + + - - - - + + + + - + - - - + + + @@ -65,14 +65,14 @@
      -

      getTitle()?>

      -

      getCrumbs()?>

      +

      getTitle()?>

      +

      getCrumbs()?>

      @@ -83,14 +83,14 @@
      - + @@ -99,7 +99,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/fpnew_layout.php b/admin/fpnew_layout.php index 8985ed3..da96504 100644 --- a/admin/fpnew_layout.php +++ b/admin/fpnew_layout.php @@ -4,33 +4,33 @@ <?php echo join(' - ',array('Concerto Panel', $this->getTitle()));?> - - - - - + + + + + - - - - - + + + + + - + - - - + + + @@ -43,7 +43,7 @@ @@ -53,14 +53,14 @@
      - + @@ -69,7 +69,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/includes/left_menu.php b/admin/includes/left_menu.php index f820d4c..f27ae33 100644 --- a/admin/includes/left_menu.php +++ b/admin/includes/left_menu.php @@ -28,41 +28,42 @@
      -
      ConcertoConcerto
      -
      +
      -
      -
      -
      +
      + -

      Log In

      +

      Log In

      -

      Signup

      +

      Signup

      - - Welcome, '.firstName().'!


      '; ?> - - - - controls_afeed() || $_SESSION[user]->controls_ascreen()) { ?> - - - - Welcome, '.firstName().'!


      '; ?> + + + + controls_afeed() || $_SESSION[user]->controls_ascreen()) { ?> + + + +

      View Account
      -

      Logout

      - Logout +
      -
      +
      -

      Awaiting Moderation

      - - 0 && isAdmin()) {?> -

      items in other feeds...

      - +

      Awaiting Moderation

      + + 0 && isAdmin()) {?> +

      items in other feeds...

      +
      -
    diff --git a/admin/includes/menu_tabs.php b/admin/includes/menu_tabs.php index c1b783e..55000b1 100644 --- a/admin/includes/menu_tabs.php +++ b/admin/includes/menu_tabs.php @@ -31,18 +31,18 @@ if(isLoggedIn()) { //We will change this! ?> <?php echo join(' - ',array('Concerto', $this->getTitle()));?> - + - - - - - + + + + + - - + + @@ -57,7 +57,7 @@
    -

    getTitle()?>

    +

    getTitle()?>

    @@ -78,7 +78,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/admin/stripped_ds_layout.php b/admin/stripped_ds_layout.php index 03cb75e..6b61cd9 100644 --- a/admin/stripped_ds_layout.php +++ b/admin/stripped_ds_layout.php @@ -29,20 +29,20 @@ <?php echo join(' - ',array($this->getTitle(), 'Concerto Panel'));?> - - - + + + - - - + + + - + - - - + + + @@ -63,7 +63,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/common/content.php b/common/content.php index 904ed57..888399b 100644 --- a/common/content.php +++ b/common/content.php @@ -1,4 +1,4 @@ - $templates){ - $scr = new Screen($key); - $templates = remove_element($templates, $scr->template_id); - $new_key = array_rand($templates,1); - $scr->template_id = $templates[$new_key]; - $scr->set_properties(); - } - echo "Template rotation complete.\n"; - } - echo "Hourly job complete.\n"; - } - //End template rotation -} -function always(){ - //First generate new content for dynamic feeds - $feed_handler = new Feed(); - if($feeds = $feed_handler->get_all("WHERE type = 1 OR type = 4")){ - foreach($feeds as $feed){ - echo "Calling $feed->name for update. \n"; - if($feed->dyn->update()){ - echo "Updated $feed->name OK\n"; - } else { - echo "Error updating $feed->name\n"; - echo "Dynamic Status: {$feed->dyn->status}\n"; - echo ""; - print_r($feed); - echo ""; - } - echo "Status: " . $feed->dyn->status . "\n"; - - } - } - //Then generate the newsfeed! - echo "Begin notification processing...\n"; - $notif = new Notification(); - $notif->process(20); //If more than 20 are generated the system might be under high load. - echo "Done processing notifications. \n"; - - // Send email notifications if the screens are not online - echo "Scanning for recently downed screens...\n"; - screen_offline_mail( ); - echo "Done scanning for downed screens.\n"; -} - -function screen_offline_mail( ) { - # Query all screens and mail a report if any are offline - $screens = Screen::get_all( ); - if(!is_array($screens)){ - return false; - } - $downed_screens = Array( ); - foreach ($screens as $screen) { - if ($screen->went_down() && $screen->type == 0) { - $downed_screens[] = $screen; - } - } - - # construct email report if any screens have gone down in last 2 hours - if (count($downed_screens) > 0) { - $admin = new Group(ADMIN_GROUP_ID); - - $mail_body = "The following Concerto screens have gone offline. Please investigate.\n"; - //$mail_body .= "NOTE: THIS EMAIL IS A TEST, IT IS ONLY A TEST. FEEL FREE TO IGNORE.\n"; - foreach ($downed_screens as $screen) { - $name = $screen->name; - echo "Found downed screen $name.\n"; - $location = $screen->location; - $mac = $screen->mac_inhex; - $last_ip = $screen->last_ip; - - $mail_body .= "$name (at $location, last ip $last_ip mac $mac)\n"; - } - - $admin->send_mail("Screen Outage Detected", $mail_body); - } -} - -//Tiny helper function for the template rotation -function remove_element($arr, $val){ - foreach ($arr as $key => $value){ - if ($arr[$key] == $val){ - unset($arr[$key]); - } - } - return $arr = array_values($arr); -} - -//Scan for content still in the moderation queue that has expired and deny it -function deny_expired(){ - $notification = "The content was denied automatically. A moderator did not review this item before the expiration date."; - $feeds = Feed::get_all(); - foreach($feeds as $feed){ - $contents = $feed->content_get('NULL'); //Content that hasn't been moderated - if($contents){ - foreach($contents as $content){ - if(strtotime($content['content']->end_time) < strtotime('NOW')){ - $feed->content_mod($content['content']->id, 0, 0, $content['content']->get_duration($feed),$notification); - echo "Denied {$content['content']->name} on {$feed->name}\n"; - } - } - } - } -} - -?> + $templates){ + $scr = new Screen($key); + $templates = remove_element($templates, $scr->template_id); + $new_key = array_rand($templates,1); + $scr->template_id = $templates[$new_key]; + $scr->set_properties(); + } + echo "Template rotation complete.\n"; + } + echo "Hourly job complete.\n"; + } + //End template rotation +} +function always(){ + //First generate new content for dynamic feeds + $feed_handler = new Feed(); + if($feeds = $feed_handler->get_all("WHERE type = 1 OR type = 4")){ + foreach($feeds as $feed){ + echo "Calling $feed->name for update. \n"; + if($feed->dyn->update()){ + echo "Updated $feed->name OK\n"; + } else { + echo "Error updating $feed->name\n"; + echo "Dynamic Status: {$feed->dyn->status}\n"; + echo ""; + print_r($feed); + echo ""; + } + echo "Status: " . $feed->dyn->status . "\n"; + + } + } + //Then generate the newsfeed! + echo "Begin notification processing...\n"; + $notif = new Notification(); + $notif->process(20); //If more than 20 are generated the system might be under high load. + echo "Done processing notifications. \n"; + + // Send email notifications if the screens are not online + echo "Scanning for recently downed screens...\n"; + screen_offline_mail( ); + echo "Done scanning for downed screens.\n"; +} + +function screen_offline_mail( ) { + # Query all screens and mail a report if any are offline + $screens = Screen::get_all( ); + if(!is_array($screens)){ + return false; + } + $downed_screens = Array( ); + foreach ($screens as $screen) { + if ($screen->went_down() && $screen->type == 0) { + $downed_screens[] = $screen; + } + } + + # construct email report if any screens have gone down in last 2 hours + if (count($downed_screens) > 0) { + $admin = new Group(ADMIN_GROUP_ID); + + $mail_body = "The following Concerto screens have gone offline. Please investigate.\n"; + //$mail_body .= "NOTE: THIS EMAIL IS A TEST, IT IS ONLY A TEST. FEEL FREE TO IGNORE.\n"; + foreach ($downed_screens as $screen) { + $name = $screen->name; + echo "Found downed screen $name.\n"; + $location = $screen->location; + $mac = $screen->mac_inhex; + $last_ip = $screen->last_ip; + + $mail_body .= "$name (at $location, last ip $last_ip mac $mac)\n"; + } + + $admin->send_mail("Screen Outage Detected", $mail_body); + } +} + +//Tiny helper function for the template rotation +function remove_element($arr, $val){ + foreach ($arr as $key => $value){ + if ($arr[$key] == $val){ + unset($arr[$key]); + } + } + return $arr = array_values($arr); +} + +//Scan for content still in the moderation queue that has expired and deny it +function deny_expired(){ + $notification = "The content was denied automatically. A moderator did not review this item before the expiration date."; + $feeds = Feed::get_all(); + foreach($feeds as $feed){ + $contents = $feed->content_get('NULL'); //Content that hasn't been moderated + if($contents){ + foreach($contents as $content){ + if(strtotime($content['content']->end_time) < strtotime('NOW')){ + $feed->content_mod($content['content']->id, 0, 0, $content['content']->get_duration($feed),$notification); + echo "Denied {$content['content']->name} on {$feed->name}\n"; + } + } + } + } +} + +?> diff --git a/common/scripts/mail.php b/common/scripts/mail.php index a84a55f..f549435 100644 --- a/common/scripts/mail.php +++ b/common/scripts/mail.php @@ -1,4 +1,4 @@ -\n"; ?> - - + diff --git a/common/template.php b/common/template.php index fefbab9..f3b148d 100644 --- a/common/template.php +++ b/common/template.php @@ -1,4 +1,4 @@ - -
    -
    name ?>
    -mime_type,'image')){ ?> -
    content ?>
    - -
    <?php echo htmlspecialchars($content->name) ?>
    - +
    +
    name ?>
    +mime_type,'image')){ ?> +
    content ?>
    + +
    <?= htmlspecialchars($content->name) ?>
    +
    - - <?php echo htmlspecialchars($feed_title) ?> - http:/// + <?= htmlspecialchars($feed_title) ?> + http:/// RSS Feed from Concerto API en-us - + Concerto API 0.07 - + - /images/conc_logowhitebg_sm.jpg + /images/conc_logowhitebg_sm.jpg Concerto - + 700 185 -id . '&select=content&format=rss'; $link = htmlspecialchars($link); $feeds = $content->list_feeds(); @@ -239,39 +239,39 @@ function render_rss($content_arr, $criteria){ } ?> - <?php echo htmlspecialchars($content->name) ?> - - - submitted) ?> - username ?> (name) ?>) - id ?> -name) ?> + + + submitted) ?> + username ?> (name) ?>) + id ?> +type != 3){ $feed = $feed_obj['feed']; $feed_link = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . '?' . criteria_string($criteria) . "&select=feed&select_id={$feed->id}&format=rss"; ?> - name) ?> -">name) ?> +mime_type,'image') !== false){ ?> - - name) ?> - -" type="mime_type ?>" expression="full" /> + name) ?> + + - start=start_time) ?>; - end=end_time) ?>; + start=start_time) ?>; + end=end_time) ?>; scheme=W3C-DTF - + - - - - + + - - - - - + - -
    -
    name ?>
    -mime_type,'image')){ ?> -
    content ?>
    - -
    <?php echo htmlspecialchars($content->name) ?>
    - +
    +
    name ?>
    +mime_type,'image')){ ?> +
    content ?>
    + +
    <?= htmlspecialchars($content->name) ?>
    +
    - -mime_type,'image')){ ?> - content ?> - - <?php echo htmlspecialchars($content->name) ?> - -mime_type,'image')){ ?> + content ?> + + <?= htmlspecialchars($content->name) ?> + + - <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + <?= htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// RSS Feed from Concerto API en-us - + Concerto API 0.08 - (Concerto Digital Signage) - + (Concerto Digital Signage) + - /images/concerto_48x48.png - <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + /images/concerto_48x48.png + <?= htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// 48 48 - - <?php echo htmlspecialchars($content->name) ?> - - - submitted) ?> - email ?> (name)) ?>) - /content/show/id ?> -name) ?> + + + submitted) ?> + email ?> (name)) ?>) + /content/show/id ?> +type != 3){ $feed = $feed_obj['feed']; $feed_link = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . '?' . criteria_string($criteria) . "&select=feed&select_id={$feed->id}&format=rss"; ?> - name) ?> -">name) ?> +mime_type,'image') !== false){ ?> - - - name) ?> - -" type="mime_type ?>" length='0'/> + + name) ?> + + - start=start_time) ?>; - end=end_time) ?>; + start=start_time) ?>; + end=end_time) ?>; scheme=W3C-DTF - + - - - - + + - - - - - + - -
    -
    name ?>
    -mime_type,'image')){ ?> -
    content ?>
    - -
    <?php echo htmlspecialchars($content->name) ?>
    - +
    +
    name ?>
    +mime_type,'image')){ ?> +
    content ?>
    + +
    <?= htmlspecialchars($content->name) ?>
    +
    - -mime_type,'image')){ ?> - content ?> - - <?php echo htmlspecialchars($content->name) ?> - -mime_type,'image')){ ?> + content ?> + + <?= htmlspecialchars($content->name) ?> + + - <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + <?= htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// RSS Feed from Concerto API en-us - + Concerto API 0.09 - (Concerto Digital Signage) - + (Concerto Digital Signage) + - /images/concerto_48x48.png - <?php echo htmlspecialchars(utf8_encode($feed_title)) ?> - http:/// + /images/concerto_48x48.png + <?= htmlspecialchars(utf8_encode($feed_title)) ?> + http:/// 48 48 - - <?php echo htmlspecialchars($content->name) ?> - - - submitted) ?> - email ?> (name)) ?>) - /content/show/id ?> -name) ?> + + + submitted) ?> + email ?> (name)) ?>) + /content/show/id ?> +type != 3){ $feed = $feed_obj['feed']; $feed_link = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . '?' . criteria_string($criteria) . "&select=feed&select_id={$feed->id}&format=rss"; ?> - name) ?> -">name) ?> +mime_type,'image') !== false){ ?> - - - name) ?> - -" type="mime_type ?>" length='0'/> + + name) ?> + + - start=start_time) ?>; - end=end_time) ?>; + start=start_time) ?>; + end=end_time) ?>; scheme=W3C-DTF - + - - - - + + - - - - - + - Rename To: - +

    @@ -175,7 +175,7 @@ function do_remove_file($class_obj) {

    Input MAC Address: - +

    @@ -238,7 +238,7 @@ function do_remove_file($class_obj) { as : - + diff --git a/hardware/admin/override.php b/hardware/admin/override.php index d09e683..81e6582 100644 --- a/hardware/admin/override.php +++ b/hardware/admin/override.php @@ -78,7 +78,7 @@ function do_write($class_obj, $path) { - +

    diff --git a/install/diagnostics.php b/install/diagnostics.php index 5d7b892..ae88a34 100644 --- a/install/diagnostics.php +++ b/install/diagnostics.php @@ -41,19 +41,19 @@

    This page checks some system settings and configuration options to help judge if Concerto will work as intended. It is by no means exhaustive or all inclusive.

    PHP Enviroment

      -
    • PHP Version:
      • -
    • MySQL Support:
      • -
    • GD Support:
      • -
    • JSON Support:
      • -
    • PATH INFO Global:
      • +
    • PHP Version:
      • +
    • MySQL Support:
      • +
    • GD Support:
      • +
    • JSON Support:
      • +
    • PATH INFO Global:

    Concerto Config

      -
    • Config access:
      • -
    • Common Directory:
      • -
    • Image Upload Directory:
      • -
    • Template Upload Directory:
      • -
    • MySQL Connection test:
      • +
    • Config access:
      • +
    • Common Directory:
      • +
    • Image Upload Directory:
      • +
    • Template Upload Directory:
      • +
    • MySQL Connection test:
    @@ -157,4 +157,4 @@ function string_ends_with($string, $ending){ $string_end = substr($string, strlen($string) - $len); return $string_end == $ending; } -?> +?> \ No newline at end of file diff --git a/install/schema.sql b/install/schema.sql old mode 100644 new mode 100755 diff --git a/screen/index.php b/screen/index.php index dc7188d..7aab3d9 100644 --- a/screen/index.php +++ b/screen/index.php @@ -47,7 +47,7 @@ +$(document).ready(function(){$.signage();});//--> diff --git a/screen/missing.php b/screen/missing.php index d8d7a2f..b83ef83 100644 --- a/screen/missing.php +++ b/screen/missing.php @@ -80,8 +80,8 @@
    From 0e12e3cffe616b514e490afdb8536f70e0727832 Mon Sep 17 00:00:00 2001 From: Kevin Russell Date: Fri, 29 Jul 2011 14:24:00 -0600 Subject: [PATCH 5/8] Corrected file mode (0755 to 0644) --- admin/app/frontpage/login.php | 0 admin/app/moderate/confirm.php | 0 admin/app/users/password.php | 0 admin/css/ui.jquery.css | 0 admin/images/addtab_bgleft.gif | Bin admin/images/addtab_bgright.gif | Bin admin/images/graphics_icon_sm.jpg | Bin admin/images/ss/title_ss.png | Bin admin/images/ss/topimg.jpg | Bin admin/images/ticker_icon_sm.jpg | Bin .../ui/222222_11x11_icon_arrows_leftright.gif | Bin admin/images/ui/222222_11x11_icon_arrows_updown.gif | Bin admin/images/ui/222222_11x11_icon_close.gif | Bin admin/images/ui/222222_11x11_icon_doc.gif | Bin admin/images/ui/222222_11x11_icon_folder_closed.gif | Bin admin/images/ui/222222_11x11_icon_folder_open.gif | Bin admin/images/ui/222222_11x11_icon_minus.gif | Bin admin/images/ui/222222_11x11_icon_plus.gif | Bin admin/images/ui/222222_11x11_icon_resize_se.gif | Bin .../ui/222222_35x9_colorpicker_indicator.gif.gif | Bin admin/images/ui/222222_7x7_arrow_down.gif | Bin admin/images/ui/222222_7x7_arrow_left.gif | Bin admin/images/ui/222222_7x7_arrow_right.gif | Bin admin/images/ui/222222_7x7_arrow_up.gif | Bin .../ui/888888_11x11_icon_arrows_leftright.gif | Bin admin/images/ui/888888_11x11_icon_arrows_updown.gif | Bin admin/images/ui/888888_11x11_icon_close.gif | Bin admin/images/ui/888888_11x11_icon_doc.gif | Bin admin/images/ui/888888_11x11_icon_folder_closed.gif | Bin admin/images/ui/888888_11x11_icon_folder_open.gif | Bin admin/images/ui/888888_11x11_icon_minus.gif | Bin admin/images/ui/888888_11x11_icon_plus.gif | Bin admin/images/ui/888888_7x7_arrow_down.gif | Bin admin/images/ui/888888_7x7_arrow_left.gif | Bin admin/images/ui/888888_7x7_arrow_right.gif | Bin admin/images/ui/888888_7x7_arrow_up.gif | Bin .../ui/8ab9ff_40x100_textures_02_glass_50.png | Bin admin/images/ui/_x_. | Bin .../ui/d8d8d8_40x100_textures_02_glass_90.png | Bin .../ui/e0e0e0_40x100_textures_02_glass_80.png | Bin .../images/ui/f3f3f3_40x100_textures_01_flat_0.png | Bin .../ui/ffffff_11x11_icon_arrows_leftright.gif | Bin admin/images/ui/ffffff_11x11_icon_arrows_updown.gif | Bin admin/images/ui/ffffff_11x11_icon_close.gif | Bin admin/images/ui/ffffff_11x11_icon_doc.gif | Bin admin/images/ui/ffffff_11x11_icon_folder_closed.gif | Bin admin/images/ui/ffffff_11x11_icon_folder_open.gif | Bin admin/images/ui/ffffff_11x11_icon_minus.gif | Bin admin/images/ui/ffffff_11x11_icon_plus.gif | Bin admin/images/ui/ffffff_7x7_arrow_down.gif | Bin admin/images/ui/ffffff_7x7_arrow_left.gif | Bin admin/images/ui/ffffff_7x7_arrow_right.gif | Bin admin/images/ui/ffffff_7x7_arrow_up.gif | Bin admin/js/ui.jquery.js | 0 admin/js/ui.progressbar-custom.min.js | 0 config.inc.php.sample | 0 content/render/api/005.php | 0 crossdomain.xml | 0 hardware/audio_testing.php | 0 install/schema.sql | 0 60 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 admin/app/frontpage/login.php mode change 100755 => 100644 admin/app/moderate/confirm.php mode change 100755 => 100644 admin/app/users/password.php mode change 100755 => 100644 admin/css/ui.jquery.css mode change 100755 => 100644 admin/images/addtab_bgleft.gif mode change 100755 => 100644 admin/images/addtab_bgright.gif mode change 100755 => 100644 admin/images/graphics_icon_sm.jpg mode change 100755 => 100644 admin/images/ss/title_ss.png mode change 100755 => 100644 admin/images/ss/topimg.jpg mode change 100755 => 100644 admin/images/ticker_icon_sm.jpg mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_arrows_leftright.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_arrows_updown.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_close.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_doc.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_folder_closed.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_folder_open.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_minus.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_plus.gif mode change 100755 => 100644 admin/images/ui/222222_11x11_icon_resize_se.gif mode change 100755 => 100644 admin/images/ui/222222_35x9_colorpicker_indicator.gif.gif mode change 100755 => 100644 admin/images/ui/222222_7x7_arrow_down.gif mode change 100755 => 100644 admin/images/ui/222222_7x7_arrow_left.gif mode change 100755 => 100644 admin/images/ui/222222_7x7_arrow_right.gif mode change 100755 => 100644 admin/images/ui/222222_7x7_arrow_up.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_arrows_leftright.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_arrows_updown.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_close.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_doc.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_folder_closed.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_folder_open.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_minus.gif mode change 100755 => 100644 admin/images/ui/888888_11x11_icon_plus.gif mode change 100755 => 100644 admin/images/ui/888888_7x7_arrow_down.gif mode change 100755 => 100644 admin/images/ui/888888_7x7_arrow_left.gif mode change 100755 => 100644 admin/images/ui/888888_7x7_arrow_right.gif mode change 100755 => 100644 admin/images/ui/888888_7x7_arrow_up.gif mode change 100755 => 100644 admin/images/ui/8ab9ff_40x100_textures_02_glass_50.png mode change 100755 => 100644 admin/images/ui/_x_. mode change 100755 => 100644 admin/images/ui/d8d8d8_40x100_textures_02_glass_90.png mode change 100755 => 100644 admin/images/ui/e0e0e0_40x100_textures_02_glass_80.png mode change 100755 => 100644 admin/images/ui/f3f3f3_40x100_textures_01_flat_0.png mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_arrows_leftright.gif mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_arrows_updown.gif mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_close.gif mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_doc.gif mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_folder_closed.gif mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_folder_open.gif mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_minus.gif mode change 100755 => 100644 admin/images/ui/ffffff_11x11_icon_plus.gif mode change 100755 => 100644 admin/images/ui/ffffff_7x7_arrow_down.gif mode change 100755 => 100644 admin/images/ui/ffffff_7x7_arrow_left.gif mode change 100755 => 100644 admin/images/ui/ffffff_7x7_arrow_right.gif mode change 100755 => 100644 admin/images/ui/ffffff_7x7_arrow_up.gif mode change 100755 => 100644 admin/js/ui.jquery.js mode change 100755 => 100644 admin/js/ui.progressbar-custom.min.js mode change 100755 => 100644 config.inc.php.sample mode change 100755 => 100644 content/render/api/005.php mode change 100755 => 100644 crossdomain.xml mode change 100755 => 100644 hardware/audio_testing.php mode change 100755 => 100644 install/schema.sql diff --git a/admin/app/frontpage/login.php b/admin/app/frontpage/login.php old mode 100755 new mode 100644 diff --git a/admin/app/moderate/confirm.php b/admin/app/moderate/confirm.php old mode 100755 new mode 100644 diff --git a/admin/app/users/password.php b/admin/app/users/password.php old mode 100755 new mode 100644 diff --git a/admin/css/ui.jquery.css b/admin/css/ui.jquery.css old mode 100755 new mode 100644 diff --git a/admin/images/addtab_bgleft.gif b/admin/images/addtab_bgleft.gif old mode 100755 new mode 100644 diff --git a/admin/images/addtab_bgright.gif b/admin/images/addtab_bgright.gif old mode 100755 new mode 100644 diff --git a/admin/images/graphics_icon_sm.jpg b/admin/images/graphics_icon_sm.jpg old mode 100755 new mode 100644 diff --git a/admin/images/ss/title_ss.png b/admin/images/ss/title_ss.png old mode 100755 new mode 100644 diff --git a/admin/images/ss/topimg.jpg b/admin/images/ss/topimg.jpg old mode 100755 new mode 100644 diff --git a/admin/images/ticker_icon_sm.jpg b/admin/images/ticker_icon_sm.jpg old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_arrows_leftright.gif b/admin/images/ui/222222_11x11_icon_arrows_leftright.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_arrows_updown.gif b/admin/images/ui/222222_11x11_icon_arrows_updown.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_close.gif b/admin/images/ui/222222_11x11_icon_close.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_doc.gif b/admin/images/ui/222222_11x11_icon_doc.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_folder_closed.gif b/admin/images/ui/222222_11x11_icon_folder_closed.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_folder_open.gif b/admin/images/ui/222222_11x11_icon_folder_open.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_minus.gif b/admin/images/ui/222222_11x11_icon_minus.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_plus.gif b/admin/images/ui/222222_11x11_icon_plus.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_11x11_icon_resize_se.gif b/admin/images/ui/222222_11x11_icon_resize_se.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_35x9_colorpicker_indicator.gif.gif b/admin/images/ui/222222_35x9_colorpicker_indicator.gif.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_7x7_arrow_down.gif b/admin/images/ui/222222_7x7_arrow_down.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_7x7_arrow_left.gif b/admin/images/ui/222222_7x7_arrow_left.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_7x7_arrow_right.gif b/admin/images/ui/222222_7x7_arrow_right.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/222222_7x7_arrow_up.gif b/admin/images/ui/222222_7x7_arrow_up.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_arrows_leftright.gif b/admin/images/ui/888888_11x11_icon_arrows_leftright.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_arrows_updown.gif b/admin/images/ui/888888_11x11_icon_arrows_updown.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_close.gif b/admin/images/ui/888888_11x11_icon_close.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_doc.gif b/admin/images/ui/888888_11x11_icon_doc.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_folder_closed.gif b/admin/images/ui/888888_11x11_icon_folder_closed.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_folder_open.gif b/admin/images/ui/888888_11x11_icon_folder_open.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_minus.gif b/admin/images/ui/888888_11x11_icon_minus.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_11x11_icon_plus.gif b/admin/images/ui/888888_11x11_icon_plus.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_7x7_arrow_down.gif b/admin/images/ui/888888_7x7_arrow_down.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_7x7_arrow_left.gif b/admin/images/ui/888888_7x7_arrow_left.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_7x7_arrow_right.gif b/admin/images/ui/888888_7x7_arrow_right.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/888888_7x7_arrow_up.gif b/admin/images/ui/888888_7x7_arrow_up.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/8ab9ff_40x100_textures_02_glass_50.png b/admin/images/ui/8ab9ff_40x100_textures_02_glass_50.png old mode 100755 new mode 100644 diff --git a/admin/images/ui/_x_. b/admin/images/ui/_x_. old mode 100755 new mode 100644 diff --git a/admin/images/ui/d8d8d8_40x100_textures_02_glass_90.png b/admin/images/ui/d8d8d8_40x100_textures_02_glass_90.png old mode 100755 new mode 100644 diff --git a/admin/images/ui/e0e0e0_40x100_textures_02_glass_80.png b/admin/images/ui/e0e0e0_40x100_textures_02_glass_80.png old mode 100755 new mode 100644 diff --git a/admin/images/ui/f3f3f3_40x100_textures_01_flat_0.png b/admin/images/ui/f3f3f3_40x100_textures_01_flat_0.png old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_arrows_leftright.gif b/admin/images/ui/ffffff_11x11_icon_arrows_leftright.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_arrows_updown.gif b/admin/images/ui/ffffff_11x11_icon_arrows_updown.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_close.gif b/admin/images/ui/ffffff_11x11_icon_close.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_doc.gif b/admin/images/ui/ffffff_11x11_icon_doc.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_folder_closed.gif b/admin/images/ui/ffffff_11x11_icon_folder_closed.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_folder_open.gif b/admin/images/ui/ffffff_11x11_icon_folder_open.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_minus.gif b/admin/images/ui/ffffff_11x11_icon_minus.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_11x11_icon_plus.gif b/admin/images/ui/ffffff_11x11_icon_plus.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_7x7_arrow_down.gif b/admin/images/ui/ffffff_7x7_arrow_down.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_7x7_arrow_left.gif b/admin/images/ui/ffffff_7x7_arrow_left.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_7x7_arrow_right.gif b/admin/images/ui/ffffff_7x7_arrow_right.gif old mode 100755 new mode 100644 diff --git a/admin/images/ui/ffffff_7x7_arrow_up.gif b/admin/images/ui/ffffff_7x7_arrow_up.gif old mode 100755 new mode 100644 diff --git a/admin/js/ui.jquery.js b/admin/js/ui.jquery.js old mode 100755 new mode 100644 diff --git a/admin/js/ui.progressbar-custom.min.js b/admin/js/ui.progressbar-custom.min.js old mode 100755 new mode 100644 diff --git a/config.inc.php.sample b/config.inc.php.sample old mode 100755 new mode 100644 diff --git a/content/render/api/005.php b/content/render/api/005.php old mode 100755 new mode 100644 diff --git a/crossdomain.xml b/crossdomain.xml old mode 100755 new mode 100644 diff --git a/hardware/audio_testing.php b/hardware/audio_testing.php old mode 100755 new mode 100644 diff --git a/install/schema.sql b/install/schema.sql old mode 100755 new mode 100644 From 9cacfc6c7523b68c305ebc019b94bcaf7b4d327f Mon Sep 17 00:00:00 2001 From: Kevin Russell Date: Fri, 29 Jul 2011 14:57:04 -0600 Subject: [PATCH 6/8] Minor fixes to remove error messages and check variables --- admin/app/content/controller.php | 2 +- common/notification.php | 11 +- common/scripts/cron.php | 416 ++++++++++++++++--------------- 3 files changed, 219 insertions(+), 210 deletions(-) diff --git a/admin/app/content/controller.php b/admin/app/content/controller.php index 98285e7..fd87aae 100644 --- a/admin/app/content/controller.php +++ b/admin/app/content/controller.php @@ -204,7 +204,7 @@ function createAction() } $uploader = new Uploader($dat['name'], $start, $end, $feed_ids, $dat['duration']*1000, - $content_val, $dat['upload_type'], $_SESSION[user]->id, 1); + $content_val, $dat['upload_type'], $_SESSION['user']->id, 1); } if($uploader->retval) { if($dat['upload_type'] == 'dynamic') { diff --git a/common/notification.php b/common/notification.php index 8a3fe71..7f4c6d7 100644 --- a/common/notification.php +++ b/common/notification.php @@ -193,18 +193,23 @@ function build(){ } $this->lost_items = false; - if($temp_text = $text[$this->type][$this->by][$this->msg]){ + if( array_key_exists($this->type,$text) + && array_key_exists($this->by,$text[$this->type]) + && array_key_exists($this->msg,$text[$this->type][$this->by]) + && $temp_text = $text[$this->type][$this->by][$this->msg]){ if($this->type_obj != '' && $this->type_obj->set && strlen($this->type_obj->name) > 0){ $temp_text = str_replace('%1_name', $this->type_obj->name, $temp_text); $temp_text = str_replace('%1_id', $this->type_obj->id, $temp_text); - $temp_text = str_replace('%1_un', $this->type_obj->username, $temp_text); + if( isset($this->type_obj->username) ) + $temp_text = str_replace('%1_un', $this->type_obj->username, $temp_text); } else { $this->lost_items = true; } if($this->by_obj != '' && $this->by_obj->set && strlen($this->by_obj->name) > 0){ $temp_text = str_replace('%2_name', $this->by_obj->name, $temp_text); $temp_text = str_replace('%2_id', $this->by_obj->id, $temp_text); - $temp_text = str_replace('%2_un', $this->by_obj->username, $temp_text); + if( isset($this->type_obj->username) ) + $temp_text = str_replace('%2_un', $this->by_obj->username, $temp_text); } else { $this->lost_items = true; } diff --git a/common/scripts/cron.php b/common/scripts/cron.php index 84a69cd..8c10ed6 100644 --- a/common/scripts/cron.php +++ b/common/scripts/cron.php @@ -1,206 +1,210 @@ - $templates){ - $scr = new Screen($key); - $templates = remove_element($templates, $scr->template_id); - $new_key = array_rand($templates,1); - $scr->template_id = $templates[$new_key]; - $scr->set_properties(); - } - echo "Template rotation complete.\n"; - } - echo "Hourly job complete.\n"; - } - //End template rotation -} -function always(){ - //First generate new content for dynamic feeds - $feed_handler = new Feed(); - if($feeds = $feed_handler->get_all("WHERE type = 1 OR type = 4")){ - foreach($feeds as $feed){ - echo "Calling $feed->name for update. \n"; - if($feed->dyn->update()){ - echo "Updated $feed->name OK\n"; - } else { - echo "Error updating $feed->name\n"; - echo "Dynamic Status: {$feed->dyn->status}\n"; - echo ""; - print_r($feed); - echo ""; - } - echo "Status: " . $feed->dyn->status . "\n"; - - } - } - //Then generate the newsfeed! - echo "Begin notification processing...\n"; - $notif = new Notification(); - $notif->process(20); //If more than 20 are generated the system might be under high load. - echo "Done processing notifications. \n"; - - // Send email notifications if the screens are not online - echo "Scanning for recently downed screens...\n"; - screen_offline_mail( ); - echo "Done scanning for downed screens.\n"; -} - -function screen_offline_mail( ) { - # Query all screens and mail a report if any are offline - $screens = Screen::get_all( ); - if(!is_array($screens)){ - return false; - } - $downed_screens = Array( ); - foreach ($screens as $screen) { - if ($screen->went_down() && $screen->type == 0) { - $downed_screens[] = $screen; - } - } - - # construct email report if any screens have gone down in last 2 hours - if (count($downed_screens) > 0) { - $admin = new Group(ADMIN_GROUP_ID); - - $mail_body = "The following Concerto screens have gone offline. Please investigate.\n"; - //$mail_body .= "NOTE: THIS EMAIL IS A TEST, IT IS ONLY A TEST. FEEL FREE TO IGNORE.\n"; - foreach ($downed_screens as $screen) { - $name = $screen->name; - echo "Found downed screen $name.\n"; - $location = $screen->location; - $mac = $screen->mac_inhex; - $last_ip = $screen->last_ip; - - $mail_body .= "$name (at $location, last ip $last_ip mac $mac)\n"; - } - - $admin->send_mail("Screen Outage Detected", $mail_body); - } -} - -//Tiny helper function for the template rotation -function remove_element($arr, $val){ - foreach ($arr as $key => $value){ - if ($arr[$key] == $val){ - unset($arr[$key]); - } - } - return $arr = array_values($arr); -} - -//Scan for content still in the moderation queue that has expired and deny it -function deny_expired(){ - $notification = "The content was denied automatically. A moderator did not review this item before the expiration date."; - $feeds = Feed::get_all(); - foreach($feeds as $feed){ - $contents = $feed->content_get('NULL'); //Content that hasn't been moderated - if($contents){ - foreach($contents as $content){ - if(strtotime($content['content']->end_time) < strtotime('NOW')){ - $feed->content_mod($content['content']->id, 0, 0, $content['content']->get_duration($feed),$notification); - echo "Denied {$content['content']->name} on {$feed->name}\n"; - } - } - } - } -} - -?> + $templates){ + $scr = new Screen($key); + $templates = remove_element($templates, $scr->template_id); + $new_key = array_rand($templates,1); + $scr->template_id = $templates[$new_key]; + $scr->set_properties(); + } + echo "Template rotation complete.\n"; + } + echo "Hourly job complete.\n"; + } + //End template rotation +} +function always(){ + //First generate new content for dynamic feeds + $feed_handler = new Feed(); + if($feeds = $feed_handler->get_all("WHERE type = 1 OR type = 4")){ + foreach($feeds as $feed){ + echo "Calling $feed->name for update. \n"; + if($feed->dyn->update()){ + echo "Updated $feed->name OK\n"; + } else { + echo "Error updating $feed->name\n"; + echo "Dynamic Status: {$feed->dyn->status}\n"; + echo ""; + print_r($feed); + echo ""; + } + echo "Status: " . $feed->dyn->status . "\n"; + + } + } + //Then generate the newsfeed! + echo "Begin notification processing...\n"; + $notif = new Notification(); + $notif->process(20); //If more than 20 are generated the system might be under high load. + echo "Done processing notifications. \n"; + + // Send email notifications if the screens are not online + echo "Scanning for recently downed screens...\n"; + screen_offline_mail( ); + echo "Done scanning for downed screens.\n"; +} + +function screen_offline_mail( ) { + # Query all screens and mail a report if any are offline + $screens = Screen::get_all( ); + if(!is_array($screens)){ + return false; + } + $downed_screens = Array( ); + foreach ($screens as $screen) { + if ($screen->went_down() && $screen->type == 0) { + $downed_screens[] = $screen; + } + } + + # construct email report if any screens have gone down in last 2 hours + if (count($downed_screens) > 0) { + $admin = new Group(ADMIN_GROUP_ID); + + $mail_body = "The following Concerto screens have gone offline. Please investigate.\n"; + //$mail_body .= "NOTE: THIS EMAIL IS A TEST, IT IS ONLY A TEST. FEEL FREE TO IGNORE.\n"; + foreach ($downed_screens as $screen) { + $name = $screen->name; + echo "Found downed screen $name.\n"; + $location = $screen->location; + $mac = $screen->mac_inhex; + $last_ip = $screen->last_ip; + + $mail_body .= "$name (at $location, last ip $last_ip mac $mac)\n"; + } + + $admin->send_mail("Screen Outage Detected", $mail_body); + } +} + +//Tiny helper function for the template rotation +function remove_element($arr, $val){ + foreach ($arr as $key => $value){ + if ($arr[$key] == $val){ + unset($arr[$key]); + } + } + return $arr = array_values($arr); +} + +//Scan for content still in the moderation queue that has expired and deny it +function deny_expired(){ + $notification = "The content was denied automatically. A moderator did not review this item before the expiration date."; + $feeds = Feed::get_all(); + foreach($feeds as $feed){ + $contents = $feed->content_get('NULL'); //Content that hasn't been moderated + if($contents){ + foreach($contents as $content){ + if(strtotime($content['content']->end_time) < strtotime('NOW')){ + $feed->content_mod($content['content']->id, 0, 0, $content['content']->get_duration($feed),$notification); + echo "Denied {$content['content']->name} on {$feed->name}\n"; + } + } + } + } +} + +?> From 89d69b480043ba6653c0fe66659e43022ddcc3bc Mon Sep 17 00:00:00 2001 From: Kevin Russell Date: Sat, 30 Jul 2011 22:15:06 -0600 Subject: [PATCH 7/8] Syntax fixes to eliminate error messages --- admin/app/browse/show.php | 6 +++--- admin/app/content/_form.php | 2 +- admin/app/frontpage/admin.php | 2 +- admin/app/frontpage/controller.php | 2 +- admin/app/pages/list.php | 4 ++-- admin/includes/left_menu.php | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/admin/app/browse/show.php b/admin/app/browse/show.php index 48fd3ea..45b43d0 100644 --- a/admin/app/browse/show.php +++ b/admin/app/browse/show.php @@ -114,10 +114,10 @@
      -

    • Active

      • -
    • middlelastargs[4] == "expired") { ?> ui-tabs-selected">

      Expired

      • +

    • Active

      • +
    • middlelastargs[4])&&($this->args[4] == "expired")) { ?> ui-tabs-selected">

      Expired

      • feed->user_priv($_SESSION['user'], "moderate")) { ?> -
    • ui-tabs-selected">

      Declined

      • +
    • ui-tabs-selected">

      Declined

    diff --git a/admin/app/content/_form.php b/admin/app/content/_form.php index 9774b07..9046a2e 100644 --- a/admin/app/content/_form.php +++ b/admin/app/content/_form.php @@ -110,7 +110,7 @@
    diff --git a/admin/app/frontpage/admin.php b/admin/app/frontpage/admin.php index 1205eff..93859d8 100644 --- a/admin/app/frontpage/admin.php +++ b/admin/app/frontpage/admin.php @@ -37,7 +37,7 @@ $this->users=Array(); if(is_array($userids)) foreach($userids as $user) { - $user = new User($user[username]); + $user = new User($user['username']); echo ''; } diff --git a/admin/app/frontpage/controller.php b/admin/app/frontpage/controller.php index 937c48c..f458366 100644 --- a/admin/app/frontpage/controller.php +++ b/admin/app/frontpage/controller.php @@ -287,7 +287,7 @@ function loginAction() } function authAction() { - if(login_login($_REQUEST[user][username], $_REQUEST[user][password])){ + if(login_login($_REQUEST['user']['username'], $_REQUEST['user']['password'])){ redirect_to(ADMIN_URL."/frontpage/dashboard"); } else { $this->flash("Unable to authenticate with the username/password combination", 'error'); diff --git a/admin/app/pages/list.php b/admin/app/pages/list.php index 7928811..4a468a2 100644 --- a/admin/app/pages/list.php +++ b/admin/app/pages/list.php @@ -54,8 +54,8 @@ Default page:
    mime_type)) { echo "id\">id?width=50&height=37\" alt=\"Icon\" />"; @@ -155,10 +155,10 @@ echo " "; } ?> - name) ?> + name) ?> start_time))?>end_time))?>start_time))?>end_time))?>
    mime_type)) { echo "id\">id?width=50&height=37\" alt=\"Icon\" />"; @@ -221,10 +221,10 @@ echo " "; } ?> - name) ?> + name) ?> start_time))?>end_time))?>start_time))?>end_time))?>
    mime_type)) { echo "id\">id?width=50&height=37\" alt=\"Icon\" />"; @@ -287,10 +287,10 @@ echo " "; } ?> - name) ?> + name) ?> start_time))?>end_time))?>start_time))?>end_time))?>
     
    - The MAC address cannot be found in the database.
    - Please verify that this screen has been added to the system. + The MAC address cannot be found in the database.
    + Please verify that this screen has been added to the system.
    Duration

    For how long should this piece of content be displayed on a screen?
    Default is seconds
    - +     		Set a different duration