Changeset 1025

Show
Ignore:
Timestamp:
06/26/07 00:32:16 (2 years ago)
Author:
shibuya
Message:

Fixed duplicate include issue.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 5200R/trunk/ui/base-am.mod/Makefile

    r750 r1025  
    88 
    99VERSION=1.1.0 
    10 RELEASE=98BQ15 
     10RELEASE=98BQ16 
    1111 
    1212# add a buildarch if desired 

  • 5200R/trunk/ui/base-am.mod/packing_list

    r652 r1025  
    11RPM: swatch-2.0.49-1.i386.rpm 
    22# [AUTORPMS] DO NOT REMOVE THIS LINE OR EDIT ANYTHING BELOW IT, BY ORDER OF THE BUILD PEOPLE 
    3 RPM: am-bins-1.1.1-21BQ9.centos4.i386.rpm 
     3RPM: am-bins-1.1.1-21BQ9.i386.rpm 

  • 5200R/trunk/ui/base-am.mod/templates/rpmdefs.tmpl

    r751 r1025  
    104104 
    105105<begin $CHANGELOG> 
     106* Mon Jun 25 2007 Hisao SHIBUYA <shibuya@bluequartz.org> 1.1.0-98BQ16 
     107- Fixed duplicate include issue. 
     108 
    106109* Tue May 02 2006 Hisao SHIBUYA <shibuya@alpha.or.jp> 1.1.0-98BQ15 
    107110- modify messages to use 'memory' instead of 'DRAM'. 

  • 5200R/trunk/ui/base-am.mod/ui/web/amSettings.php

    r490 r1025  
    44// This is the Active Monitor settings config page 
    55 
    6 include("ArrayPacker.php"); 
    7 include("ServerScriptHelper.php"); 
     6include_once("ArrayPacker.php"); 
     7include_once("ServerScriptHelper.php"); 
    88 
    99$servhelp = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/amSettingsHandler.php

    r490 r1025  
    33// Copyright 2000, Cobalt Networks.  All rights reserved. 
    44 
    5 include("ServerScriptHelper.php"); 
    6 include("ArrayPacker.php"); 
     5include_once("ServerScriptHelper.php"); 
     6include_once("ArrayPacker.php"); 
    77 
    88$servhelp = new ServerScriptHelper($sessionId); 

  • 5200R/trunk/ui/base-am.mod/ui/web/amStatus.php

    r490 r1025  
    44// This is the Active Monitor status page 
    55 
    6 include("ServerScriptHelper.php"); 
     6include_once("ServerScriptHelper.php"); 
    77 
    88$servhelp = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/am_update.php

    r490 r1025  
    11<?php 
    22 
    3 include("ServerScriptHelper.php"); 
     3include_once("ServerScriptHelper.php"); 
    44 
    55$servhelp = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/cpu_details.php

    r309 r1025  
    44// Copyright 2000, Cobalt Networks.  All rights reserved. 
    55 
    6 include("ServerScriptHelper.php"); 
    7 include("base/am/am_detail.inc"); 
     6include_once("ServerScriptHelper.php"); 
     7include_once("base/am/am_detail.inc"); 
    88 
    99$serverScriptHelper = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/detailPage.php

    r490 r1025  
    77//   then just include this file. 
    88 
    9 include("ServerScriptHelper.php"); 
    10 include("base/am/am_detail.inc"); 
     9include_once("ServerScriptHelper.php"); 
     10include_once("base/am/am_detail.inc"); 
    1111 
    1212$serverScriptHelper = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/ecc_image.php

    r266 r1025  
    22// $Id$ 
    33 
    4 include("base/am/imagelib.inc"); 
     4include_once("base/am/imagelib.inc"); 
    55 
    66$ecc_status = unserialize($status); 

  • 5200R/trunk/ui/base-am.mod/ui/web/ecc_logs.php

    r266 r1025  
    55// $Id$ 
    66 
    7 include("ServerScriptHelper.php"); 
    8 include("base/am/am_detail.inc"); 
     7include_once("ServerScriptHelper.php"); 
     8include_once("base/am/am_detail.inc"); 
    99 
    1010$serverScriptHelper = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/fans_details.php

    r266 r1025  
    44// Copyright 2000, Sun Microsystems, Inc.  All rights reserved. 
    55// $Id$ 
    6 include("ServerScriptHelper.php"); 
    7 include("base/am/am_detail.inc"); 
    8 include("./fans.inc"); 
    9 include("base/am/imagelib.inc"); 
     6include_once("ServerScriptHelper.php"); 
     7include_once("base/am/am_detail.inc"); 
     8include_once("./fans.inc"); 
     9include_once("base/am/imagelib.inc"); 
    1010 
    1111 

  • 5200R/trunk/ui/base-am.mod/ui/web/fans_image.php

    r266 r1025  
    11<?php 
    22// $Id$ 
    3 include("./fans.inc"); 
    4 include("base/am/imagelib.inc"); 
     3include_once("./fans.inc"); 
     4include_once("base/am/imagelib.inc"); 
    55 
    66$fans_status = fans_status(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/memory_details.php

    r583 r1025  
    99// 
    1010 
    11 include("ServerScriptHelper.php"); 
    12 include("base/am/am_detail.inc"); 
     11include_once("ServerScriptHelper.php"); 
     12include_once("base/am/am_detail.inc"); 
    1313 
    1414$serverScriptHelper = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/monitorLight.php

    r259 r1025  
    44// $Id$ 
    55 
    6 include("ServerScriptHelper.php"); 
     6include_once("ServerScriptHelper.php"); 
    77 
    88$serverScriptHelper = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-am.mod/ui/web/temp_details.php

    r266 r1025  
    44// Copyright 2000, Sun Microsystems, Inc.  All rights reserved. 
    55 
    6 include("ServerScriptHelper.php"); 
    7 include("base/am/am_detail.inc"); 
     6include_once("ServerScriptHelper.php"); 
     7include_once("base/am/am_detail.inc"); 
    88 
    99$serverScriptHelper = new ServerScriptHelper();