Staging 1.9.3 on no-CAS

admin/app/wall/controller.php

@@ -40,6 +40,9 @@ function indexAction()
                                              AND feed_content.moderation_flag = 1
                                              AND content.start_time <= NOW() AND content.end_time >= NOW() AND content.mime_type LIKE "%image%"');
       $this->content_count = array();
+      if(!is_array($this->feeds)){
+        $this->feeds = array();
+      }
       foreach($this->feeds as $id => $feed){
           $sql = "SELECT COUNT(content.id) FROM feed_content
                 LEFT JOIN content ON feed_content.content_id = content.id

common/scripts/cron.php

@@ -151,7 +151,7 @@ function screen_offline_mail( ) {
     }
     $downed_screens = Array( );
     foreach ($screens as $screen) {
-        if ($screen->went_down()) {
+        if ($screen->went_down() && $screen->type == 0) {
             $downed_screens[] = $screen;
         }
     }

content/render/api/008.php

@@ -25,7 +25,7 @@
  */
 //Content Rendering API
 //Version 0.08
-//Notes: You shouldn't be touching this file directly.  You should be calling through the render/index.php handler and passing the version 007
+//Notes: You shouldn't be touching this file directly.  You should be calling through the render/index.php handler and passing the version 008
 include(COMMON_DIR.'user.php');     //Class to represent a site user
 include(COMMON_DIR.'feed.php');     //Class to represent a content feed
 include(COMMON_DIR.'content.php');  //Class to represent content items in the system
@@ -269,7 +269,7 @@ function render_rss($content_arr, $criteria){
             <link><?= $link ?></link>
             <description><?= $desc ?></description>
             <pubDate><?= rssdate($content->submitted) ?></pubDate>
-            <author><?= $user->username ?>@rpi.edu (<?= htmlspecialchars(utf8_encode($user->name)) ?>)</author>
+            <author><?= $user->email ?> (<?= htmlspecialchars(utf8_encode($user->name)) ?>)</author>
             <guid isPermaLink="false"><?= 'http://' . $_SERVER['SERVER_NAME'] . ADMIN_URL ?>/content/show/<?= $content->id ?></guid>
 <?          foreach($feeds as $feed_obj){
                 if($feed_obj['moderation_flag'] == 1 && $feed_obj['feed']->type != 3){

content/render/api/009.php

@@ -24,8 +24,8 @@
  * @version      $Revision$
  */
 //Content Rendering API
-//Version 0.08
-//Notes: You shouldn't be touching this file directly.  You should be calling through the render/index.php handler and passing the version 007
+//Version 0.09
+//Notes: You shouldn't be touching this file directly.  You should be calling through the render/index.php handler and passing the version 009
 include(COMMON_DIR.'user.php');     //Class to represent a site user
 include(COMMON_DIR.'feed.php');     //Class to represent a content feed
 include(COMMON_DIR.'content.php');  //Class to represent content items in the system
@@ -227,7 +227,7 @@ function render_rss($content_arr, $criteria){
         <description>RSS Feed from Concerto API</description>
         <language>en-us</language>
         <pubDate><?= rssdate("now") ?></pubDate>
-        <generator>Concerto API 0.08</generator>
+        <generator>Concerto API 0.09</generator>
         <webMaster><?= SYSTEM_EMAIL ?> (Concerto Digital Signage)</webMaster>
         <atom:link href="<?= 'http://' . $_SERVER['SERVER_NAME'] . htmlspecialchars($_SERVER['REQUEST_URI']) ?>" rel="self" type="application/rss+xml" />
         <image>
@@ -285,7 +285,7 @@ function render_rss($content_arr, $criteria){
             <link><?= $link ?></link>
             <description><?= $desc ?></description>
             <pubDate><?= rssdate($content->submitted) ?></pubDate>
-            <author><?= $user->username ?>@rpi.edu (<?= htmlspecialchars(utf8_encode($user->name)) ?>)</author>
+            <author><?= $user->email ?> (<?= htmlspecialchars(utf8_encode($user->name)) ?>)</author>
             <guid isPermaLink="false"><?= 'http://' . $_SERVER['SERVER_NAME'] . ADMIN_URL ?>/content/show/<?= $content->id ?></guid>
 <?          foreach($feeds as $feed_obj){
                 if($feed_obj['moderation_flag'] == 1 && $feed_obj['feed']->type != 3){

install/UPDATE

@@ -1,12 +1,11 @@
-If you are running a 1.9.1 or below version of Concerto, and would like to upgrade to Concerto 1.9.2 this may be of some help:
-0.  Backup everything.  I make a habit of cp -R concerto ~/current_concerto just to make sure I don't loose anything.
+If you are running a 1.9.2 or an earlier version of Concerto, and would like to upgrade to Concerto 1.9.3 this may be of some help:
+0.  Backup everything.  I make a habit of cp -R concerto ~/current_concerto just to make sure I don't loose anything.  A SQL dump wouldn't hurt either.
 1.  Replace all your Concerto files with the new ones, obviously nothing in your content/images or content/templates directory 
     should get overridden, neither should your config.inc.php. 
-2.  Open up config.inc.php and delete the VERSION line that say 1.9.2.  This is stored in its own file so you don't have to
+2.  [ONLY IF YOU SKIPPED VERSION 1.9.2] Open up config.inc.php and delete any line that defines a VERSION.  This is stored in its own file so you don't have to
     manually update it anymore.
-3.  If you use Info Pages a lot (specifically the categories) and have been getting errors, you'll want to set "auto increment"
+3.  [ONLY IF YOU SKIPPED VERSION 1.9.2] If you use Info Pages a lot (specifically the categories) and have been getting errors, you'll want to set "auto increment"
     on the id field of the "page_category" table.  You should probably backup your database first, and watch out for any
     categories with id=0.
-4.  If you're using memcache or do any php caching, you should restart the appropriate services.  There were a few changes to
-    image rendering and you might have bad caches for transparent PNG's.
-5.  Enjoy Concerto 1.9.2.  If you have any feedback, send it along!
+4.  If you're using memcache or do any php caching, you should restart the appropriate services.
+5.  Enjoy Concerto 1.9.3.  If you have any feedback, send it along!

install/data.sql

@@ -10,7 +10,7 @@ INSERT INTO `page_category` (`id`, `path`, `name`, `layout`, `default_page`) VAL
 INSERT INTO `type` (`id`, `name`) VALUES (1, 'Text'), (2, 'Ticker'), (3, 'Graphics'), (4, 'Dynamic Data');
 INSERT INTO `user` (`id`, `username`, `password`, `name`, `email`, `admin_privileges`, `allow_email`) VALUES (1, 'admin', '', 'System Administrator', 'admin@yoursite.com', 1, 0);
 UPDATE `user` SET `id` = 0 WHERE `id` = 1;
-INSERT INTO `user_group` (`user_id` ,`group_id`)VALUES ('0', '1');
+INSERT INTO `user_group` (`user_id` ,`group_id`)VALUES ('0', '0');
 
 ##Optional Data....
 ## A sampling from our support center

screen/signage.js

@@ -193,6 +193,7 @@
 
         //function to fit text perfectly in the specified box
         fitBox: function(height, top){
+          if(/\S/.test($(this).text())){
             //define high and low bound for the font sizing
             var high = 64;
             var low = 0;
@@ -217,7 +218,16 @@
             //center the div
             $(this).css("top", top + (height - $(this).height()) / 2);
             //return current div
-            return $(this);
+          } else {
+              child = $(this).children(":first");
+              if(child){
+                $(this).css({"position": "absolute",
+                             "left": $(this).css('left') + ($(this).width() - child.width) / 2,
+                             "top": $(this).css('top') + ($(this).height() - child.height) / 2
+                           });
+              }
+          }
+          return $(this);
         }
 	});
 })(jQuery);

version.inc.php

@@ -24,6 +24,6 @@
  * @version      $Revision: 558 $
  */
 
-define('CONCERTO_VERSION', '1.9.2');
+define('CONCERTO_VERSION', '1.9.3');
 
-?>
+?>