Minor fixup of file modes

admin/app/browse/show.php

@@ -114,10 +114,10 @@
 
 <div style="float:left; width:70%;">
 	<ul id="maintab" class="ui-tabs-nav">
-		<li class="first<?php if(!isset($this->args[4])) { ?> ui-tabs-selected<?php } ?>"><a class="approved" href="<?= ADMIN_URL ?>/browse/show/<?= $this->feed->id ?>/type/<?= $this->type_id ?>"><h1>Active</h1></a></li>
-		<li class="<?php if($this->feed->user_priv($_SESSION['user'], "moderate")) { ?>middle<?php } else { ?>last<?php } ?><?php if($this->args[4] == "expired") { ?> ui-tabs-selected<?php } ?>"><a class="expired" href="<?= ADMIN_URL ?>/browse/show/<?= $this->feed->id ?>/type/<?= $this->type_id ?>/expired"><h1>Expired</h1></a></li>
+		<li class="first<?php if(!isset($this->args[4])) { ?> ui-tabs-selected<?php } ?>"><a class="approved" href="<?php echo ADMIN_URL ?>/browse/show/<?php echo $this->feed->id ?>/type/<?php echo $this->type_id ?>"><h1>Active</h1></a></li>
+		<li class="<?php if($this->feed->user_priv($_SESSION['user'], "moderate")) { ?>middle<?php } else { ?>last<?php } ?><?php if(isset($this->args[4])&&($this->args[4] == "expired")) { ?> ui-tabs-selected<?php } ?>"><a class="expired" href="<?php echo ADMIN_URL ?>/browse/show/<?php echo $this->feed->id ?>/type/<?php echo $this->type_id ?>/expired"><h1>Expired</h1></a></li>
 <?php if($this->feed->user_priv($_SESSION['user'], "moderate")) { ?>
-		<li class="last<?php if($this->args[4] == "declined") { ?> ui-tabs-selected<?php } ?>"><a class="denied" href="<?= ADMIN_URL ?>/browse/show/<?= $this->feed->id ?>/type/<?= $this->type_id ?>/declined"><h1>Declined</h1></a></li>
+		<li class="last<?php if(isset($this->args[4])&&($this->args[4] == "declined")) { ?> ui-tabs-selected<?php } ?>"><a class="denied" href="<?php echo ADMIN_URL ?>/browse/show/<?php echo $this->feed->id ?>/type/<?php echo $this->type_id ?>/declined"><h1>Declined</h1></a></li>
 <?php } ?>
 	</ul>
 

admin/app/content/_form.php

@@ -110,7 +110,7 @@
          <td><h5>Duration</h5><p>For how long should this piece of content be displayed on a screen?</p></td>
          <td>
            <div class="duration_msg">Default is <?=DEFAULT_DURATION?> seconds</div>
-           <div class="duration_div" style="display:none"><input type="text" size="2" name="content[duration]" value="<?= $content->duration?$content->end_time:DEFAULT_DURATION?>" /> &nbsp;seconds</div>
+           <div class="duration_div" style="display:none"><input type="text" size="2" name="content[duration]" value="<?php echo isset($content->duration)?$content->duration:DEFAULT_DURATION?>" /> &nbsp;seconds</div>
          </td>
          <td width="30%" style="text-align:right;"><a class="click_duration" href="#">Set a different duration</a>
          </td>

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') {

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 '<option value="'.$user->username.'">'.$user->username.' - '.$user->name.'</option>';
          }
 
@@ -62,7 +62,6 @@
 
 <h3>Admin Privs: <span class="emph"><?= isAdmin() ?></span></h3>
 <h3>Reset Session: <span class="emph"><a href="<?=ADMIN_URL?>/frontpage/su?r=1">reset</a></span></h3>
-<h3>Admin Revision: <span class="emph"><?system('svnversion')?></span></h3>
 <a href="<?= ADMIN_URL ?>/frontpage/phpinfo">PHP Info</a><br />
 <a href="<?= ADMIN_URL ?>/frontpage/mailer">Send Mail</a><br />
 <a href="<?= ADMIN_URL ?>/frontpage/addtemplate">Template Importer</a></br>

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');

admin/app/pages/list.php

@@ -54,8 +54,8 @@
    Default page: <select name="page">
    <option value=""></option>
 <?php
-   $pp = sql_select('page',Array('id','name'),"page_category_id LIKE $page[page_category_id]");
-      list($cat) = sql_select('page_category','default_page','id = '.$page[page_category_id]);
+   $pp = sql_select('page',Array('id','name'),"page_category_id LIKE ".$page['page_category_id']);
+      list($cat) = sql_select('page_category','default_page','id = '.$page['page_category_id']);
    $notfirst = 0; //Indicate that we haven't yet done the first row.  
    if(is_array($pp)) {
    foreach($pp as $lp) {

admin/includes/left_menu.php

@@ -85,8 +85,7 @@
          $more_waiting += $row['cnt'];
       }
    }
-}
-if(isset($mod_feeds) || ($more_waiting && isAdmin())) {
+   if(isset($mod_feeds) || ($more_waiting && isAdmin())) {
 ?>
     <div class="alert_box">
 	   <div class="alert_box_inset">
@@ -99,7 +98,8 @@
         </div>
       </div>
     </div>
-<?
+<?php
+   }
 }
 ?>
   </div>

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;
 			}