Thread: [Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[192] (Page 2)
Brought to you by:
namiltd
From: <big...@us...> - 2009-04-18 11:36:39
|
Revision: 192 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=192&view=rev Author: bigmichi1 Date: 2009-04-18 11:36:37 +0000 (Sat, 18 Apr 2009) Log Message: ----------- read ModelTranslation File on Darwin Modified Paths: -------------- includes/os/class.Darwin.inc.php Added Paths: ----------- data/ModelTranslation.txt Added: data/ModelTranslation.txt =================================================================== --- data/ModelTranslation.txt (rev 0) +++ data/ModelTranslation.txt 2009-04-18 11:36:37 UTC (rev 192) @@ -0,0 +1,69 @@ +ADP2,1:Developer Transition Kit +iMac1,1:iMac G3 (Rev A-D) +iMac4,1:iMac (Core Duo) +iMac4,2:iMac for Education (17-inch, Core Duo) +Macmini1,1:Mac Mini (Core Solo/Duo) +MacBook1,1:MacBook +MacBookPro1,1:MacBook Pro (15-inch) +MacBookPro3,1:MacBook Pro SR (15-inch) +MacBookPro1,2:MacBook Pro (17-inch) +PowerBook1,1:PowerBook G3 +PowerBook2,1:iBook G3 +PowerBook2,2:iBook G3 (FireWire) +PowerBook2,3:iBook G3 +PowerBook2,4:iBook G3 +PowerBook3,1:PowerBook G3 (FireWire) +PowerBook3,2:PowerBook G4 +PowerBook3,3:PowerBook G4 (Gigabit Ethernet) +PowerBook3,4:PowerBook G4 (DVI) +PowerBook3,5:PowerBook G4 (1GHz / 867MHz) +PowerBook4,1:iBook G3 (Dual USB, Late 2001) +PowerBook4,2:iBook G3 (16MB VRAM) +PowerBook4,3:iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) +PowerBook5,1:PowerBook G4 (17 inch) +PowerBook5,2:PowerBook G4 (15 inch FW 800) +PowerBook5,3:PowerBook G4 (17-inch 1.33GHz) +PowerBook5,4:PowerBook G4 (15 inch 1.5/1.33GHz) +PowerBook5,5:PowerBook G4 (17-inch 1.5GHz) +PowerBook5,6:PowerBook G4 (15 inch 1.67GHz/1.5GHz) +PowerBook5,7:PowerBook G4 (17-inch 1.67GHz) +PowerBook5,8:PowerBook G4 (Double layer SD, 15 inch) +PowerBook5,9:PowerBook G4 (Double layer SD, 17 inch) +PowerBook6,1:PowerBook G4 (12 inch) +PowerBook6,2:PowerBook G4 (12 inch, DVI) +PowerBook6,3:iBook G4 +PowerBook6,4:PowerBook G4 (12 inch 1.33GHz) +PowerBook6,5:iBook G4 (Early-Late 2004) +PowerBook6,7:iBook G4 (Mid 2005) +PowerBook6,8:PowerBook G4 (12 inch 1.5GHz) +PowerMac1,1:Power Macintosh G3 (Blue & White) +PowerMac1,2:Power Macintosh G4 (PCI Graphics) +PowerMac2,1:iMac G3 (Slot-loading CD-ROM) +PowerMac2,2:iMac G3 (Summer 2000) +PowerMac3,1:Power Macintosh G4 (AGP Graphics) +PowerMac3,2:Power Macintosh G4 (AGP Graphics) +PowerMac3,3:Power Macintosh G4 (Gigabit Ethernet) +PowerMac3,4:Power Macintosh G4 (Digital Audio) +PowerMac3,5:Power Macintosh G4 (Quick Silver) +PowerMac3,6:Power Macintosh G4 (Mirrored Drive Door) +PowerMac4,1:iMac G3 (Early/Summer 2001) +PowerMac4,2:iMac G4 (Flat Panel) +PowerMac4,4:eMac +PowerMac4,5:iMac G4 (17-inch Flat Panel) +PowerMac5,1:Power Macintosh G4 Cube +PowerMac6,1:iMac G4 (USB 2.0) +PowerMac6,3:iMac G4 (20-inch Flat Panel) +PowerMac6,4:eMac (USB 2.0, 2005) +PowerMac7,2:Power Macintosh G5 +PowerMac7,3:Power Macintosh G5 +PowerMac8,1:iMac G5 +PowerMac8,2:iMac G5 (Ambient Light Sensor) +PowerMac9,1:Power Macintosh G5 (Late 2005) +PowerMac10,1:Mac Mini G4 +PowerMac10,2:Mac Mini (Late 2005) +PowerMac11,2:Power Macintosh G5 (Late 2005) +PowerMac12,1:iMac G5 (iSight) +Xserve1,1:Xserve +RackMac1,1:Xserve G4 +RackMac1,2:Xserve G4 (slot-loading, cluster node) +RackMac3,1:Xserve G5 Property changes on: data/ModelTranslation.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + LF Modified: includes/os/class.Darwin.inc.php =================================================================== --- includes/os/class.Darwin.inc.php 2009-04-18 11:05:45 UTC (rev 191) +++ includes/os/class.Darwin.inc.php 2009-04-18 11:36:37 UTC (rev 192) @@ -105,26 +105,25 @@ { $results = array (); $buf = ""; + $buffer = array(); if (!CommonFunctions::executeProgram('hostinfo', '| grep "Processor type"', $buf, PSI_DEBUG)) { $buf = 'N.A.'; } $results['model'] = ereg_replace('Processor type: ', '', $buf); $results['cpus'] = $this->grabkey('hw.ncpu'); - // return cpu speed - Mhz $results['cpuspeed'] = round($this->grabkey('hw.cpufrequency')/1000000); - // return bus speed - Mhz $results['busspeed'] = round($this->grabkey('hw.busfrequency')/1000000); - // return l2 cache $results['cache'] = round($this->grabkey('hw.l2cachesize')); - if (($this->grabkey('hw.model') == "PowerMac3,6") && ($results['cpus'] == "2")) { - $results['model'] = 'Dual G4 - (PowerPC 7450)'; - } // is Dual G4 - if (($this->grabkey('hw.model') == "PowerMac7,2") && ($results['cpus'] == "2")) { - $results['model'] = 'Dual G5 - (PowerPC 970)'; - } // is Dual G5 - if (($this->grabkey('hw.model') == "PowerMac1,1") && ($results['cpus'] == "1")) { - $results['model'] = 'B&W G3 - (PowerPC 750)'; - } // is B&W G3 + + if(CommonFunctions::rfts(APP_ROOT.'/data/ModelTranslation.txt', $buffer)) { + $buffer = split("\n", $buffer); + foreach($buffer as $line) { + $ar_buf = split(":", $line, 2); + if ($modelRAW === trim($ar_buf[0])) { + $results['model'] = trim($ar_buf[1]); + } + } + } return $results; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2009-04-20 15:36:25
|
Revision: 195 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=195&view=rev Author: jacky672 Date: 2009-04-20 15:36:15 +0000 (Mon, 20 Apr 2009) Log Message: ----------- Replace table sorter images .jpg to .gif with transparency (best result with template) Modified Paths: -------------- templates/plugin/jquery.dataTables.css Added Paths: ----------- gfx/sort_asc.gif gfx/sort_both.gif gfx/sort_desc.gif Removed Paths: ------------- gfx/sort_asc.jpg gfx/sort_both.jpg gfx/sort_desc.jpg Added: gfx/sort_asc.gif =================================================================== (Binary files differ) Property changes on: gfx/sort_asc.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: gfx/sort_asc.jpg =================================================================== (Binary files differ) Added: gfx/sort_both.gif =================================================================== (Binary files differ) Property changes on: gfx/sort_both.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: gfx/sort_both.jpg =================================================================== (Binary files differ) Added: gfx/sort_desc.gif =================================================================== (Binary files differ) Property changes on: gfx/sort_desc.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: gfx/sort_desc.jpg =================================================================== (Binary files differ) Modified: templates/plugin/jquery.dataTables.css =================================================================== --- templates/plugin/jquery.dataTables.css 2009-04-19 08:54:54 UTC (rev 194) +++ templates/plugin/jquery.dataTables.css 2009-04-20 15:36:15 UTC (rev 195) @@ -3,13 +3,13 @@ */ .sorting_asc { - background: url('../../gfx/sort_asc.jpg') no-repeat center right; + background: url('../../gfx/sort_asc.gif') no-repeat center right; } .sorting_desc { - background: url('../../gfx/sort_desc.jpg') no-repeat center right; + background: url('../../gfx/sort_desc.gif') no-repeat center right; } .sorting { - background: url('../../gfx/sort_both.jpg') no-repeat center right; + background: url('../../gfx/sort_both.gif') no-repeat center right; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2009-05-17 19:28:54
|
Revision: 207 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=207&view=rev Author: jacky672 Date: 2009-05-17 19:28:41 +0000 (Sun, 17 May 2009) Log Message: ----------- Add an option value to select tag and correct problem were no cookies are present Modified Paths: -------------- includes/output/class.Webpage.inc.php js/phpSysInfo/phpsysinfo.js Modified: includes/output/class.Webpage.inc.php =================================================================== --- includes/output/class.Webpage.inc.php 2009-05-04 07:58:01 UTC (rev 206) +++ includes/output/class.Webpage.inc.php 2009-05-17 19:28:41 UTC (rev 207) @@ -179,7 +179,7 @@ if ($this->_template === $template) { $selected = " selected=\"selected\""; } - echo " <option".$selected.">".$template."</option>\n"; + echo " <option value=".$template." ".$selected.">".$template."</option>\n"; } echo " </select>\n"; echo " <span id=\"lang_045\">Language</span>\n"; @@ -189,7 +189,7 @@ if ($this->_language === $language) { $selected = " selected=\"selected\""; } - echo " <option".$selected.">".$language."</option>\n"; + echo " <option value=".$language." ".$selected.">".$language."</option>\n"; } echo " </select>\n"; echo " </div>\n"; Modified: js/phpSysInfo/phpsysinfo.js =================================================================== --- js/phpSysInfo/phpsysinfo.js 2009-05-04 07:58:01 UTC (rev 206) +++ js/phpSysInfo/phpsysinfo.js 2009-05-17 19:28:41 UTC (rev 207) @@ -324,8 +324,12 @@ */ function displayPage(xml) { var options, versioni = "", showPickListLang = "", showPickListTemplate = ""; - $("#template").val(cookie_template); - $("#lang").val(cookie_language); + if (cookie_template !== null) { + $("#template").val(cookie_template); + } + if (cookie_language !== null) { + $("#lang").val(cookie_language); + } $("#loader").hide(); $('.stripeMe tr:nth-child(even)').addClass('odd'); $("#container").fadeIn("slow"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2009-05-24 13:26:38
|
Revision: 212 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=212&view=rev Author: jacky672 Date: 2009-05-24 13:26:34 +0000 (Sun, 24 May 2009) Log Message: ----------- Updated jQuery plugin nyroModal to 1.5.0 Modified Paths: -------------- ChangeLog js/jQuery/README js/jQuery/jquery.nyroModal.js templates/plugin/nyroModal.full.css Modified: ChangeLog =================================================================== --- ChangeLog 2009-05-24 13:15:35 UTC (rev 211) +++ ChangeLog 2009-05-24 13:26:34 UTC (rev 212) @@ -37,7 +37,7 @@ - [FIX] Inconsistent translation handling with plugins (includes now also caching) - [UPD] Updated jQuery to 1.3.2 - - [UPD] Updated jQuery plugin nyroModal to 1.4.2 + - [UPD] Updated jQuery plugin nyroModal to 1.5.0 - [UPD] Updated jQuery plugin DataTables to 1.4.3 - [UPD] Updated jQuery plugin jGrowl to 1.2.0 - [UPD] Remove of the hide_* functions, useless calls because of the new config.php style Modified: js/jQuery/README =================================================================== --- js/jQuery/README 2009-05-24 13:15:35 UTC (rev 211) +++ js/jQuery/README 2009-05-24 13:26:34 UTC (rev 212) @@ -20,7 +20,7 @@ jquery.nyroModal.js ------------------------ -VERSION : 1.4.2 +VERSION : 1.5.0 URL : http://plugins.jquery.com/project/nyroModal DESC : nyroModal is a high customizable modal window plugin. USED : provide a modal dialog, that is shown when errors are found during execution of the php parsers, or lets say Modified: js/jQuery/jquery.nyroModal.js =================================================================== --- js/jQuery/jquery.nyroModal.js 2009-05-24 13:15:35 UTC (rev 211) +++ js/jQuery/jquery.nyroModal.js 2009-05-24 13:26:34 UTC (rev 212) @@ -5,8 +5,8 @@ * Copyright (c) 2008 Cedric Nirousset (nyrodev.com) * Licensed under the MIT license * - * $Date: 2009-02-19 (Thu, 19 Feb 2009) $ - * $version: 1.4.2 + * $Date: 2009-05-14 (Thu, 14 May 2009) $ + * $version: 1.5.0 */ jQuery(function($) { @@ -15,13 +15,17 @@ // ------------------------------------------------------- var userAgent = navigator.userAgent.toLowerCase(); - var browserVersion = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1]; - var isIE6 = (/msie/.test(userAgent) && !/opera/.test(userAgent) && parseInt(browserVersion) < 7); + //var browserVersion = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1]; + var browserVersion = (userAgent.match(/.+(?:rv|webkit|khtml|opera|msie)[\/: ]([\d.]+)/ ) || [0,'0'])[1]; + + var isIE6 = (/msie/.test(userAgent) && !/opera/.test(userAgent) && parseInt(browserVersion) < 7 && !window.XMLHttpRequest); var body = $('body'); var currentSettings; var shouldResize = false; + + var gallery = {}; // To know if the fix for the Issue 10 should be applied (or has been applied) var fixFF = false; @@ -39,6 +43,7 @@ animContent: false, loadingShown: false, transition: false, + resizing: false, closing: false, error: false, blocker: null, @@ -57,8 +62,17 @@ // Indicate of the height or the width was resized, to reinit the currentsettings related to null var resized = { width: false, - height: false + height: false, + windowResizing: false }; + + var initSettingsSize = { + width: null, + height: null, + windowResizing: true + }; + + var windowResizeTimeout; // ------------------------------------------------------- @@ -69,10 +83,13 @@ $.fn.nyroModal = function(settings) { if (!this) return false; - return this.each(function(){ + return this.each(function() { + var me = $(this); if (this.nodeName.toLowerCase() == 'form') { - $(this).submit(function(e) { - if ($(this).data('processing')) + me + .unbind('submit.nyroModal') + .bind('submit.nyroModal', function(e) { + if (me.data('nyroModalprocessing')) return true; if (this.enctype == 'multipart/form-data') { processModal($.extend(settings, { @@ -87,7 +104,9 @@ return false; }); } else { - $(this).click(function(e) { + me + .unbind('click.nyroModal') + .bind('click.nyroModal', function(e) { e.preventDefault(); processModal($.extend(settings, { from: this @@ -126,13 +145,16 @@ if (modal.contentWrapper && settings.title) setTitle(); - if (((settings.width && settings.width == currentSettings.width) || (settings.height && settings.height == currentSettings.height))) { + if (!modal.error && (settings.windowResizing || (!modal.resizing && (('width' in settings && settings.width == currentSettings.width) || ('height' in settings && settings.height == currentSettings.height))))) { + modal.resizing = true; if (modal.contentWrapper) calculateSize(true); if (modal.contentWrapper && modal.contentWrapper.is(':visible') && !modal.animContent) { if (fixFF) modal.content.css({position: ''}); currentSettings.resize(modal, currentSettings, function() { + currentSettings.windowResizing = false; + modal.resizing = false; if (fixFF) modal.content.css({position: 'fixed'}); if ($.isFunction(currentSettings.endResize)) @@ -210,12 +232,16 @@ padding: 25, // padding for the max modal size regexImg: '[^\.]\.(jpg|jpeg|png|tiff|gif|bmp)\s*$', // Regex to find images + addImageDivTitle: true, // Indicate if the div title should be inserted defaultImgAlt: 'Image', // Default alt attribute for the images setWidthImgTitle: true, // Set the width to the image title ltr: true, // Left to Right by default. Put to false for Hebrew or Right to Left language gallery: null, // Gallery name if provided galleryLinks: '<a href="#" class="nyroModalPrev">Prev</a><a href="#" class="nyroModalNext">Next</a>', // Use .nyroModalPrev and .nyroModalNext to set the navigation link + galleryCounts: galleryCounts, // Callback to show the gallery count + + zIndexStart: 100, css: { // Default CSS option for the nyroModal Div. Some will be overwritten or updated when using IE6 bg: { @@ -322,9 +348,11 @@ from = currentSettings.from; url = currentSettings.url; + initSettingsSize.width = currentSettings.width; + initSettingsSize.height = currentSettings.height; + if (currentSettings.type == 'swf') { // Swf is transforming as a raw content - currentSettings.resizable = false; setCurrentSettings({overflow: 'hidden'}, 'css', 'content'); currentSettings.content = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+currentSettings.width+'" height="'+currentSettings.height+'"><param name="movie" value="'+url+'"></param>'; var tmp = ''; @@ -345,7 +373,7 @@ $.ajax($.extend({}, currentSettings.ajax, { url: url, data: data, - type: from.method, + type: jFrom.attr('method') ? jFrom.attr('method') : 'get', success: ajaxLoaded, error: loadingError })); @@ -359,7 +387,7 @@ jFrom.prepend('<input type="hidden" name="'+currentSettings.formIndicator+'" value="1" />'); if (currentSettings.selector) jFrom.prepend('<input type="hidden" name="'+currentSettings.selIndicator+'" value="'+currentSettings.selector.substring(1)+'" />'); - modal.tmp.html('<iframe frameborder="0" hspace="0" name="nyroModalIframe"></iframe>'); + modal.tmp.html('<iframe frameborder="0" hspace="0" name="nyroModalIframe" src="javascript:false;"></iframe>'); $('iframe', modal.tmp) .css({ width: currentSettings.width, @@ -371,10 +399,10 @@ showModal(); showContentOrLoading(); } else if (currentSettings.type == 'image') { + debug('Image Load: '+url); var title = jFrom.attr('title') || currentSettings.defaultImgAlt; initModal(); modal.tmp.html('<img id="nyroModalImg" />').find('img').attr('alt', title); - debug('Image Load: '+url); modal.tmp.css({lineHeight: 0}); $('img', modal.tmp) .error(loadingError) @@ -392,6 +420,8 @@ imgWidth: w, imgHeight: h }); + initSettingsSize.width = w; + initSettingsSize.height = h; setCurrentSettings({overflow: 'hidden'}, 'css', 'content'); modal.dataReady = true; if (modal.loadingShown || modal.transition) @@ -401,7 +431,7 @@ showModal(); } else if (currentSettings.type == 'iframeForm') { initModal(); - modal.tmp.html('<iframe frameborder="0" hspace="0" src="" name="nyroModalIframe" id="nyroModalIframe"></iframe>'); + modal.tmp.html('<iframe frameborder="0" hspace="0" src="javascript:false;" name="nyroModalIframe" id="nyroModalIframe"></iframe>'); debug('Iframe Form Load: '+url); $('iframe', modal.tmp).eq(0) .css({ @@ -446,6 +476,8 @@ contentElt = div; modal.tmp.append(div.contents()); } + initSettingsSize.width = w; + initSettingsSize.height = h; setCurrentSettings({ width: w, height: h @@ -515,15 +547,19 @@ $.extend(true, currentSettings[deep1], settings); } else { if (modal.animContent) { - if (settings.width) { - settings.setWidth = settings.width; + if ('width' in settings) { + if (!modal.resizing) { + settings.setWidth = settings.width; + shouldResize = true; + } delete settings['width']; - shouldResize = true; } - if (settings.height) { - settings.setHeight = settings.height; + if ('height' in settings) { + if (!modal.resizing) { + settings.setHeight = settings.height; + shouldResize = true; + } delete settings['height']; - shouldResize = true; } } $.extend(true, currentSettings, settings); @@ -595,7 +631,7 @@ setCurrentSettings({color: 'white'}, 'css', 'bg'); var full = { - zIndex: 100, + zIndex: currentSettings.zIndexStart, position: 'fixed', top: 0, left: 0, @@ -645,14 +681,14 @@ css: { bg: { position: 'absolute', - zIndex: 101, + zIndex: currentSettings.zIndexStart+1, height: '110%', width: '110%', top: currentSettings.marginScrollTop+'px', left: currentSettings.marginScrollLeft+'px' }, - wrapper: { zIndex: 102 }, - loading: { zIndex: 103 } + wrapper: { zIndex: currentSettings.zIndexStart+2 }, + loading: { zIndex: currentSettings.zIndexStart+3 } } }); @@ -698,11 +734,22 @@ }); } - $(document).keydown(keyHandler); + $(document).bind('keydown.nyroModal', keyHandler); modal.content.css({width: 'auto', height: 'auto'}); modal.contentWrapper.css({width: 'auto', height: 'auto'}); + + if (!currentSettings.blocker) { + $(window).bind('resize.nyroModal', function() { + window.clearTimeout(windowResizeTimeout); + windowResizeTimeout = window.setTimeout(windowResizeHandler, 200); + }); + } } } + + function windowResizeHandler() { + $.nyroModalSettings(initSettingsSize); + } // Show the modal (ie: the background and then the loading if needed or the content directly) function showModal() { @@ -752,19 +799,26 @@ if (from && from.nodeName) { var jFrom = $(from); - currentSettings.url = url = from.nodeName.toLowerCase() == 'form'? jFrom.attr('action') : from.href; + + url = jFrom.attr(from.nodeName.toLowerCase() == 'form' ? 'action' : 'href'); + if (!url) + url = location.href.substring(window.location.host.length+7); + currentSettings.url = url; if (jFrom.attr('rev') == 'modal') currentSettings.modal = true; currentSettings.title = jFrom.attr('title'); - if (from && from.rel) + if (from && from.rel && from.rel.toLowerCase() != 'nofollow') currentSettings.gallery = from.rel; var imgType = imageType(url, from); if (imgType) return imgType; + + if (isSwf(url)) + return 'swf'; var iframe = false; if (from.target && from.target.toLowerCase() == '_blank' || (from.hostname && from.hostname.replace(/:\d*$/,'') != window.location.hostname.replace(/:\d*$/,''))) { @@ -787,6 +841,9 @@ if (!url) return null; + + if (isSwf(url)) + return 'swf'; var reg1 = new RegExp("^http://", "g"); if (url.match(reg1)) @@ -797,10 +854,6 @@ if (imgType) return imgType; - var swf = new RegExp('[^\.]\.(swf)\s*$', 'i'); - if (swf.test(url)) - return 'swf'; - var tmp = extractUrlSel(url); setCurrentSettings(tmp); @@ -814,6 +867,11 @@ return 'image'; } } + + function isSwf(url) { + var swf = new RegExp('[^\.]\.(swf)\s*$', 'i'); + return swf.test(url); + } function extractUrlSel(url) { var ret = { @@ -852,7 +910,9 @@ modal.loading .addClass(currentSettings.errorClass) .html(currentSettings.contentError); - $(currentSettings.closeSelector, modal.loading).click(removeModal); + $(currentSettings.closeSelector, modal.loading) + .unbind('click.nyroModal') + .bind('click.nyroModal', removeModal); setMarginLoading(); modal.loading .css({ @@ -874,18 +934,23 @@ if (currentSettings.type == 'iframeForm') { $(currentSettings.from) .attr('target', 'nyroModalIframe') - .data('processing', 1) + .data('nyroModalprocessing', 1) .submit() .attr('target', '_blank') - .removeData('processing'); + .removeData('nyroModalprocessing'); } - + + if (!currentSettings.modal) + modal.wrapper.prepend(currentSettings.closeButton); + if ($.isFunction(currentSettings.endFillContent)) currentSettings.endFillContent(modal, currentSettings); modal.content.append(modal.scripts); - $(currentSettings.closeSelector, modal.contentWrapper).click(removeModal); + $(currentSettings.closeSelector, modal.contentWrapper) + .unbind('click.nyroModal') + .bind('click.nyroModal', removeModal); $(currentSettings.openSelector, modal.contentWrapper).nyroModal(getCurrentSettingsNew()); } @@ -894,8 +959,12 @@ var currentSettingsNew = $.extend(true, {}, currentSettings); if (resized.width) currentSettingsNew.width = null; + else + currentSettingsNew.width = initSettingsSize.width; if (resized.height) currentSettingsNew.height = null; + else + currentSettingsNew.height = initSettingsSize.height; currentSettingsNew.css.content.overflow = 'auto'; return currentSettingsNew; } @@ -911,6 +980,12 @@ if (currentSettings.gallery) { // Set the action for the next and prev button (or remove them) modal.content.append(currentSettings.galleryLinks); + + gallery.links = $('[rel="'+currentSettings.gallery+'"]'); + gallery.index = gallery.links.index(currentSettings.from); + + if (currentSettings.galleryCounts && $.isFunction(currentSettings.galleryCounts)) + currentSettings.galleryCounts(gallery.index + 1, gallery.links.length, modal, currentSettings); var currentSettingsNew = getCurrentSettingsNew(); @@ -920,7 +995,7 @@ .attr('href', linkPrev.attr('href')) .click(function(e) { e.preventDefault(); - linkPrev.nyroModalManual(currentSettingsNew); + $.nyroModalPrev(); return false; }); if (isIE6 && currentSettings.type == 'swf') { @@ -943,7 +1018,7 @@ .attr('href', linkNext.attr('href')) .click(function(e) { e.preventDefault(); - linkNext.nyroModalManual(currentSettingsNew); + $.nyroModalNext(); return false; }); if (isIE6 && currentSettings.type == 'swf') { @@ -962,20 +1037,17 @@ $('.nyroModalNext', modal.contentWrapper).remove(); } } - + calculateSize(); } - + function getGalleryLink(dir) { if (currentSettings.gallery) { if (!currentSettings.ltr) dir *= -1; - // next - var gallery = $('[rel="'+currentSettings.gallery+'"]'); - var currentIndex = gallery.index(currentSettings.from); - var index = currentIndex + dir; - if (index >= 0 && index < gallery.length) - return gallery.eq(index); + var index = gallery.index + dir; + if (index >= 0 && index < gallery.links.length) + return gallery.links.eq(index); } return false; } @@ -984,11 +1056,15 @@ function calculateSize(resizing) { debug('calculateSize'); - if (!modal.wrapper) - modal.wrapper = modal.contentWrapper.children(':first'); + modal.wrapper = modal.contentWrapper.children('div:first'); resized.width = false; resized.height = false; + if (false && !currentSettings.windowResizing) { + initSettingsSize.width = currentSettings.width; + initSettingsSize.height = currentSettings.height; + } + if (currentSettings.autoSizable && (!currentSettings.width || !currentSettings.height)) { modal.contentWrapper .css({ @@ -1022,11 +1098,15 @@ currentSettings.height = modal.content.outerHeight(true); resized.height = true; } - modal.contentWrapper.hide().css({opacity: 1}); + modal.contentWrapper.css({opacity: 1}); + if (!resizing) + modal.contentWrapper.hide(); } - currentSettings.width = Math.max(currentSettings.width, currentSettings.minWidth); - currentSettings.height = Math.max(currentSettings.height, currentSettings.minHeight); + if (currentSettings.type != 'image' && currentSettings.type != 'swf') { + currentSettings.width = Math.max(currentSettings.width, currentSettings.minWidth); + currentSettings.height = Math.max(currentSettings.height, currentSettings.minHeight); + } var outerWrapper = getOuter(modal.contentWrapper); var outerWrapper2 = getOuter(modal.wrapper); @@ -1059,22 +1139,19 @@ if (tmp.content.height > maxHeight || tmp.content.width > maxWidth) { // We're gonna resize the modal as it will goes outside the view port - if (currentSettings.type == 'image') { + if (currentSettings.type == 'image' || currentSettings.type == 'swf') { // An image is resized proportionnaly - var diffW = tmp.content.width - currentSettings.imgWidth; - var diffH = tmp.content.height - currentSettings.imgHeight; + var useW = currentSettings.imgWidth?currentSettings.imgWidth : currentSettings.width; + var useH = currentSettings.imgHeight?currentSettings.imgHeight : currentSettings.height; + var diffW = tmp.content.width - useW; + var diffH = tmp.content.height - useH; if (diffH < 0) diffH = 0; if (diffW < 0) diffW = 0; var calcH = maxHeight - diffH; var calcW = maxWidth - diffW; - var ratio = Math.min(calcH/currentSettings.imgHeight, calcW/currentSettings.imgWidth); - - calcH = Math.floor(currentSettings.imgHeight*ratio); - calcW = Math.floor(currentSettings.imgWidth*ratio); - $('img#nyroModalImg', modal.content).css({ - height: calcH+'px', - width: calcW+'px' - }); + var ratio = Math.min(calcH/useH, calcW/useW); + calcW = Math.floor(useW*ratio); + calcH = Math.floor(useH*ratio); tmp.content.height = calcH + diffH; tmp.content.width = calcW + diffW; } else { @@ -1092,28 +1169,40 @@ }; } } + + if (currentSettings.type == 'swf') { + $('object, embed', modal.content) + .attr('width', tmp.content.width) + .attr('height', tmp.content.height); + } else if (currentSettings.type == 'image') { + $('img', modal.content).css({ + width: tmp.content.width, + height: tmp.content.height + }); + } modal.content.css($.extend({}, tmp.content, currentSettings.css.content)); modal.wrapper.css($.extend({}, tmp.wrapper2, currentSettings.css.wrapper2)); - if (!resizing) { + if (!resizing) modal.contentWrapper.css($.extend({}, tmp.wrapper, currentSettings.css.wrapper)); - if (currentSettings.type == 'image') { - // Adding the title for the image - var title = $('img', modal.content).attr('alt'); - $('img', modal.content).removeAttr('alt'); - if (title != currentSettings.defaultImgAlt) { - var divTitle = $('<div>'+title+'</div>'); + + if (currentSettings.type == 'image' && currentSettings.addImageDivTitle) { + // Adding the title for the image + $('img', modal.content).removeAttr('alt'); + var divTitle = $('div', modal.content); + if (currentSettings.title != currentSettings.defaultImgAlt && currentSettings.title) { + if (divTitle.length == 0) { + divTitle = $('<div>'+currentSettings.title+'</div>'); modal.content.append(divTitle); - if (currentSettings.setWidthImgTitle) { - var outerDivTitle = getOuter(divTitle); - divTitle.css({width: (tmp.content.width + outerContent.w.padding - outerDivTitle.w.total)+'px'}); - } } + if (currentSettings.setWidthImgTitle) { + var outerDivTitle = getOuter(divTitle); + divTitle.css({width: (tmp.content.width + outerContent.w.padding - outerDivTitle.w.total)+'px'}); + } + } else if (divTitle.length = 0) { + divTitle.remove(); } - - if (!currentSettings.modal) - modal.contentWrapper.prepend(currentSettings.closeButton); } if (currentSettings.title) @@ -1131,6 +1220,9 @@ if (e) e.preventDefault(); if (modal.full && modal.ready) { + $(document).unbind('keydown.nyroModal'); + if (!currentSettings.blocker) + $(window).unbind('resize.nyroModal'); modal.ready = false; modal.anim = true; modal.closing = true; @@ -1199,7 +1291,9 @@ loadingError(); else modal.loading.html(currentSettings.contentLoading); - $(currentSettings.closeSelector, modal.loading).click(removeModal); + $(currentSettings.closeSelector, modal.loading) + .unbind('click.nyroModal') + .bind('click.nyroModal', removeModal); setMarginLoading(); currentSettings.showLoading(modal, currentSettings, function(){modal.anim=false;showContentOrLoading();}); } @@ -1239,6 +1333,10 @@ } else loadingError(); } + + function galleryCounts(nb, total, elts, settings) { + settings.title+= (settings.title?' - ':'') +nb+'/'+total; + } // ------------------------------------------------------- @@ -1250,13 +1348,15 @@ modal.anim = false; if (contentEltLast) { contentEltLast.append(modal.content.contents()); - contentEltLast= null; + contentEltLast = null; } else if (contentElt) { contentElt.append(modal.content.contents()); contentElt= null; } modal.content.empty(); + gallery = {}; + modal.contentWrapper.hide().children().remove().empty().attr('style', '').hide(); if (modal.closing || modal.transition) @@ -1299,6 +1399,7 @@ modal.content.css({position: 'fixed'}); // Fix Issue #10 modal.content.append(modal.scriptsShown); if (currentSettings.autoSizable && currentSettings.type == 'iframe') { + //* var iframe = modal.content.find('iframe'); if (iframe.length && iframe.attr('src').indexOf(window.location.hostname) !== -1) { var body = iframe.contents().find('body'); @@ -1324,6 +1425,7 @@ }); } } + // */ } if ($.isFunction(currentSettings.endShowContent)) currentSettings.endShowContent(modal, currentSettings); Modified: templates/plugin/nyroModal.full.css =================================================================== --- templates/plugin/nyroModal.full.css 2009-05-24 13:15:35 UTC (rev 211) +++ templates/plugin/nyroModal.full.css 2009-05-24 13:26:34 UTC (rev 212) @@ -1,7 +1,6 @@ div#nyroModalFull { font-size: 12px; color: #777; - font-family: Verdana; } div#nyroModalFull div#nyroModalLoading { border: 4px solid #777; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-05 07:50:14
|
Revision: 229 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=229&view=rev Author: bigmichi1 Date: 2009-06-05 07:50:12 +0000 (Fri, 05 Jun 2009) Log Message: ----------- Fixed Bug [ 2543885 ] No UPS information in static mode Modified Paths: -------------- ChangeLog phpsysinfo.xslt Modified: ChangeLog =================================================================== --- ChangeLog 2009-06-03 05:56:44 UTC (rev 228) +++ ChangeLog 2009-06-05 07:50:12 UTC (rev 229) @@ -32,6 +32,7 @@ - [FIX] Fixed Bug [ 2538522 ] PHP Notice in static display mode (patch included) - [FIX] Fixed Bug [ 2577019 ] r129 break a lot of things (FreeBSD support patch included) - [FIX] Fixed Bug [ 2798507 ] Ups monitoring on windows + - [FIX] Fixed Bug [ 2543885 ] No UPS information in static mode - [FIX] Some fixes for recent /proc/mdstat files, also new sample file for tests - [FIX] Fedore distro must be read before Redhat - [FIX] Stop JavaScript alert popup when XML loading errors occurs Modified: phpsysinfo.xslt =================================================================== --- phpsysinfo.xslt 2009-06-03 05:56:44 UTC (rev 228) +++ phpsysinfo.xslt 2009-06-05 07:50:12 UTC (rev 229) @@ -1154,6 +1154,201 @@ </table> </div> </xsl:if> + <xsl:if test="count(UPSinfo) > 0"> + <div id="ups"> + <h2> + <span> + <xsl:text>UPS information</xsl:text> + </span> + </h2> + <xsl:for-each select="UPSinfo"> + <xsl:for-each select="Ups"> + <table cellspacing="0" class="stripMe" id="upsTable"> + <thead> + <tr> + <th colspan="2" style="text-align: center"> + <strong> + <xsl:for-each select="Name"> + <xsl:apply-templates/> + </xsl:for-each> + <xsl:text> (</xsl:text> + <xsl:for-each select="Mode"> + <xsl:apply-templates/> + </xsl:for-each> + <xsl:text>)</xsl:text> + </strong> + </th> + </tr> + </thead> + <tbody> + <tr> + <td style="width:160px"> + <xsl:text>Model</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="Model"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + <tr> + <td style="width:160px"> + <xsl:text>Started</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="StartTime"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + <tr> + <td style="width:160px"> + <xsl:text>Status</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="Status"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + <xsl:if test="string(UPSTemperature)"> + <tr> + <td style="width:160px"> + <xsl:text>Temperature</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="UPSTemperature"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + </xsl:if> + <xsl:if test="string(OutagesCount)"> + <tr> + <td style="width:160px"> + <xsl:text>Outages</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="OutagesCount"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + </xsl:if> + <xsl:if test="string(LastOutage)"> + <tr> + <td style="width:160px"> + <xsl:text>Last outage cause</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="LastOutage"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + </xsl:if> + <xsl:if test="string(LastOutageFinish)"> + <tr> + <td style="width:160px"> + <xsl:text>Last outage timestamp</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="LastOutageFinish"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + </xsl:if> + <xsl:if test="string(LineVoltage)"> + <tr> + <td style="width:160px"> + <xsl:text>Line voltage</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="LineVoltage"> + <xsl:apply-templates/> + </xsl:for-each> + </td> + </tr> + </xsl:if> + <xsl:if test="string(LoadPercent)"> + <tr> + <td style="width:160px"> + <xsl:text>Load percent</xsl:text> + </td> + <td style="width:250px"> + <div style="float:left; width:{concat(LoadPercent, 'px' )}; " class="bar"> + <span> + <xsl:text> </xsl:text> + </span> + </div> + <div style="float:left; "> + <span> + <xsl:text> </xsl:text> + </span> + <xsl:for-each select="LoadPercent"> + <xsl:apply-templates /> + </xsl:for-each> + <span> + <xsl:text>%</xsl:text> + </span> + </div> + </td> + </tr> + </xsl:if> + <xsl:if test="string(BatteryVoltage)"> + <tr> + <td style="width:160px"> + <xsl:text>Battery voltage</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="BatteryVoltage"> + <xsl:apply-templates/> + </xsl:for-each> + <xsl:text> V</xsl:text> + </td> + </tr> + </xsl:if> + <tr> + <td style="width:160px"> + <xsl:text>Battery charge</xsl:text> + </td> + <td style="width:250px"> + <div style="float:left; width:{concat(BatteryChargePercent, 'px' )}; " class="bar"> + <span> + <xsl:text> </xsl:text> + </span> + </div> + <div style="float:left; "> + <span> + <xsl:text> </xsl:text> + </span> + <xsl:for-each select="BatteryChargePercent"> + <xsl:apply-templates /> + </xsl:for-each> + <span> + <xsl:text>%</xsl:text> + </span> + </div> + </td> + </tr> + <tr> + <td style="width:160px"> + <xsl:text>Time left on batteries</xsl:text> + </td> + <td style="width:250px"> + <xsl:for-each select="TimeLeftMinutes"> + <xsl:apply-templates/> + </xsl:for-each> + <xsl:text> minutes</xsl:text> + </td> + </tr> + </tbody> + </table> + </xsl:for-each> + </xsl:for-each> + </div> + </xsl:if> <div id="footer"> <span> <xsl:text>Created by </xsl:text> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-11 09:29:36
|
Revision: 249 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=249&view=rev Author: bigmichi1 Date: 2009-06-11 09:29:32 +0000 (Thu, 11 Jun 2009) Log Message: ----------- Fixed Bug [ 2804624 ] typos in config.php.new Modified Paths: -------------- ChangeLog config.php.new Modified: ChangeLog =================================================================== --- ChangeLog 2009-06-10 17:40:36 UTC (rev 248) +++ ChangeLog 2009-06-11 09:29:32 UTC (rev 249) @@ -4,6 +4,7 @@ - [FIX] Fixed Bug [ 2803472 ] Error loading XML document if no swap if activated - [FIX] Fixed Bug [ 2803964 ] Disabling language or template picklist fails - [FIX] Fixed Bug [ 2803480 ] Empty page when hddtemp enabled + - [FIX] Fixed Bug [ 2804624 ] typos in config.php.new phpSysInfo 3.0 RC-8, 2009-06-09 - [FIX] Fixed Notice Array to String conversion for scsi and ide Modified: config.php.new =================================================================== --- config.php.new 2009-06-10 17:40:36 UTC (rev 248) +++ config.php.new 2009-06-11 09:29:32 UTC (rev 249) @@ -1,4 +1,4 @@ -<?php +<?php /** * PSI Config File * @@ -12,15 +12,15 @@ * @version SVN: $Id$ * @link http://phpsysinfo.sourceforge.net */ - + // ******************************** // MAIN PARAMETERS // ******************************** /** - * Turn on dubugging of some functions and include errors and warnings in xml and provide a popup for displaying errors - * - false : no debug infos are stored in xml or displayed - * - true : debug infos stored in xml and displayed *be carfull if set this to true, may include infos from your pc* + * Turn on debugging of some functions and include errors and warnings in xml and provide a popup for displaying errors + * - false : no debug information are stored in xml or displayed + * - true : debug information stored in xml and displayed *be careful if set this to true, may include sensitive information from your pc* */ define('PSI_DEBUG', false); @@ -33,8 +33,14 @@ /** * Plugins that should be included in xml and output (!!!plugin names are case-sensitive!!!) * List of plugins should look like "plugin,plugin,plugin". See /plugins directory - * - define('PSI_PLUGINS', 'plugin,plugin'); // list of plugins + * - define('PSI_PLUGINS', 'MDStatus,PS'); // list of plugins * - define('PSI_PLUGINS', false); //no plugins + * included plugins: + * - MDStatus - show the raid status and whats currently going on + * - PS - show a process tree of all running processes + * - PSStatus - show a graphical representation if a process is running or not + * - Quotas - show a table with all quotas that are active and there current state + * - Smart - show S.M.A.R.T. information from drives that support it */ define('PSI_PLUGINS', false); @@ -44,12 +50,12 @@ // ******************************** /** - * Define the default language + * Define the default language */ define('PSI_DEFAULT_LANG', 'en'); /** - * Define the default template + * Define the default template */ define('PSI_DEFAULT_TEMPLATE', 'phpsysinfo'); @@ -64,12 +70,12 @@ define('PSI_SHOW_PICKLIST_TEMPLATE', true); /** - * Define the intervalle for refreshing data in ms + * Define the interval for refreshing data in ms * - 0 = disabled * - 1000 = 1 second * - Default is 10 seconds */ -define('PSI_REFRESH',10000); +define('PSI_REFRESH', 10000); /** * Show a graph for current cpuload @@ -86,7 +92,7 @@ define('PSI_USE_VHOST', false); /** - * Controls the units & format for network, memory and filesystem + * Controls the units & format for network, memory and filesystem * - 1 KiB = 2^10 bytes = 1,024 bytes * - 1 KB = 10^3 bytes = 1,000 bytes * - 'PiB' everything is in PeBiByte @@ -121,14 +127,14 @@ /** * Define the motherboard monitoring program (!!!names are case-sensitive!!!) * We support the following programs so far - * - 1. LMSensors http://www.lm-sensors.org/ - * - 2. Healthd http://healthd.thehousleys.net/ - * - 3. HWSensors http://www.openbsd.org/ - * - 4. MBMon http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html - * - 5. MBM5 http://mbm.livewiredev.com/ - * - 6. Coretemp - * - 7. IPMI http://openipmi.sourceforge.net/ - * - 8. K8Temp http://hur.st/k8temp/ + * - LMSensors http://www.lm-sensors.org/ + * - Healthd http://healthd.thehousleys.net/ + * - HWSensors http://www.openbsd.org/ + * - MBMon http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html + * - MBM5 http://mbm.livewiredev.com/ + * - Coretemp + * - IPMI http://openipmi.sourceforge.net/ + * - K8Temp http://hur.st/k8temp/ * Example: If you want to use lmsensors : define('PSI_SENSOR_PROGRAM', 'LMSensors'); */ define('PSI_SENSOR_PROGRAM', false); @@ -138,14 +144,14 @@ * Available methods for the above list are in the following list * default method 'file' should be fine for everybody * !!! tcp connections are only made local and on the default port !!! - * - 1. LMSensors command - * - 2. Healthd command - * - 3. HWSensors command - * - 4. MBMon command, tcp - * - 5. MBM5 file - * - 6. Coretemp command - * - 7. IPMI command - * - 8. K8Temp command + * - LMSensors command + * - Healthd command + * - HWSensors command + * - MBMon command, tcp + * - MBM5 file + * - Coretemp command + * - IPMI command + * - K8Temp command */ define('PSI_SENSOR_ACCESS', 'file'); @@ -172,7 +178,7 @@ /** * Show bind - * - true = display filesystems mounted with the bind options under Linux + * - true = display file system mounted with the bind options under Linux * - false = hide them */ define('PSI_SHOW_BIND', false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-22 13:22:39
|
Revision: 263 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=263&view=rev Author: bigmichi1 Date: 2009-06-22 13:01:52 +0000 (Mon, 22 Jun 2009) Log Message: ----------- restructure xml; include trees for memory, hardware and ups; using to between classes and xml parser Modified Paths: -------------- ChangeLog includes/class.CommonFunctions.inc.php includes/class.Parser.inc.php includes/interface/class.PSI_Interface_OS.inc.php includes/interface/class.PSI_Interface_Sensor.inc.php includes/interface/class.PSI_Interface_UPS.inc.php includes/mb/class.Coretemp.inc.php includes/mb/class.HDDTemp.inc.php includes/mb/class.HWSensors.inc.php includes/mb/class.Healthd.inc.php includes/mb/class.IPMI.inc.php includes/mb/class.K8Temp.inc.php includes/mb/class.LMSensors.inc.php includes/mb/class.MBM5.inc.php includes/mb/class.MBMon.inc.php includes/os/class.BSDCommon.inc.php includes/os/class.Darwin.inc.php includes/os/class.DragonFly.inc.php includes/os/class.FreeBSD.inc.php includes/os/class.HPUX.inc.php includes/os/class.Linux.inc.php includes/os/class.NetBSD.inc.php includes/os/class.OS.inc.php includes/os/class.OpenBSD.inc.php includes/os/class.SunOS.inc.php includes/os/class.WINNT.inc.php includes/output/class.Webpage.inc.php includes/ups/class.Apcupsd.inc.php includes/ups/class.Nut.inc.php includes/xml/class.XML.inc.php js/phpSysInfo/phpsysinfo.js Added Paths: ----------- includes/mb/class.Sensors.inc.php includes/ups/class.UPS.inc.php phpsysinfo3.xsd Removed Paths: ------------- phpsysinfo.xsd Modified: ChangeLog =================================================================== --- ChangeLog 2009-06-22 10:48:33 UTC (rev 262) +++ ChangeLog 2009-06-22 13:01:52 UTC (rev 263) @@ -5,6 +5,12 @@ - [FIX] Fixed Bug [ 2803964 ] Disabling language or template picklist fails - [FIX] Fixed Bug [ 2803480 ] Empty page when hddtemp enabled - [FIX] Fixed Bug [ 2804624 ] typos in config.php.new + + - [ADD] Added FR [ 2804580 ] Memory Usage Display + + - [UPD] refactoring of the xml structure + - [UPD] avoid using arrays, instead using transport objects with default values for essential properties + - [UPD] using treeTable plugin for Hardware, Memory and Ups block phpSysInfo 3.0 RC-8, 2009-06-09 - [FIX] Fixed Notice Array to String conversion for scsi and ide Modified: includes/class.CommonFunctions.inc.php =================================================================== --- includes/class.CommonFunctions.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/class.CommonFunctions.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -130,29 +130,6 @@ } /** - * find duplicate entrys and count them, show this value befor the duplicated name - * - * @param array $arrInput source array that should be checked for duplicated names - * - * @return array array with duplicate entries removed and a appended value, how many times the entry has appeared - */ - public static function finddups($arrInput) - { - $arrResult = array(); - if (is_array($arrInput)) { - $arrBuffer = array_count_values($arrInput); - foreach ($arrBuffer as $strKey=>$intValue) { - if ($intValue > 1) { - $arrResult[] = "(".$intValue."x) ".$strKey; - } else { - $arrResult[] = $strKey; - } - } - } - return $arrResult; - } - - /** * read a file and return the content as a string * * @param string $strFileName name of the file which should be read Modified: includes/class.Parser.inc.php =================================================================== --- includes/class.Parser.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/class.Parser.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -28,57 +28,53 @@ /** * parsing the output of lspci command * - * @return mixed + * @return Array */ public static function lspci() { $arrResults = array(); - $strBuf = ""; if (CommonFunctions::executeProgram("lspci", "", $strBuf, PSI_DEBUG)) { $arrLines = split("\n", $strBuf); foreach ($arrLines as $strLine) { list($strAddr, $strName) = explode(' ', trim($strLine), 2); $strName = preg_replace('/\(.*\)/', '', $strName); - $arrResults[] = $strName; + $dev = new HWDevice(); + $dev->setName($strName); + $arrResults[] = $dev; } } - if ( empty($arrResults)) { - return false; - } else { - asort($arrResults); - return $arrResults; - } + return $arrResults; } /** * parsing the output of pciconf command * - * @return mixed + * @return Array */ public static function pciconf() { $arrResults = array(); $intS = 0; - $strBuf = ""; if (CommonFunctions::executeProgram("pciconf", "-lv", $strBuf, PSI_DEBUG)) { + $arrTemp = array(); $arrLines = explode("\n", $strBuf); foreach ($arrLines as $strLine) { if (preg_match("/(.*) = '(.*)'/", $strLine, $arrParts)) { if (trim($arrParts[1]) == "vendor") { - $arrResults[$intS] = trim($arrParts[2]); + $arrTemp[$intS] = trim($arrParts[2]); } elseif (trim($arrParts[1]) == "device") { - $arrResults[$intS] .= " - ".trim($arrParts[2]); + $arrTemp[$intS] .= " - ".trim($arrParts[2]); $intS++; } } } + foreach ($arrTemp as $name) { + $dev = new HWDevice(); + $dev->setName($name); + $arrResults[] = $dev; + } } - if ( empty($arrResults)) { - return false; - } else { - asort($arrResults); - return $arrResults; - } + return $arrResults; } /** @@ -90,16 +86,11 @@ */ public static function df($df_param = "") { - $results = array(); - $j = 0; - $df = ""; - $df2 = ""; - $mount = ""; - if (CommonFunctions::executeProgram('df', '-k '.$df_param, $df, PSI_DEBUG) || ! empty($df)) { + $arrResult = array(); + if (CommonFunctions::executeProgram('df', '-k '.$df_param, $df, PSI_DEBUG)) { $df = preg_split("/\n/", $df, -1, PREG_SPLIT_NO_EMPTY); - natsort($df); if (PSI_SHOW_INODES) { - if (CommonFunctions::executeProgram('df', '-i '.$df_param, $df2, PSI_DEBUG) || ! empty($df)) { + if (CommonFunctions::executeProgram('df', '-i '.$df_param, $df2, PSI_DEBUG)) { $df2 = preg_split("/\n/", $df2, -1, PREG_SPLIT_NO_EMPTY); // Store inode use% in an associative array (df_inodes) for later use foreach ($df2 as $df2_line) { @@ -107,7 +98,6 @@ $df_inodes[$inode_buf[1]] = $inode_buf[2]; } } - unset($df2, $df2_line, $inode_buf); } } if (CommonFunctions::executeProgram('mount', '', $mount, PSI_DEBUG)) { @@ -124,7 +114,6 @@ $mount_parm[$mount_buf[1]]['options'] = isset($mount_buf[4]) ? $mount_buf[4] : ''; } } - unset($mount, $mount_line, $mount_buf); foreach ($df as $df_line) { $df_buf1 = preg_split("/(\%\s)/", $df_line, 2); if (count($df_buf1) != 2) { @@ -134,36 +123,28 @@ $df_buf = array($df_buf2[1], $df_buf2[4], $df_buf2[6], $df_buf2[8], $df_buf2[10], $df_buf1[1]); if (count($df_buf) == 6) { $df_buf[5] = trim($df_buf[5]); - $results[$j] = array(); - $results[$j]['disk'] = trim($df_buf[0]); - $results[$j]['size'] = $df_buf[1] * 1024; - $results[$j]['used'] = $df_buf[2] * 1024; - $results[$j]['free'] = $df_buf[3] * 1024; - if ($results[$j]['used'] < 0) { - $results[$j]['size'] = $results[$j]['free'] * 1024; - $results[$j]['free'] = 0; - $results[$j]['used'] = $results[$j]['size'] * 1024; + $dev = new DiskDevice(); + $dev->setName(trim($df_buf[0])); + if ($df_buf[2] < 0) { + $dev->setTotal($df_buf[3] * 1024); + $dev->setUsed($df_buf[3] * 1024); + } else { + $dev->setTotal($df_buf[1] * 1024); + $dev->setUsed($df_buf[2] * 1024); + $dev->setFree($df_buf[3] * 1024); } - if ($results[$j]['size'] == 0) { - continue; + $dev->setMountPoint($df_buf[5]); + $dev->setFsType($mount_parm[$df_buf[5]]['fstype']); + $dev->setOptions($mount_parm[$df_buf[5]]['options']); + if (PSI_SHOW_INODES && isset($df_inodes[trim($df_buf[0])])) { + $dev->setPercentInodesUsed($df_inodes[trim($df_buf[0])]); } - $results[$j]['percent'] = round(($results[$j]['used'] * 100) / $results[$j]['size']); - $results[$j]['mount'] = $df_buf[5]; - $results[$j]['fstype'] = $mount_parm[$df_buf[5]]['fstype']; - $results[$j]['options'] = $mount_parm[$df_buf[5]]['options']; - if (PSI_SHOW_INODES && isset($df_inodes[$results[$j]['disk']])) { - $results[$j]['inodes'] = $df_inodes[$results[$j]['disk']]; - } - $j++; + $arrResult[] = $dev; } } - return $results; - } else { - return array(); } - } else { - return array(); } + return $arrResult; } } ?> Modified: includes/interface/class.PSI_Interface_OS.inc.php =================================================================== --- includes/interface/class.PSI_Interface_OS.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/interface/class.PSI_Interface_OS.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -28,140 +28,24 @@ interface PSI_Interface_OS { /** - * Virtual Host Name + * get a special encoding from os where phpsysinfo is running * * @return string */ - function vhostname(); + function getEncoding(); /** - * IP of the Virtual Host Name + * build the os information * - * @return string + * @return void */ - function vipaddr(); + function build(); /** - * Canonical Host Name + * get the filled or unfilled (with default values) system object * - * @return string + * @return System */ - function chostname(); - - /** - * IP of the Canonical Host Name - * - * @return string - */ - function ipaddr(); - - /** - * Kernel Version - * - * @return string - */ - function kernel(); - - /** - * UpTime - * time the system is running - * - * @return integer - */ - function uptime(); - - /** - * Number of Users - * - * @return integer - */ - function users(); - - /** - * Processor Load - * optionally create a loadbar - * - * @param boolean $bar include a bar - * - * @return array - */ - function loadavg($bar = false); - - /** - * CPU information - * - * @return array - */ - function cpuinfo(); - - /** - * PCI devices - * - * @return array - */ - function pci(); - - /** - * IDE devices - * - * @return array - */ - function ide(); - - /** - * SCSI devices - * - * @return array - */ - function scsi(); - - /** - * USB devices - * - * @return array - */ - function usb(); - - /** - * Network devices - * - * @return array - */ - function network(); - - /** - * Physical memory information and Swap Space information - * - * @return array - */ - function memory(); - - /** - * filesystem information - * - * @return array - */ - function filesystems(); - - /** - * Distribution - * - * @return string - */ - function distro(); - - /** - * Distribution Icon - * - * @return string - */ - function distroicon(); - - /** - * get a special encoding from os where phpsysinfo is running - * - * @return string - */ - function getEncoding(); + function getSys(); } ?> Modified: includes/interface/class.PSI_Interface_Sensor.inc.php =================================================================== --- includes/interface/class.PSI_Interface_Sensor.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/interface/class.PSI_Interface_Sensor.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -28,24 +28,17 @@ interface PSI_Interface_Sensor { /** - * get temperature information + * build the mbinfo information * - * @return array + * @return void */ - function temperature(); + function build(); /** - * get voltage information + * get the filled or unfilled (with default values) MBInfo object * - * @return array + * @return MBInfo */ - function voltage(); - - /** - * get fan information - * - * @return array - */ - function fans(); + function getMBInfo(); } ?> Modified: includes/interface/class.PSI_Interface_UPS.inc.php =================================================================== --- includes/interface/class.PSI_Interface_UPS.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/interface/class.PSI_Interface_UPS.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -27,10 +27,17 @@ interface PSI_Interface_UPS { /** - * generate the output + * build the ups information * * @return void */ - function info(); + function build(); + + /** + * get the filled or unfilled (with default values) UPSInfo object + * + * @return UPSInfo + */ + function getUPSInfo(); } ?> Modified: includes/mb/class.Coretemp.inc.php =================================================================== --- includes/mb/class.Coretemp.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.Coretemp.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -1,4 +1,4 @@ -<?php +<?php /** * coretemp sensor class * @@ -24,49 +24,39 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class Coretemp implements PSI_Interface_Sensor +class Coretemp extends Sensors { /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - function temperature() + private function _temperature() { - $results = array (); $smp = 1; CommonFunctions::executeProgram('sysctl', '-n kern.smp.cpus', $smp); for ($i = 0; $i < $smp; $i++) { $temp = 0; if (CommonFunctions::executeProgram('sysctl', '-n dev.cpu.'.$i.'.temperature', $temp)) { - $results[$i]['label'] = "CPU ".($i+1); - $results[$i]['value'] = $temp; - $results[$i]['limit'] = '70.0'; - $results[$i]['percent'] = $results[$i]['value']*100/ - $results[$i]['limit']; + $dev = new SensorDevice(); + $dev->setName("CPU ".($i + 1)); + $dev->setValue($temp); + $dev->setMax(70); + $this->mbinfo->setMbTemp($dev); } } - return $results; } - + /** - * get fan information + * get the information * - * @return array fans in array with lable - */ - function fans() - { - return null; - } - - /** - * get voltage information + * @see PSI_Interface_Sensor::build() * - * @return array voltage in array with lable + * @return Void */ - function voltage() + public function build() { - return null; + $this->_temperature(); } } ?> Modified: includes/mb/class.HDDTemp.inc.php =================================================================== --- includes/mb/class.HDDTemp.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.HDDTemp.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -1,4 +1,4 @@ -<?php +<?php /** * hddtemp sensor class * @@ -24,35 +24,18 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class HDDTemp +class HDDTemp extends Sensors { /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** - * create the error object - */ - public function __construct() - { - $this->_error = Error::Singleton(); - } - - - /** * get the temperature information from hddtemp * access is available through tcp or command * * @return array temperatures in array */ - public function temperature() + private function _temperature() { - $ar_buf = array (); - $results = array (); - switch(PSI_HDD_TEMP) { + $ar_buf = array(); + switch (PSI_HDD_TEMP) { case "tcp": $lines = ''; // Timo van Roermund: connect to the hddtemp daemon, use a 5 second timeout. @@ -64,7 +47,7 @@ } fclose($fp); } else { - $this->_error->addError("HDDTemp error", $errno.", ".$errstr); + $this->error->addError("HDDTemp error", $errno.", ".$errstr); } $lines = str_replace("||", "|\n|", $lines); $ar_buf = explode("\n", $lines); @@ -101,7 +84,7 @@ } } if (trim($strDrives) == "") { - return array (); + break; } if (CommonFunctions::executeProgram("hddtemp", $strDrives, $hddtemp_value)) { $hddtemp_value = explode("\n", $hddtemp_value); @@ -114,34 +97,40 @@ array_push($ar_buf, "|".implode("|", $temp)."|"); } } - } else { - return array (); } break; default: - $this->_error->addConfigError("temperature()", "PSI_HDD_TEMP"); + $this->error->addConfigError("temperature()", "PSI_HDD_TEMP"); break; } // Timo van Roermund: parse the info from the hddtemp daemon. - $i = 0; foreach ($ar_buf as $line) { - $data = array (); + $data = array(); if (ereg("\|(.*)\|(.*)\|(.*)\|(.*)\|", $line, $data)) { if (trim($data[3]) != "ERR") { // get the info we need - $results[$i]['label'] = $data[1]; + $dev = new SensorDevice(); + $dev->setName($data[1]); if (is_numeric($data[3])) { - $results[$i]['value'] = $data[3]; - } else { - $results[$i]['value'] = 0; + $dev->setValue($data[3]); } - //extra processing because of a bug in some versions of hddtemp - $results[$i]['model'] = trim(str_replace("\x10\x80", "", $data[2])); - $i++; + $dev->setMax(60); + $this->mbinfo->setMbTemp($dev); } } } - return $results; } + + /** + * get the information + * + * @see PSI_Interface_Sensor::build() + * + * @return Void + */ + public function build() + { + $this->_temperature(); + } } ?> Modified: includes/mb/class.HWSensors.inc.php =================================================================== --- includes/mb/class.HWSensors.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.HWSensors.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -1,4 +1,4 @@ -<?php +<?php /** * hwsensors sensor class * @@ -23,107 +23,101 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class HWSensors implements PSI_Interface_Sensor +class HWSensors extends Sensors { /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** * content to parse * * @var array */ - private $_lines = array (); - + private $_lines = array(); + /** * fill the private content var through tcp or file access */ function __construct() { - $this->_error = Error::Singleton(); - switch(strtolower(PSI_SENSOR_ACCESS)) - { + parent::__construct(); + switch (strtolower(PSI_SENSOR_ACCESS)) { case 'tcp': $lines = ""; CommonFunctions::executeProgram('sysctl', '-w hw.sensors', $lines); $this->_lines = explode("\n", $lines); break; default: - $this->_error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); + $this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); break; } } - + /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - public function temperature() + private function _temperature() { - $ar_buf = array (); - $results = array (); - $j = 0; foreach ($this->_lines as $line) { $ar_buf = preg_split("/[\s,]+/", $line); - if ( isset ($ar_buf[3]) && $ar_buf[2] == 'temp') { - $results[$j]['label'] = $ar_buf[1]; - $results[$j]['value'] = $ar_buf[3]; - $results[$j]['limit'] = '70.0'; - $results[$j]['percent'] = $results[$j]['value']*100/ - $results[$j]['limit']; - $j++; + if (isset($ar_buf[3]) && $ar_buf[2] == 'temp') { + $dev = new SensorDevice(); + $dev->setName($ar_buf[1]); + $dev->setValue($ar_buf[3]); + $dev->setMax(70); + $this->mbinfo->setMbTemp($dev); } } - return $results; } - + /** * get fan information * - * @return array fans in array with lable + * @return void */ - public function fans() + private function _fans() { - $ar_buf = array (); - $results = array (); - $j = 0; foreach ($this->_lines as $line) { $ar_buf = preg_split("/[\s,]+/", $line); - if ( isset ($ar_buf[3]) && $ar_buf[2] == 'fanrpm') { - $results[$j]['label'] = $ar_buf[1]; - $results[$j]['value'] = $ar_buf[3]; - $j++; + if (isset($ar_buf[3]) && $ar_buf[2] == 'fanrpm') { + $dev = new SensorDevice(); + $dev->setName($ar_buf[1]); + $dev->setValue($ar_buf[3]); + $this->mbinfo->setMbFan($dev); } } - return $results; } - + /** * get voltage information * - * @return array voltage in array with lable + * @return void */ - public function voltage() + private function _voltage() { - $ar_buf = array (); - $results = array (); - $j = 0; foreach ($this->_lines as $line) { $ar_buf = preg_split("/[\s,]+/", $line); - if ( isset ($ar_buf[3]) && $ar_buf[2] == 'volts_dc') { - $results[$j]['label'] = $ar_buf[1]; - $results[$j]['value'] = $ar_buf[3]; - $results[$j]['min'] = '0.00'; - $results[$j]['max'] = '0.00'; - $j++; + if (isset($ar_buf[3]) && $ar_buf[2] == 'volts_dc') { + $dev = new SensorDevice(); + $dev->setName($ar_buf[1]); + $dev->setValue($ar_buf[3]); + $this->mbinfo->setMbVolt($dev); } } - return $results; } + + + /** + * get the information + * + * @see PSI_Interface_Sensor::build() + * + * @return Void + */ + public function build() + { + $this->_temperature(); + $this->_voltage(); + $this->_fans(); + } } ?> Modified: includes/mb/class.Healthd.inc.php =================================================================== --- includes/mb/class.Healthd.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.Healthd.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -1,4 +1,4 @@ -<?php +<?php /** * healthd sensor class * @@ -23,126 +23,133 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class Healthd implements PSI_Interface_Sensor +class Healthd extends Sensors { /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** * content to parse * * @var array */ - private $_lines = array (); - + private $_lines = array(); + /** * fill the private content var through tcp or file access */ public function __construct() { - $this->_error = Error::Singleton(); - switch(strtolower(PSI_SENSOR_ACCESS)) { + parent::__construct(); + switch (strtolower(PSI_SENSOR_ACCESS)) { case 'command': $lines = ""; CommonFunctions::executeProgram('healthdc', '-t', $lines); $this->_lines = explode("\n", $lines); break; default: - $this->_error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); + $this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); break; } } - + /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - public function temperature() + private function _temperature() { - $ar_buf = array (); - $results = array (); $ar_buf = preg_split("/\t+/", $this->_lines); - $results[0]['label'] = 'temp1'; - $results[0]['value'] = $ar_buf[1]; - $results[0]['limit'] = '70.0'; - $results[0]['percent'] = $results[0]['value']*100/$results[0]['limit']; - $results[1]['label'] = 'temp2'; - $results[1]['value'] = $ar_buf[2]; - $results[1]['limit'] = '70.0'; - $results[1]['percent'] = $results[1]['value']*100/$results[1]['limit']; - $results[2]['label'] = 'temp3'; - $results[2]['value'] = $ar_buf[3]; - $results[2]['limit'] = '70.0'; - $results[2]['percent'] = $results[2]['value']*100/$results[2]['limit']; - return $results; + $dev1 = new SensorDevice(); + $dev1->setName('temp1'); + $dev1->setValue($ar_buf[1]); + $dev1->setMax(70); + $this->mbinfo->setMbTemp($dev1); + $dev2 = new SensorDevice(); + $dev2->setName('temp1'); + $dev2->setValue($ar_buf[2]); + $dev2->setMax(70); + $this->mbinfo->setMbTemp($dev2); + $dev3 = new SensorDevice(); + $dev3->setName('temp1'); + $dev3->setValue($ar_buf[3]); + $dev3->setMax(70); + $this->mbinfo->setMbTemp($dev3); } - + /** * get fan information * - * @return array fans in array with lable + * @return void */ - public function fans() + private function _fans() { - $ar_buf = array (); - $results = array (); $ar_buf = preg_split("/\t+/", $this->_lines); - $results[0]['label'] = 'fan1'; - $results[0]['value'] = $ar_buf[4]; - $results[0]['min'] = '3000'; - $results[1]['label'] = 'fan2'; - $results[1]['value'] = $ar_buf[5]; - $results[1]['min'] = '3000'; - $results[2]['label'] = 'fan3'; - $results[2]['value'] = $ar_buf[6]; - $results[2]['min'] = '3000'; - return $results; + $dev1 = new SensorDevice(); + $dev1->setName('fan1'); + $dev1->setValue($ar_buf[4]); + $dev1->setMin(3000); + $this->mbinfo->setMbFan($dev1); + $dev2 = new SensorDevice(); + $dev2->setName('fan2'); + $dev2->setValue($ar_buf[5]); + $dev2->setMin(3000); + $this->mbinfo->setMbFan($dev2); + $dev3 = new SensorDevice(); + $dev3->setName('fan3'); + $dev3->setValue($ar_buf[6]); + $dev3->setMin(3000); + $this->mbinfo->setMbFan($dev3); } - + /** * get voltage information * * @return array voltage in array with lable */ - public function voltage() + private function _voltage() { - $ar_buf = array (); - $results = array (); $ar_buf = preg_split("/\t+/", $this->_lines); - $results[0]['label'] = 'Vcore1'; - $results[0]['value'] = $ar_buf[7]; - $results[0]['min'] = '0.00'; - $results[0]['max'] = '0.00'; - $results[1]['label'] = 'Vcore2'; - $results[1]['value'] = $ar_buf[8]; - $results[1]['min'] = '0.00'; - $results[1]['max'] = '0.00'; - $results[2]['label'] = '3volt'; - $results[2]['value'] = $ar_buf[9]; - $results[2]['min'] = '0.00'; - $results[2]['max'] = '0.00'; - $results[3]['label'] = '+5Volt'; - $results[3]['value'] = $ar_buf[10]; - $results[3]['min'] = '0.00'; - $results[3]['max'] = '0.00'; - $results[4]['label'] = '+12Volt'; - $results[4]['value'] = $ar_buf[11]; - $results[4]['min'] = '0.00'; - $results[4]['max'] = '0.00'; - $results[5]['label'] = '-12Volt'; - $results[5]['value'] = $ar_buf[12]; - $results[5]['min'] = '0.00'; - $results[5]['max'] = '0.00'; - $results[6]['label'] = '-5Volt'; - $results[6]['value'] = $ar_buf[13]; - $results[6]['min'] = '0.00'; - $results[6]['max'] = '0.00'; - return $results; + $dev1 = new SensorDevice(); + $dev1->setName('Vcore1'); + $dev1->setValue($ar_buf[7]); + $this->mbinfo->setMbVolt($dev1); + $dev2 = new SensorDevice(); + $dev2->setName('Vcore2'); + $dev2->setValue($ar_buf[8]); + $this->mbinfo->setMbVolt($dev2); + $dev3 = new SensorDevice(); + $dev3->setName('3volt'); + $dev3->setValue($ar_buf[9]); + $this->mbinfo->setMbVolt($dev3); + $dev4 = new SensorDevice(); + $dev4->setName('+5Volt'); + $dev4->setValue($ar_buf[10]); + $this->mbinfo->setMbVolt($dev4); + $dev5 = new SensorDevice(); + $dev5->setName('+12Volt'); + $dev5->setValue($ar_buf[11]); + $this->mbinfo->setMbVolt($dev5); + $dev6 = new SensorDevice(); + $dev6->setName('-12Volt'); + $dev6->setValue($ar_buf[12]); + $this->mbinfo->setMbVolt($dev6); + $dev7 = new SensorDevice(); + $dev7->setName('-5Volt'); + $dev7->setValue($ar_buf[13]); + $this->mbinfo->setMbVolt($dev7); } + + /** + * get the information + * + * @see PSI_Interface_Sensor::build() + * + * @return Void + */ + public function build() + { + $this->_temperature(); + $this->_fans(); + $this->_voltage(); + } } ?> Modified: includes/mb/class.IPMI.inc.php =================================================================== --- includes/mb/class.IPMI.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.IPMI.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -1,4 +1,4 @@ -<?php +<?php /** * ipmi sensor class * @@ -23,92 +23,83 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class IPMI implements PSI_Interface_Sensor +class IPMI extends Sensors { /** * content to parse * * @var array */ - private $_lines = array (); - + private $_lines = array(); + /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** * fill the private content var through tcp or file access */ public function __construct() { - $this->_error = Error::Singleton(); - switch(strtolower(PSI_SENSOR_ACCESS)) { + parent::__construct(); + switch (strtolower(PSI_SENSOR_ACCESS)) { case 'command': $lines = ""; CommonFunctions::executeProgram('ipmitool', 'sensor', $lines); $this->_lines = explode("\n", $lines); break; default: - $this->_error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); + $this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); break; } } - + /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - public function temperature() + private function _temp() { - $result = array (); - $i = 0; foreach ($this->_lines as $line) { $buffer = preg_split("/[ ]+\|[ ]+/", $line); if ($buffer[2] == "degrees C" && $buffer[5] != "na") { - $result[$i]['label'] = $buffer[0]; - $result[$i]['value'] = $buffer[1]; - $result[$i]['limit'] = $buffer[8]; - $i++; + $dev = new SensorDevice(); + $dev->setName($buffer[0]); + $dev->setValue($buffer[1]); + $dev->setMax($buffer[8]); + $this->mbinfo->setMbTemp($dev); } } - return $result; } - + /** - * get fan information - * - * @return array fans in array with lable - */ - public function fans() - { - $result = array (); - return $result; - } - - /** * get voltage information * - * @return array voltage in array with lable + * @return void */ - public function voltage() + private function _voltage() { - $result = array (); - $i = 0; foreach ($this->_lines as $line) { $buffer = preg_split("/[ ]+\|[ ]+/", $line); if ($buffer[2] == "Volts" && $buffer[5] != "na") { - $result[$i]['label'] = $buffer[0]; - $result[$i]['value'] = $buffer[1]; - $result[$i]['min'] = $buffer[5]; - $result[$i]['max'] = $buffer[8]; - $i++; + $dev = new SensorDevice(); + $dev->setName($buffer[0]); + $dev->setValue($buffer[1]); + $dev->setMin($buffer[5]); + $dev->setMax($buffer[8]); + $this->mbinfo->setMbVolt($dev); } } - return $result; } + + /** + * get the information + * + * @see PSI_Interface_Sensor::build() + * + * @return Void + */ + public function build() + { + $this->_temp(); + $this->_voltage(); + } } ?> Modified: includes/mb/class.K8Temp.inc.php =================================================================== --- includes/mb/class.K8Temp.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.K8Temp.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -23,85 +23,65 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class K8Temp implements PSI_Interface_Sensor +class K8Temp extends Sensors { /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** * content to parse * * @var array */ - private $_lines = array (); - + private $_lines = array(); + /** * fill the private array */ function __construct() { - $this->_error = Error::Singleton(); + parent::__construct(); switch (strtolower(PSI_SENSOR_ACCESS)) { - case 'command': $lines = ""; + case 'command': + $lines = ""; CommonFunctions::executeProgram('k8temp', '', $lines); $this->_lines = explode("\n", $lines); break; - default: $this->_error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); + default: + $this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); break; } } - + /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - public function temperature() + private function _temperature() { - $results = array (); foreach ($this->_lines as $line) { if (preg_match('/(.*):\s*(\d*)/', $line, $data)) { - if ($data[2] <> '0') { - $results[$i]['label'] = $data[1]; - $results[$i]['limit'] = '70.0'; - if ($data[2] > 250) { - $results[$i]['value'] = 0; - $results[$i]['percent'] = 0; - } else { - $results[$i]['value'] = $data[2]; - $results[$i]['percent'] = $results[$i]['value'] * 100 / $results[$i]['limit']; + if ($data[2] > 0) { + $dev = new SensorDevice(); + $dev->setName($data[1]); + $dev->setMax('70.0'); + if ($data[2] < 250) { + $dev->setValue($data[2]); } - $i++; + $this->mbinfo->setMbTemp($dev); } } } - return $results; } - + /** - * get fan information + * get the information * - * @return array fans in array with lable - */ - public function fans() - { - $results = array (); - return $results; - } - - /** - * get voltage information + * @see PSI_Interface_Sensor::build() * - * @return array voltage in array with lable + * @return Void */ - public function voltage() + public function build() { - $results = array (); - return $results; + $this->_temperature(); } } ?> Modified: includes/mb/class.LMSensors.inc.php =================================================================== --- includes/mb/class.LMSensors.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.LMSensors.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -23,16 +23,9 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class LMSensors implements PSI_Interface_Sensor +class LMSensors extends Sensors { /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** * content to parse * * @var array @@ -44,7 +37,7 @@ */ function __construct() { - $this->_error = Error::Singleton(); + parent::__construct(); switch (strtolower(PSI_SENSOR_ACCESS)) { case 'command': $lines = ""; @@ -57,7 +50,7 @@ } break; default: - $this->_error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); + $this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); break; } } @@ -65,14 +58,14 @@ /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - public function temperature() + private function _temperature() { $ar_buf = array(); - $results = array(); + $data = array(); foreach ($this->_lines as $line) { - $data = array(); + unset($data); if (ereg("(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)", $line, $data)) { ; } elseif (ereg("(.*):(.*)\((.*)=(.*)\)(.*)", $line, $data)) { @@ -89,7 +82,6 @@ } } } - $i = 0; foreach ($ar_buf as $line) { unset($data); if (ereg("(.*):(.*).C[ ]*\((.*)=(.*).C,(.*)=(.*).C\)(.*)\)", $line, $data)) { @@ -108,35 +100,38 @@ $data[$key] = trim($value); } } - $results[$i]['label'] = $data[1]; - $results[$i]['value'] = $data[2]; + $dev = new SensorDevice(); + $dev->setName($data[1]); + $dev->setValue($data[2]); + $limit = 0; + $perce = 0; if (isset($data[6]) && $data[2] > $data[6]) { - $results[$i]['limit'] = "75"; - $results[$i]['perce'] = "75"; + $limit = 75; + $perce = 75; } else { - $results[$i]['limit'] = isset($data[4]) ? $data[4] : "75"; - $results[$i]['perce'] = isset($data[6]) ? $data[6] : "75"; + $limit = isset($data[4]) ? $data[4] : 75; + $perce = isset($data[6]) ? $data[6] : 75; } - if ($results[$i]['limit'] < $results[$i]['perce']) { - $results[$i]['limit'] = $results[$i]['perce']; + if ($limit < $perce) { + $dev->setMax($perce); + } else { + $dev->setMax($limit); } - $i++; + $this->mbinfo->setMbTemp($dev); } - asort($results); - return array_values($results); } /** * get fan information * - * @return array fans in array with lable + * @return void */ - public function fans() + private function _fans() { $ar_buf = array(); - $results = array(); + $data = array(); foreach ($this->_lines as $line) { - $data = array(); + unset($data); if (ereg("(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)", $line, $data)) { ; } elseif (ereg("(.*):(.*)\((.*)=(.*)\)(.*)", $line, $data)) { @@ -157,7 +152,6 @@ } } } - $i = 0; foreach ($ar_buf as $line) { unset($data); if (ereg("(.*):(.*) RPM \((.*)=(.*) RPM,(.*)=(.*)\)(.*)\)", $line, $data)) { @@ -169,26 +163,27 @@ } else { ereg("(.*):(.*) RPM", $line, $data); } - $results[$i]['label'] = trim($data[1]); - $results[$i]['value'] = trim($data[2]); - $results[$i]['min'] = isset($data[4]) ? trim($data[4]) : 0; - $i++; + $dev = new SensorDevice(); + $dev->setName(trim($data[1])); + $dev->setValue(trim($data[2])); + if (isset($data[4])) { + $dev->setMin(trim($data[4])); + } + $this->mbinfo->setMbFan($dev); } - asort($results); - return array_values($results); } /** * get voltage information * - * @return array voltage in array with lable + * @return void */ - public function voltage() + private function _voltage() { $ar_buf = array(); - $results = array(); + $data = array(); foreach ($this->_lines as $line) { - $data = array(); + unset($data); if (ereg("(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)", $line, $data)) { ; } else { @@ -207,7 +202,6 @@ } } } - $i = 0; foreach ($ar_buf as $line) { unset($data); if (ereg("(.*):(.*) V \((.*)=(.*) V,(.*)=(.*) V\)(.*)\)", $line, $data)) { @@ -225,14 +219,32 @@ } } if (isset($data[1])) { - $results[$i]['label'] = $data[1]; - $results[$i]['value'] = $data[2]; - $results[$i]['min'] = isset($data[4]) ? $data[4] : 0; - $results[$i]['max'] = isset($data[6]) ? $data[6] : 0; - $i++; + $dev = new SensorDevice(); + $dev->setName($data[1]); + $dev->setValue($data[2]); + if (isset($data[4])) { + $dev->setMin($data[4]); + } + if (isset($data[6])) { + $dev->setMax($data[6]); + } + $this->mbinfo->setMbVolt($dev); } } - return $results; } + + /** + * get the information + * + * @see PSI_Interface_Sensor::build() + * + * @return Void + */ + function build() + { + $this->_temperature(); + $this->_voltage(); + $this->_fans(); + } } ?> Modified: includes/mb/class.MBM5.inc.php =================================================================== --- includes/mb/class.MBM5.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.MBM5.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -1,4 +1,4 @@ -<?php +<?php /** * MBM5 sensor class * @@ -24,37 +24,30 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class MBM5 implements PSI_Interface_Sensor +class MBM5 extends Sensors { /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** * array with the names of the labels * * @var array */ - private $_buf_label = array (); + private $_buf_label = array(); - + /** * array withe the values * * @var array */ - private $_buf_value = array (); - + private $_buf_value = array(); + /** * read the MBM5.csv file and fill the private arrays */ function __construct() { - $this->_error = Error::Singleton(); - switch(strtolower(PSI_SENSOR_ACCESS)) { + parent::__construct(); + switch (strtolower(PSI_SENSOR_ACCESS)) { case 'file': $buffer = ""; CommonFunctions::rfts(APP_ROOT."/data/MBM5.csv", $buffer); @@ -68,76 +61,82 @@ $this->_buf_value = split($delim, substr($buffer[1], 0, -2)); break; default: - $this->_error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); + $this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); break; } } - + /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - public function temperature() + private function _temperature() { - $results = array (); - $intCount = 0; for ($intPosi = 3; $intPosi < 6; $intPosi++) { if ($this->_buf_value[$intPosi] == 0) { - continue ; + continue; } - $results[$intCount]['label'] = $this->_buf_label[$intPosi]; preg_match("/([0-9\.])*/", str_replace(",", ".", $this->_buf_value[$intPosi]), $hits); - $results[$intCount]['value'] = $hits[0]; - $results[$intCount]['limit'] = '70.0'; - $intCount++; + $dev = new SensorDevice(); + $dev->setName($this->_buf_label[$intPosi]); + $dev->setValue($hits[0]); + $dev->setMax(70); + $this->mbinfo->setMbTemp($dev); } - return $results; } - + /** * get fan information * - * @return array fans in array with lable + * @return void */ - public function fans() + private function _fans() { - $results = array (); - $intCount = 0; for ($intPosi = 13; $intPosi < 16; $intPosi++) { - if (! isset ($this->_buf_value[$intPosi])) { - continue ; + if (!isset($this->_buf_value[$intPosi])) { + continue; } - $results[$intCount]['label'] = $this->_buf_label[$intPosi]; preg_match("/([0-9\.])*/", str_replace(",", ".", $this->_buf_value[$intPosi]), $hits); - $results[$intCount]['value'] = $hits[0]; - $results[$intCount]['min'] = '3000'; - $intCount++; + $dev = new SensorDevice(); + $dev->setName($this->_buf_label[$intPosi]); + $dev->setValue($hits[0]); + $dev->setMin(3000); + $this->mbinfo->setMbFan($dev); } - return $results; } - + /** * get voltage information * - * @return array voltage in array with lable + * @return void */ - public function voltage() + private function _voltage() { - $results = array (); - $intCount = 0; for ($intPosi = 6; $intPosi < 13; $intPosi++) { if ($this->_buf_value[$intPosi] == 0) { - continue ; + continue; } - $results[$intCount]['label'] = $this->_buf_label[$intPosi]; preg_match("/([0-9\.])*/", str_replace(",", ".", $this->_buf_value[$intPosi]), $hits); - $results[$intCount]['value'] = $hits[0]; - $results[$intCount]['min'] = '0.00'; - $results[$intCount]['max'] = '0.00'; - $intCount++; + $dev = new SensorDevice(); + $dev->setName($this->_buf_label[$intPosi]); + $dev->setValue($hits[0]); + $this->mbinfo->setMbVolt($dev); } - return $results; } + + /** + * get the information + * + * @see PSI_Interface_Sensor::build() + * + * @return Void + */ + public function build() + { + $this->_fans(); + $this->_temperature(); + $this->_voltage(); + } } ?> Modified: includes/mb/class.MBMon.inc.php =================================================================== --- includes/mb/class.MBMon.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/mb/class.MBMon.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -1,4 +1,4 @@ -<?php +<?php /** * mbmon sensor class * @@ -23,29 +23,22 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -class MBMon implements PSI_Interface_Sensor +class MBMon extends Sensors { /** - * object for error handling - * - * @var Error - */ - private $_error; - - /** * content to parse * * @var array */ - private $_lines = array (); - + private $_lines = array(); + /** * fill the private content var through tcp or file access */ public function __construct() { - $this->_error = Error::Singleton(); - switch(strtolower(PSI_SENSOR_ACCESS)) { + parent::__construct(); + switch (strtolower(PSI_SENSOR_ACCESS)) { case 'tcp': $fp = fsockopen("localhost", 411, $errno, $errstr, 5); if ($fp) { @@ -55,7 +48,7 @@ } $this->_lines = explode("\n", $lines); } else { - $this->_error->addError("fsockopen()", $errno." ".$errstr); + $this->error->addError("fsockopen()", $errno." ".$errstr); } break; case 'command': @@ -63,82 +56,84 @@ $this->_lines = explode("\n", $lines); break; default: - $this->_error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); + $this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS'); break; } } - + /** * get temperature information * - * @return array temperatures in array with lable + * @return void */ - public function temperature() + private function _temperature() { - $results = array (); - $i = 0; foreach ($this->_lines as $line) { if (preg_match('/^(TEMP\d*)\s*:\s*(.*)$/D', $line, $data)) { if ($data[2] <> '0') { - $results[$i]['label'] = $data[1]; - $results[$i]['limit'] = '70.0'; - if ($data[2] > 250) { - $results[$i]['value'] = 0; - $results[$i]['percent'] = 0; - } else { - $results[$i]['value'] = $data[2]; - $results[$i]['percent'] = $results[$i]['value']*100/$results[$i]['limit']; + $dev = new SensorDevice(); + $dev->setName($data[1]); + $dev->setMax(70); + if ($data[2] < 250) { + $dev->setValue($data[2]); } - $i++; + $this->mbinfo->setMbTemp($dev); } } } - return $results; } - + /** * get fan information * - * @return array fans in array with lable + * @return void */ - public function fans() + private function _fans() { - $results = array (); - $i = 0; foreach ($this->_lines as $line) { if (preg_match('/^(FAN\d*)\s*:\s*(.*)$/D', $line, $data)) { if ($data[2] <> '0') { - $results[$i]['label'] = $data[1]; - $results[$i]['value'] = $data[2]; - $results[$i]['min'] = '3000'; - $i++; + $dev = new SensorDevice(); + $dev->setName($data[1]); + $dev->setValue($data[2]); + $dev->setMax(3000); + $this->mbinfo->setMbFan($dev); } } } - return $results; } - + /** * get voltage information * - * @return array voltage in array with lable + * @return void */ - public function voltage() + private function _voltage() { - $results = array (); - $i = 0; foreach ($this->_lines as $line) { if (preg_match('/^(V.*)\s*:\s*(.*)$/D', $line, $data)) { if ($data[2] <> '+0.00') { - $results[$i]['label'] = $data[1]; - $results[$i]['value'] = $data[2]; - $results[$i]['min'] = '0.00'; - $results[$i]['max'] = '0.00'; - $i++; + $dev = new SensorDevice(); + $dev->setName($data[1]); + $dev->setValue($data[2]); + $this->mbinfo->setMbVolt($dev); } } } - return $results; } + + /** + * get the information + * + * @see PSI_Interface_Sensor::build() + * + * @return void + */ + public function build() + { + $this->_temperature(); + $this->_voltage(); + $this->_fans(); + } } ?> Added: includes/mb/class.Sensors.inc.php =================================================================== --- includes/mb/class.Sensors.inc.php (rev 0) +++ includes/mb/class.Sensors.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -0,0 +1,64 @@ +<?php +/** + * Basic OS Class + * + * PHP version 5 + * + * @category PHP + * @package PSI_OS + * @author Michael Cramer <Big...@us...> + * @copyright 2009 phpSysInfo + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License + * @version SVN: $Id$ + * @link http://phpsysinfo.sourceforge.net + */ + /** + * Basic OS functions for all OS classes + * + * @category PHP + * @package PSI_OS + * @author Michael Cramer <Big...@us...> + * @copyright 2009 phpSysInfo + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License + * @version Release: 3.0 + * @link http://phpsysinfo.sourceforge.net + */ +abstract class Sensors implements PSI_Interface_Sensor +{ + /** + * object for error handling + * + * @var Error + */ + protected $error; + + /** + * object for the information + * + * @var MBInfo + */ + protected $mbinfo; + + /** + * build the global Error object + */ + public function __construct() + { + $this->error = Error::singleton(); + $this->mbinfo = new MBInfo(); + } + + /** + * get the filled or unfilled (with default values) MBInfo object + * + * @see PSI_Interface_Sensor::getMBInfo() + * + * @return MBInfo + */ + public final function getMBInfo() + { + $this->build(); + return $this->mbinfo; + } +} +?> Property changes on: includes/mb/class.Sensors.inc.php ___________________________________________________________________ Added: svn:mime-type + text/x-php Added: svn:keywords + Id Added: svn:eol-style + LF Modified: includes/os/class.BSDCommon.inc.php =================================================================== --- includes/os/class.BSDCommon.inc.php 2009-06-22 10:48:33 UTC (rev 262) +++ includes/os/class.BSDCommon.inc.php 2009-06-22 13:01:52 UTC (rev 263) @@ -25,13 +25,14 @@ * @version Release: 3.0 * @link http://phpsysinfo.sourceforge.net */ -abstract class BSDCommon extends OS { +abstract class BSDCommon extends OS +{ /** * content of the syslog * * @var array */ - private $_dmesg; + private $_dmesg = array(); /** * regexp1 for cpu information out of the syslog @@ -162,19 +163,14 @@ */ protected function readdmesg() { - $buf = ""; - if (!$this->_dmesg) { - if (PHP_OS == "Darwin") { - $this->_dmesg = array(); - } else { + if (count($this->_dmesg) === 0) { + if (!PHP_OS == "Darwin") { if (CommonFunctions::rfts('/var/run/dmesg.boot', $buf)) { $parts = explode("rebooting", $buf); $this->_dmesg = explode("\n", $parts[count($parts) - 1]); - } else { - $this->_dmesg = array(); - } - } - } + } + } + } return $this->_dmesg; } @@ -192,105 +188,80 @@ return $buf; } else { return ''; - } + } } /** * Virtual Host Name * - * @return string + * @return void */ - public function vhostname() + protected function hostname() { - if (!($result = getenv('SERVER_NAME'))) { - $result = "N.A."; - } - return $result; - } - - /** - * Canonical Host Name - * - @return string - */ - public function chostname() - { - $buf = ""; - if (CommonFunctions::executeProgram('hostname', '', $buf, PSI_DEBUG)) { - return $buf; + if (PSI_USE_VHOST === true) { + $this->sys->setHostname(getenv('SERVER_NAME')); } else { - return 'N.A.'; - } + if (CommonFunctions::executeProgram('hostname', '', $buf, PSI_DEBUG)) { + $this->sys->setHostname($buf); + ... [truncated message content] |
From: <big...@us...> - 2009-06-24 14:12:57
|
Revision: 273 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=273&view=rev Author: bigmichi1 Date: 2009-06-24 11:40:09 +0000 (Wed, 24 Jun 2009) Log Message: ----------- - move encoding to plugin constructor - build xml body template in super class Modified Paths: -------------- includes/interface/class.PSI_Interface_Plugin.inc.php includes/plugin/class.PSI_Plugin.inc.php includes/xml/class.XML.inc.php plugins/psstatus/class.PSStatus.inc.php Modified: includes/interface/class.PSI_Interface_Plugin.inc.php =================================================================== --- includes/interface/class.PSI_Interface_Plugin.inc.php 2009-06-24 10:34:49 UTC (rev 272) +++ includes/interface/class.PSI_Interface_Plugin.inc.php 2009-06-24 11:40:09 UTC (rev 273) @@ -37,11 +37,8 @@ /** * build the xml * - * @param string $strEncFrom encoding to convert from to UTF8 - * - * @return SimpleXMLObject entire XML content for the plugin which than can - * be appended to the main XML + * @return SimpleXMLObject entire XML content for the plugin which than can be appended to the main XML */ - function xml($strEncFrom); + function xml(); } ?> Modified: includes/plugin/class.PSI_Plugin.inc.php =================================================================== --- includes/plugin/class.PSI_Plugin.inc.php 2009-06-24 10:34:49 UTC (rev 272) +++ includes/plugin/class.PSI_Plugin.inc.php 2009-06-24 11:40:09 UTC (rev 273) @@ -51,14 +51,22 @@ protected $global_error = ""; /** + * xml tamplate with header + * + * @var SimpleXMLExtended + */ + protected $xml; + + /** * build the global Error object, read the configuration and check if all files are available * for a minimalistic function of the plugin * * @param String $plugin_name name of the plugin + * @param String $enc target encoding * * @return void */ - public function __construct($plugin_name) + public function __construct($plugin_name, $enc) { $this->global_error = Error::Singleton(); if (trim($plugin_name) != "") { @@ -69,6 +77,7 @@ } else { $this->global_error->addError("__construct()", "Parent constructor called without Plugin-Name!"); } + $this->_createXml($enc); } /** @@ -111,5 +120,20 @@ } } } + + /** + * create the xml template where plugin information are added to + * + * @param String $enc target encoding + * + * @return Void + */ + private function _createXml($enc) + { + $dom = new DOMDocument('1.0', 'UTF-8'); + $root = $dom->createElement("Plugin_".$this->_plugin_name); + $dom->appendChild($root); + $this->xml = new SimpleXMLExtended(simplexml_import_dom($dom), $enc); + } } ?> Modified: includes/xml/class.XML.inc.php =================================================================== --- includes/xml/class.XML.inc.php 2009-06-24 10:34:49 UTC (rev 272) +++ includes/xml/class.XML.inc.php 2009-06-24 11:40:09 UTC (rev 273) @@ -465,9 +465,9 @@ $plugins = array($this->_plugin); } foreach ($plugins as $plugin) { - $object = new $plugin(); + $object = new $plugin($this->_sysinfo->getEncoding()); $object->execute(); - $pluginroot->combinexml($object->xml($this->_sysinfo->getEncoding())); + $pluginroot->combinexml($object->xml()); } } } Modified: plugins/psstatus/class.PSStatus.inc.php =================================================================== --- plugins/psstatus/class.PSStatus.inc.php 2009-06-24 10:34:49 UTC (rev 272) +++ plugins/psstatus/class.PSStatus.inc.php 2009-06-24 11:40:09 UTC (rev 273) @@ -45,10 +45,12 @@ /** * read the data into an internal array and also call the parent constructor + * + * @param String $enc target encoding */ - public function __construct() + public function __construct($enc) { - parent::__construct(__CLASS__); + parent::__construct(__CLASS__, $enc); switch (PSI_PLUGIN_PSSTATUS_ACCESS) { case 'command': if (PHP_OS == 'WINNT') { @@ -110,20 +112,16 @@ * * @param string $enc base encoding * - * @return SimpleXMLObject entire XML content for the plugin + * @return SimpleXMLElement entire XML content for the plugin */ - public function xml($enc) + public function xml() { - $dom = new DOMDocument('1.0', 'UTF-8'); - $root = $dom->createElement("Plugin_".__CLASS__); - $dom->appendChild($root); - $xml = new SimpleXMLExtended(simplexml_import_dom($dom), $enc); foreach ($this->_result as $ps) { - $xmlps = $xml->addChild("Process"); + $xmlps = $this->xml->addChild("Process"); $xmlps->addAttribute("Name", $ps[0]); $xmlps->addAttribute("Status", $ps[1] ? 1 : 0); } - return $xml->getSimpleXmlElement(); + return $this->xml->getSimpleXmlElement(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2009-06-27 16:01:08
|
Revision: 291 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=291&view=rev Author: jacky672 Date: 2009-06-27 16:01:04 +0000 (Sat, 27 Jun 2009) Log Message: ----------- Update the config and changelog file for the BAT plugin Modified Paths: -------------- ChangeLog config.php.new Modified: ChangeLog =================================================================== --- ChangeLog 2009-06-27 15:25:39 UTC (rev 290) +++ ChangeLog 2009-06-27 16:01:04 UTC (rev 291) @@ -9,6 +9,7 @@ - [ADD] Added FR [ 2804580 ] Memory Usage Display - [ADD] Added FR [ 2784341 ] Multi core CPU load + - [ADD] Added BAT plugin to show battery state on a laptop - [UPD] refactoring of the xml structure - [UPD] avoid using arrays, instead using transport objects with default values for essential properties Modified: config.php.new =================================================================== --- config.php.new 2009-06-27 15:25:39 UTC (rev 290) +++ config.php.new 2009-06-27 16:01:04 UTC (rev 291) @@ -41,6 +41,7 @@ * - PSStatus - show a graphical representation if a process is running or not * - Quotas - show a table with all quotas that are active and there current state * - Smart - show S.M.A.R.T. information from drives that support it + * - BAT - show battery state on a laptop */ define('PSI_PLUGINS', false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Big...@us...> - 2009-07-18 18:17:14
|
Revision: 305 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=305&view=rev Author: BigMichi1 Date: 2009-07-18 18:17:10 +0000 (Sat, 18 Jul 2009) Log Message: ----------- more changes for case sensitive plugin names Modified Paths: -------------- includes/output/class.Webpage.inc.php js.php language/language.php Modified: includes/output/class.Webpage.inc.php =================================================================== --- includes/output/class.Webpage.inc.php 2009-07-18 12:15:12 UTC (rev 304) +++ includes/output/class.Webpage.inc.php 2009-07-18 18:17:10 UTC (rev 305) @@ -149,7 +149,7 @@ echo " <script type=\"text/JavaScript\" src=\"./js.php?name=jquery.treeTable\"></script>\n"; echo " <script type=\"text/JavaScript\" src=\"./js.php?name=phpsysinfo\"></script>\n"; foreach (CommonFunctions::getPlugins() as $plugin) { - echo " <script type=\"text/JavaScript\" src=\"./js.php?plugin=".trim($plugin)."&name=".trim($plugin)."\"></script>\n"; + echo " <script type=\"text/JavaScript\" src=\"./js.php?plugin=".trim($plugin)."\"></script>\n"; } echo " <title>PhpSysInfo ".CommonFunctions::PSI_VERSION."</title>\n"; echo " </head>\n"; Modified: js.php =================================================================== --- js.php 2009-07-18 12:15:12 UTC (rev 304) +++ js.php 2009-07-18 18:17:10 UTC (rev 305) @@ -22,28 +22,31 @@ require_once APP_ROOT.'/includes/autoloader.inc.php'; require_once APP_ROOT.'/config.php'; -if (isset($_GET['name'])) { - $file = basename(htmlspecialchars($_GET['name'])); - $filepath = APP_ROOT; - if (strtolower(substr($file, 0, 6)) == 'jquery' && !isset($_GET['plugin'])) { - $filepath = APP_ROOT.'/js/jQuery/'; +$file = isset($_GET['name']) ? basename(htmlspecialchars($_GET['name'])) : null; +$plugin = isset($_GET['plugin']) ? basename(htmlspecialchars($_GET['plugin'])) : null; + +if ($file != null && $plugin == null) { + if (strtolower(substr($file, 0, 6)) == 'jquery' ) { + $script = APP_ROOT.'/js/jQuery/'.$file.'.js'; } else { - if (isset($_GET['plugin'])) { - $filepath = APP_ROOT.'/plugins/'.basename(htmlspecialchars($_GET['plugin'])).'/js/'; - } else { - $filepath = APP_ROOT.'/js/phpSysInfo/'; - } + $script = APP_ROOT.'/js/phpSysInfo/'.$file.'.js'; } - $script = $filepath.$file.'.js'; - if (file_exists($script) && is_readable($script)) { - $filecontent = file_get_contents($script); - header("content-type: application/x-javascript"); - if (defined("PSI_DEBUG") && PSI_DEBUG === true) { - echo $filecontent; - } else { - $packer = new JavaScriptPacker($filecontent); - echo $packer->pack(); - } +} +if ($file == null && $plugin != null) { + $script = APP_ROOT.'/plugins/'.$plugin.'/js/'.$plugin.'.js'; +} +if ($file != null && $plugin != null) { + $script = APP_ROOT.'/plugins/'.$plugin.'/js/'.$file.'.js'; +} + +if ($script != null && file_exists($script) && is_readable($script)) { + header("content-type: application/x-javascript"); + $filecontent = file_get_contents($script); + if (defined("PSI_DEBUG") && PSI_DEBUG === true) { + echo $filecontent; + } else { + $packer = new JavaScriptPacker($filecontent); + echo $packer->pack(); } } -?> +?> \ No newline at end of file Modified: language/language.php =================================================================== --- language/language.php 2009-07-18 12:15:12 UTC (rev 304) +++ language/language.php 2009-07-18 18:17:10 UTC (rev 305) @@ -48,16 +48,14 @@ } if ( isset ($_GET['lang'])) { - if (file_exists(APP_ROOT.'/language/'.basename($_GET['lang']).'.xml')) { + if (file_exists(APP_ROOT.'/language/'.trim(htmlspecialchars(basename($_GET['lang']))).'.xml')) { $lang = basename($_GET['lang']); } } -if ( isset ($_GET['plugin'])) { - $plugin = strtolower(trim(basename($_GET['plugin']))); -} +$plugin = isset ($_GET['plugin']) ? trim(htmlspecialchars(basename($_GET['plugin']))) : null; -if ($plugin === '') { +if ($plugin == null) { if (file_exists(APP_ROOT.'/language/'.$lang.'.xml')) { echo file_get_contents(APP_ROOT.'/language/'.$lang.'.xml'); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Big...@us...> - 2009-07-18 18:20:15
|
Revision: 306 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=306&view=rev Author: BigMichi1 Date: 2009-07-18 18:20:12 +0000 (Sat, 18 Jul 2009) Log Message: ----------- sample for psstatus that didn' work quite well Modified Paths: -------------- plugins/PS/class.PS.inc.php sample/plugin_ps/README Added Paths: ----------- sample/plugin_ps/ps2.txt Modified: plugins/PS/class.PS.inc.php =================================================================== --- plugins/PS/class.PS.inc.php 2009-07-18 18:17:10 UTC (rev 305) +++ plugins/PS/class.PS.inc.php 2009-07-18 18:20:12 UTC (rev 306) @@ -80,7 +80,7 @@ } } } else { - CommonFunctions::executeProgram("ps", "-eo pid,ppid,pmem,args", $buffer, PSI_DEBUG); + CommonFunctions::executeProgram("ps", "axo pid,ppid,pmem,args", $buffer, PSI_DEBUG); } break; case 'data': Modified: sample/plugin_ps/README =================================================================== (Binary files differ) Added: sample/plugin_ps/ps2.txt =================================================================== --- sample/plugin_ps/ps2.txt (rev 0) +++ sample/plugin_ps/ps2.txt 2009-07-18 18:20:12 UTC (rev 306) @@ -0,0 +1,127 @@ + PID PPID %MEM COMMAND + 1 0 0.0 init [5] + 2 0 0.0 [kthreadd] + 3 2 0.0 [migration/0] + 4 2 0.0 [ksoftirqd/0] + 5 2 0.0 [events/0] + 6 2 0.0 [khelper] + 7 2 0.0 [kintegrityd/0] + 8 2 0.0 [kblockd/0] + 9 2 0.0 [kacpid] + 10 2 0.0 [kacpi_notify] + 11 2 0.0 [cqueue] + 12 2 0.0 [kseriod] + 13 2 0.0 [kondemand/0] + 14 2 0.0 [pdflush] + 15 2 0.0 [pdflush] + 16 2 0.0 [kswapd0] + 17 2 0.0 [aio/0] + 18 2 0.0 [kpsmoused] + 54 2 0.0 [ata/0] + 55 2 0.0 [ata_aux] + 57 2 0.0 [scsi_eh_0] + 58 2 0.0 [scsi_eh_1] + 202 2 0.0 [ksuspend_usbd] + 203 2 0.0 [khubd] + 510 2 0.0 [kjournald] + 592 1 0.0 /sbin/udevd --daemon + 818 2 0.0 [scsi_eh_2] + 819 2 0.0 [usb-storage] + 1303 2 0.0 [kauditd] + 1326 2 0.0 [kstriped] + 1363 2 0.0 [kjournald] + 1385 1 0.0 /sbin/mount.ntfs-3g /dev/sda1 /windows/C -v -o rw,noexec,nosuid,nodev,users,gid=100,fmask=133,dmask=022,locale=de_DE.UTF-8 + 1808 1 0.0 /sbin/acpid + 1827 1 0.0 /sbin/klogd -c 1 -x + 1843 1 0.0 /sbin/syslog-ng + 1853 1 0.0 /bin/dbus-daemon --system + 1982 1 0.2 /usr/sbin/hald --daemon=yes + 1991 1 0.1 /usr/sbin/console-kit-daemon + 2054 1982 0.0 hald-runner + 2129 2054 0.0 hald-addon-input: Listening on /dev/input/event4 /dev/input/event3 /dev/input/event2 /dev/input/event1 + 2223 2054 0.0 hald-addon-storage: no polling on /dev/fd0 because it is explicitly disabled + 2234 2054 0.0 hald-addon-storage: polling /dev/sdb (every 2 sec) + 2235 2054 0.0 hald-addon-storage: polling /dev/sdc (every 2 sec) + 2238 2054 0.0 hald-addon-storage: polling /dev/sr0 (every 2 sec) + 2246 2054 0.0 hald-addon-acpi: listening on acpid socket /var/run/acpid.socket + 2478 1 0.0 /usr/bin/kdm + 2492 2478 3.0 /usr/bin/Xorg -br -nolisten tcp :0 vt7 -auth /var/lib/xdm/authdir/authfiles/A:0-StlX1E + 2873 1 0.0 /sbin/dhcpcd --netconfig -L -E -c /etc/sysconfig/network/scripts/dhcpcd-hook -t 0 -h linux-mcr eth0 + 2911 1 0.0 /sbin/rpcbind + 3381 1 0.2 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 3382 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 3383 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 3401 1 0.0 /sbin/auditd -s disable + 3404 3401 0.0 /sbin/audispd + 3422 1 0.0 avahi-daemon: running [linux-mcr.local] + 3482 1 0.1 /usr/sbin/cupsd + 3671 1 0.0 /usr/sbin/nscd + 3701 1 0.0 /usr/sbin/ntpd -p /var/run/ntp/ntpd.pid -g -u ntp:ntp -i /var/lib/ntp -c /etc/ntp.conf + 3761 1 0.0 /usr/sbin/smartd + 3774 1 0.0 /usr/lib/postfix/master + 3800 1 0.0 /usr/sbin/cron + 3823 3774 0.0 pickup -l -t fifo -u + 3824 3774 0.0 qmgr -l -t fifo -u + 3843 1 0.0 /usr/sbin/sshd -o PidFile=/var/run/sshd.init.pid + 3959 1 0.0 /sbin/mingetty --noclear tty1 + 3961 1 0.0 /sbin/mingetty tty2 + 3963 1 0.0 /sbin/mingetty tty3 + 3965 1 0.0 /sbin/mingetty tty4 + 3975 1 0.0 /sbin/mingetty tty5 + 3976 1 0.0 /sbin/mingetty tty6 + 4730 2478 0.1 -:0 + 4752 1 0.0 /bin/dbus-daemon --fork --print-pid 5 --print-address 7 --session + 4753 1 0.0 dbus-launch --autolaunch 9fe5b43331dd16711f578ff44a61a184 --binary-syntax --close-stderr + 4777 4730 0.0 /bin/sh /usr/bin/startkde + 4960 1 0.0 /bin/dbus-daemon --fork --print-pid 5 --print-address 7 --session + 4961 1 0.0 dbus-launch --sh-syntax --exit-with-session + 4966 1 0.2 kdeinit4: kdeinit4 Running... + 4967 4966 0.5 klauncher + 4969 1 1.0 kded4 + 5008 4777 0.0 kwrapper4 ksmserver + 5009 4966 1.4 ksmserver + 5011 5009 1.7 kwin -session 1015110b9fd8000124791360500000100220000_1247938211_215332 + 5017 1 1.7 /usr/bin/knotify4 + 5018 1 1.5 /usr/bin/krunner + 5020 1 2.0 /usr/bin/plasma + 5024 1 0.5 /usr/bin/nepomukserver + 5026 5024 0.6 /usr/bin/nepomukservicestub nepomukstorage + 5027 5024 0.4 /usr/bin/nepomukservicestub nepomukfilewatch + 5028 5024 0.4 /usr/bin/nepomukservicestub nepomukontologyloader + 5030 1 0.4 /usr/bin/kaccess + 5044 4966 0.5 /usr/bin/policykit-kde + 5046 1 0.2 /usr/bin/pulseaudio --start + 5053 1 1.1 beagled /usr/lib/beagle/BeagleDaemon.exe --replace --bg + 5059 1 0.6 /usr/bin/kupdateapplet + 5060 1 0.7 /usr/bin/kmix + 5062 1 0.5 /usr/bin/klipper + 5083 1 0.0 /usr/lib/kde4/libexec/kdesud + 5309 1 2.3 amarokapp + 5312 1 0.2 kdeinit Running... + 5316 1 0.1 dcopserver [kdeinit] --nosid --suicide + 5318 5312 0.3 klauncher [kdeinit] --new-startup + 5320 1 0.5 kded [kdeinit] --new-startup + 5342 5312 0.2 kio_file [kdeinit] file /tmp/ksocket-BigMic + 5346 5309 0.5 yauap -noexit + 5356 5309 0.1 ruby /opt/kde3/share/apps/amarok/scripts/score_default/score_default.rb + 5440 1 0.4 knotify [kdeinit] + 5465 1 0.4 /usr/bin/kwalletd + 5495 1 1.0 beagled-helper /usr/lib/beagle/IndexHelper.exe + 5536 1 0.6 kio_uiserver [kdeinit] + 5621 1 1.1 /usr/bin/konsole + 5623 5621 0.1 /bin/bash + 5648 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 5661 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 5710 5623 0.2 /usr/bin/mc -P /tmp/mc-BigMichi1/mc.pwd.5623 + 5712 5710 0.1 bash -rcfile .bashrc + 6305 4966 0.2 kdeinit4: kio_file [kdeinit] file local:/tmp/ksocket-BigMichi1/klauncherMT4967.slave-socket local:/tmp/ksocket-BigMichi1/konquerordx5442.slave-socket + 6313 4966 0.0 /bin/sh /usr/bin/firefox + 6318 6313 3.5 /usr/lib/firefox/firefox + 6320 1 0.1 /usr/lib/GConf/2/gconfd-2 + 6332 1 0.1 /usr/lib/gvfs/gvfsd + 6338 1 0.1 /usr/lib/gvfs//gvfs-fuse-daemon /home/BigMichi1/.gvfs + 6389 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 6390 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 6395 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 6737 3381 0.3 /usr/sbin/httpd2-prefork -f /etc/apache2/httpd.conf + 7003 5712 0.0 ps axo pid,ppid,pmem,args Property changes on: sample/plugin_ps/ps2.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-09-03 08:10:40
|
Revision: 317 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=317&view=rev Author: bigmichi1 Date: 2009-09-03 08:10:31 +0000 (Thu, 03 Sep 2009) Log Message: ----------- fix width for sensor blocks italic font for second temp format Modified Paths: -------------- includes/output/class.Webpage.inc.php js/phpSysInfo/phpsysinfo.js Modified: includes/output/class.Webpage.inc.php =================================================================== --- includes/output/class.Webpage.inc.php 2009-09-03 08:09:18 UTC (rev 316) +++ includes/output/class.Webpage.inc.php 2009-09-03 08:10:31 UTC (rev 317) @@ -256,8 +256,8 @@ echo " <tr>\n"; echo " <th><span id=\"lang_059\">Label</span></th>\n"; echo " <th class=\"right\"><span id=\"lang_052\">Voltage</span></th>\n"; - echo " <th class=\"right\" style=\"width: 60px;\"><span id=\"lang_055\">Min</span></th>\n"; - echo " <th class=\"right\" style=\"width: 60px;\"><span id=\"lang_056\">Max</span></th>\n"; + echo " <th class=\"right\" style=\"width: 80px;\"><span id=\"lang_055\">Min</span></th>\n"; + echo " <th class=\"right\" style=\"width: 80px;\"><span id=\"lang_056\">Max</span></th>\n"; echo " </tr>\n"; echo " </thead>\n"; echo " <tbody>\n"; @@ -270,8 +270,8 @@ echo " <thead>\n"; echo " <tr>\n"; echo " <th><span id=\"lang_059\">Label</span></th>\n"; - echo " <th class=\"right\"style=\"width: 60px;\"><span id=\"lang_054\">Value</span></th>\n"; - echo " <th class=\"right\" style=\"width: 60px;\"><span id=\"lang_058\">Limit</span></th>\n"; + echo " <th class=\"right\" style=\"width: 80px;\"><span id=\"lang_054\">Value</span></th>\n"; + echo " <th class=\"right\" style=\"width: 80px;\"><span id=\"lang_058\">Limit</span></th>\n"; echo " </tr>\n"; echo " </thead>\n"; echo " <tbody>\n"; @@ -284,8 +284,8 @@ echo " <thead>\n"; echo " <tr>\n"; echo " <th><span id=\"lang_059\">Label</span></th>\n"; - echo " <th class=\"right\" style=\"width: 60px;\"><span id=\"lang_054\">Value</span></th>\n"; - echo " <th class=\"right\" style=\"width: 60px;\"><span id=\"lang_055\">Min</span></th>\n"; + echo " <th class=\"right\" style=\"width: 80px;\"><span id=\"lang_054\">Value</span></th>\n"; + echo " <th class=\"right\" style=\"width: 80px;\"><span id=\"lang_055\">Min</span></th>\n"; echo " </tr>\n"; echo " </thead>\n"; echo " <tbody>\n"; Modified: js/phpSysInfo/phpsysinfo.js =================================================================== --- js/phpSysInfo/phpsysinfo.js 2009-09-03 08:09:18 UTC (rev 316) +++ js/phpSysInfo/phpsysinfo.js 2009-09-03 08:10:31 UTC (rev 317) @@ -528,9 +528,9 @@ case "c": return round(degree, 1) + " " + genlang(60, true); case "c-f": - return round(degree, 1) + " " + genlang(60, true) + " (" + round((((9 * degree) / 5) + 32), 1) + " " + genlang(61, true) + ")"; + return round(degree, 1) + " " + genlang(60, true) + "<br><i>(" + round((((9 * degree) / 5) + 32), 1) + " " + genlang(61, true) + ")</i>"; case "f-c": - return round((((9 * degree) / 5) + 32), 1) + " " + genlang(61, true) + " (" + round(degree, 1) + " " + genlang(60, true) + ")"; + return round((((9 * degree) / 5) + 32), 1) + " " + genlang(61, true) + "<br><i>(" + round(degree, 1) + " " + genlang(60, true) + ")</i>"; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-09-05 12:10:09
|
Revision: 319 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=319&view=rev Author: bigmichi1 Date: 2009-09-05 12:09:52 +0000 (Sat, 05 Sep 2009) Log Message: ----------- MDStatus plugin spit error to apache log Modified Paths: -------------- ChangeLog plugins/MDStatus/class.MDStatus.inc.php plugins/MDStatus/js/MDStatus.js Added Paths: ----------- sample/plugin_mdstat/raid7.txt Modified: ChangeLog =================================================================== --- ChangeLog 2009-09-05 09:11:36 UTC (rev 318) +++ ChangeLog 2009-09-05 12:09:52 UTC (rev 319) @@ -8,7 +8,8 @@ - [FIX] Fixed Bug [ 2811367 ] xml.php: prints warning in output - [FIX] Fixed bug [ 2820488 ] XML Parsing Error with E_ALL enabled - [FIX] Fixed Bug [ 2826271 ] LMSensors XML attributes error - + - [FIX] Fixed Bug [ 2825582 ] MDStatus plugin spit error to apache log + - [ADD] Japanese translation - [ADD] Added FR [ 2804580 ] Memory Usage Display - [ADD] Added FR [ 2784341 ] Multi core CPU load Modified: plugins/MDStatus/class.MDStatus.inc.php =================================================================== --- plugins/MDStatus/class.MDStatus.inc.php 2009-09-05 09:11:36 UTC (rev 318) +++ plugins/MDStatus/class.MDStatus.inc.php 2009-09-05 12:09:52 UTC (rev 319) @@ -45,10 +45,10 @@ /** * read the data into an internal array and also call the parent constructor */ - public function __construct() + public function __construct($enc) { $buffer = ""; - parent::__construct((__CLASS__)); + parent::__construct(__CLASS__, $enc); switch (PSI_PLUGIN_MDSTAT_ACCESS) { case 'file': CommonFunctions::rfts("/proc/mdstat", $buffer); @@ -181,45 +181,44 @@ * * @return SimpleXMLObject entire XML content for the plugin */ - public function xml($enc) + public function xml() { - $dom = new DOMDocument('1.0', 'UTF-8'); - $root = $dom->createElement("Plugin_".__CLASS__); - $dom->appendChild($root); - $xml = simplexml_import_dom($dom); if ( empty($this->_result)) { - return $xml; + return $this->xml; } - $sup = $xml->addChild("Supported_Types"); + $sup = $this->xml->addChild("Supported_Types"); foreach ($this->_result['supported_types'] as $type) { $typ = $sup->addChild("Type"); - $typ->addChild("Name", XML::toUTF8($type, $enc)); + $typ->addAttribute("Name", $type); } foreach ($this->_result['devices'] as $key=>$device) { - $dev = $xml->addChild("Device"); - $dev->addChild("Device_Name", XML::toUTF8($key, $enc)); - $dev->addChild("Level", XML::toUTF8($device["level"], $enc)); - $dev->addChild("Disk_Status", XML::toUTF8($device["status"], $enc)); - $dev->addChild("Chunk_Size", XML::toUTF8($device["chunk_size"], $enc)); - $dev->addChild("Persistend_Superblock", XML::toUTF8($device["pers_superblock"], $enc)); - $dev->addChild("Algorithm", XML::toUTF8($device["algorithm"], $enc)); - $dev->addChild("Disks_Registered", XML::toUTF8($device["registered"], $enc)); - $dev->addChild("Disks_Active", XML::toUTF8($device["active"], $enc)); + $dev = $this->xml->addChild("Raid"); + $dev->addAttribute("Device_Name", $key); + $dev->addAttribute("Level", $device["level"]); + $dev->addAttribute("Disk_Status", $device["status"]); + $dev->addAttribute("Chunk_Size", $device["chunk_size"]); + $dev->addAttribute("Persistend_Superblock", $device["pers_superblock"]); + $dev->addAttribute("Algorithm", $device["algorithm"]); + $dev->addAttribute("Disks_Registered", $device["registered"]); + $dev->addAttribute("Disks_Active", $device["active"]); $action = $dev->addChild("Action"); - $action->addChild("Percent", XML::toUTF8($device['action']['percent'], $enc)); - $action->addChild("Name", XML::toUTF8($device['action']['name'], $enc)); - $action->addChild("Time_To_Finish", XML::toUTF8($device['action']['finish_time'], $enc)); - $action->addChild("Time_Unit", XML::toUTF8($device['action']['finish_unit'], $enc)); + $action->addAttribute("Percent", $device['action']['percent']); + $action->addAttribute("Name", $device['action']['name']); + $action->addAttribute("Time_To_Finish", $device['action']['finish_time']); + $action->addAttribute("Time_Unit", $device['action']['finish_unit']); $disks = $dev->addChild("Disks"); foreach ($device['partitions'] as $diskkey=>$disk) { $disktemp = $disks->addChild("Disk"); - $disktemp->addChild("Name", XML::toUTF8($diskkey, $enc)); - $disktemp->addChild("Status", XML::toUTF8($disk['status'], $enc)); - $disktemp->addChild("Index", XML::toUTF8($disk['raid_index'], $enc)); + $disktemp->addAttribute("Name", $diskkey); + $disktemp->addAttribute("Status", $disk['status']); + $disktemp->addAttribute("Index", $disk['raid_index']); } } - $xml->addChild("Unused_Devices", XML::toUTF8($this->_result['unused_devs'], $enc)); - return $xml; + if($this->_result['unused_devs'] !== -1) { + $unDev = $this->xml->addChild("Unused_Devices"); + $unDev->addAttribute("Devices", $this->_result['unused_devs']); + } + return $this->xml->getSimpleXmlElement(); } } ?> Modified: plugins/MDStatus/js/MDStatus.js =================================================================== --- plugins/MDStatus/js/MDStatus.js 2009-09-05 09:11:36 UTC (rev 318) +++ plugins/MDStatus/js/MDStatus.js 2009-09-05 12:09:52 UTC (rev 319) @@ -23,6 +23,8 @@ /*global $, jQuery, buildBlock, genlang, createBar, plugin_translate, datetime, appendcss */ +"use strict"; + var mdstatus_show = false; appendcss("./plugins/MDStatus/css/mdstatus.css"); @@ -35,13 +37,13 @@ function mdstatus_buildinfos(xml, id) { var html = "", devstatus = "", devlevel = "", devchunk = 0, devsuper = 0, devalgo = 0, devactive = 0, devregis = 0, button = ""; - devstatus = $("Disk_Status", xml).text().toString(); - devlevel = $("Level", xml).text().toString(); - devchunk = parseInt($("Chunk_Size", xml).text().toString(), 10); - devsuper = parseInt($("Persistent_Superblock", xml).text().toString(), 10); - devalgo = parseInt($("Algorithm", xml).text().toString(), 10); - devactive = parseInt($("Disks_Active", xml).text().toString(), 10); - devregis = parseInt($("Disks_Registered", xml).text().toString(), 10); + devstatus = $(xml).attr("Disk_Status"); + devlevel = $(xml).attr("Level"); + devchunk = parseInt($(xml).attr("Chunk_Size"), 10); + devsuper = parseInt($(xml).attr("Persistent_Superblock"), 10); + devalgo = parseInt($(xml).attr("Algorithm"), 10); + devactive = parseInt($(xml).attr("Disks_Active"), 10); + devregis = parseInt($(xml).attr("Disks_Registered"), 10); html += "<tr><td>" + genlang(5, false, "MDStatus") + "</td><td>" + devstatus + "</td></tr>"; html += "<tr><td>" + genlang(6, false, "MDStatus") + "</td><td>" + devlevel + "</td></tr>"; if (devchunk !== -1) { @@ -52,14 +54,13 @@ } if (devsuper !== -1) { html += "<tr><td>" + genlang(9, false, "MDStatus") + "</td><td>" + genlang(10, false, "MDStatus") + "</td></tr>"; - } - else { + } else { html += "<tr><td>" + genlang(9, false, "MDStatus") + "</td><td>" + genlang(11, false, "MDStatus") + "</td></tr>"; } if (devactive !== -1 && devregis !== -1) { html += "<tr><td>" + genlang(12, false, "MDStatus") + "</td><td>" + devregis + "/" + devactive + "</td></tr>"; } - button = "<h3 style=\"cursor: pointer\" id=\"sPlugin_MDStatus_Info" + id + "\"><img src=\"./gfx/bullet_toggle_plus.png\" alt=\"plus\" style=\"vertical-align:middle;\" />" + genlang(4, false, "MDStatus") + "</h3>"; + button += "<h3 style=\"cursor: pointer\" id=\"sPlugin_MDStatus_Info" + id + "\"><img src=\"./gfx/bullet_toggle_plus.png\" alt=\"plus\" style=\"vertical-align:middle;\" />" + genlang(4, false, "MDStatus") + "</h3>"; button += "<h3 style=\"cursor: pointer; display: none;\" id=\"hPlugin_MDStatus_Info" + id + "\"><img src=\"./gfx/bullet_toggle_minus.png\" alt=\"minus\" style=\"vertical-align:middle;\" />" + genlang(4, false, "MDStatus") + "</h3>"; button += "<table id=\"Plugin_MDStatus_InfoTable" + id + "\" cellspacing=\"0\" style=\"display: none;\">" + html + "</table>"; return button; @@ -70,16 +71,15 @@ * @param {jQuery} xml part of the plugin-XML */ function mdstatus_buildaction(xml) { - var html = "", entry, action = 0, time = "", tunit = "", percent = 0; + var html = "", name = "", time = "", tunit = "", percent = 0; $("Action", xml).each(function mdstatus_getaction(id) { - entry = $("Action", xml).get(id); - action = $("Name", entry).text().toString(); - if (parseInt(action, 10) !== -1) { - time = $("Time_To_Finish", entry).text().toString(); - tunit = $("Time_Unit", entry).text().toString(); - percent = parseInt($("Percent", entry).text().toString(), 10); + name = $(this).attr("Name"); + if (parseInt(name, 10) !== -1) { + time = $(this).attr("Time_To_Finish"); + tunit = $(this).attr("Time_Unit"); + percent = parseInt($(this).attr("Percent"), 10); html += "<div style=\"padding-left:10px;\">"; - html += genlang(13, false, "MDStatus") + ": " + action + "<br/>"; + html += genlang(13, false, "MDStatus") + ": " + name + "<br/>"; html += createBar(percent); html += "<br/>"; html += genlang(14, false, "MDStatus") + " " + time + " " + tunit; @@ -94,12 +94,11 @@ * @param {jQuery} xml part of the plugin-XML */ function mdstatus_diskicon(xml) { - var html = "", disk, diskstatus = "", diskname = "", img = "", alt = ""; - $("Disk", xml).each(function mdstatus_getdisk(id) { - disk = $("Disk", xml).get(id); + var html = "", diskstatus = "", diskname = "", img = "", alt = ""; + $("Disks Disk", xml).each(function mdstatus_getdisk(id) { html += "<div class=\"plugin_mdstatus_biun\">"; - diskstatus = $("Status", disk).text().toString(); - diskname = $("Name", disk).text().toString(); + diskstatus = $(this).attr("Status"); + diskname = $(this).attr("Name"); switch (diskstatus) { case " ": case "": @@ -132,69 +131,55 @@ * @param {jQuery} xml plugin-XML */ function mdstatus_populate(xml) { - var htmltypes = "", htmldisks = "", htmldisklist = "", type, html = "", types, mdstat, plugins, name = "", dev, disks, topic = "", buildedaction = ""; + var htmltypes = ""; $("#Plugin_MDStatusTable").empty(); - $("Plugins", xml).each(function mdstatus_getplugins(id) { - plugins = $("Plugins", xml).get(id); - $("Plugin_MDStatus", plugins).each(function mdstatus_getplugin(idp) { - mdstat = $("Plugin_MDStatus", plugins).get(idp); - $("Supported_Types", mdstat).each(function mdstatus_getsupportedtypes(ids) { - types = $("Supported_Types", mdstat).get(ids); - $("Type", types).each(function mdstatus_gettype(idt) { - type = $("Type", types).get(idt); - html = $("Name", type).text().toString(); - htmltypes += "<li>" + html + "</li>"; - }); - }); - if (htmltypes.length > 0) { - htmltypes = "<ul>" + htmltypes + "</ul>"; - $("#Plugin_MDStatusTable").append("<tr><td style=\"width:160px;\">" + genlang(2, false, "MDStatus") + "</td><td>" + htmltypes + "</td></tr>"); - mdstatus_show = true; - } - $("Device", mdstat).each(function mdstatus_getdevice(idd) { - htmldisks = ""; - htmldisklist = ""; - dev = $("Device", mdstat).get(idd); - name = $("Device_Name", dev).text().toString(); - $("Disks", dev).each(function mdstatus_getdisk(iddd) { - disks = $("Disks", dev).get(iddd); - htmldisklist += mdstatus_diskicon(disks); - }); - htmldisks += "<table style=\"width:100%;\">"; - htmldisks += "<tr><td>" + htmldisklist + "</td></tr>"; - buildedaction = mdstatus_buildaction(dev); - if (buildedaction) { - htmldisks += "<tr><td>" + buildedaction + "</td></tr>"; - } - htmldisks += "<tr><td>" + mdstatus_buildinfos(dev, id) + "<td></tr>"; - htmldisks += "</table>"; - if (id) { - topic = ""; - } - else { - topic = genlang(3, false, "MDStatus"); - } - $("#Plugin_MDStatusTable").append("<tr><td>" + topic + "</td><td><div class=\"plugin_mdstatus_biun\" style=\"text-align:left;\"><b>" + name + "</b></div>" + htmldisks + "</td></tr>"); - $("#sPlugin_MDStatus_Info" + id).click(function mdstatus_showinfo() { - $("#Plugin_MDStatus_InfoTable" + id).slideDown("slow"); - $("#sPlugin_MDStatus_Info" + id).hide(); - $("#hPlugin_MDStatus_Info" + id).show(); - }); - $("#hPlugin_MDStatus_Info" + id).click(function mdstatus_hideinfo() { - $("#Plugin_MDStatus_InfoTable" + id).slideUp("slow"); - $("#hPlugin_MDStatus_Info" + id).hide(); - $("#sPlugin_MDStatus_Info" + id).show(); - }); - mdstatus_show = true; - }); - if ($("Unused_Devices", mdstat).length > 0) { - $("#Plugin_MDStatusTable").append("<tr><td>" + genlang(15, false, "MDStatus") + "</td><td>" + $("Unused_Devices", mdstat).text().toString() + "</td></tr>"); - mdstatus_show = true; - } + $("Plugins Plugin_MDStatus Supported_Types Type", xml).each(function mdstatus_getsupportedtypes(id) { + htmltypes += "<li>" + $(this).attr("Name") + "</li>"; + }); + if (htmltypes.length > 0) { + htmltypes = "<ul>" + htmltypes + "</ul>"; + $("#Plugin_MDStatusTable").append("<tr><td style=\"width:160px;\">" + genlang(2, false, "MDStatus") + "</td><td>" + htmltypes + "</td></tr>"); + mdstatus_show = true; + } + + $("Plugins Plugin_MDStatus Raid", xml).each(function mdstatus_getdevice(id) { + var htmldisks = "", htmldisklist = "", topic = "", name = "", buildedaction = ""; + name = $(this).attr("Device_Name"); + htmldisklist += mdstatus_diskicon(this); + htmldisks += "<table style=\"width:100%;\">"; + htmldisks += "<tr><td>" + htmldisklist + "</td></tr>"; + buildedaction = mdstatus_buildaction($(this)); + if (buildedaction) { + htmldisks += "<tr><td>" + buildedaction + "</td></tr>"; + } + htmldisks += "<tr><td>" + mdstatus_buildinfos($(this), id) + "<td></tr>"; + htmldisks += "</table>"; + if (id) { + topic = ""; + } + else { + topic = genlang(3, false, "MDStatus"); + } + $("#Plugin_MDStatusTable").append("<tr><td>" + topic + "</td><td><div class=\"plugin_mdstatus_biun\" style=\"text-align:left;\"><b>" + name + "</b></div>" + htmldisks + "</td></tr>"); + $("#sPlugin_MDStatus_Info" + id).click(function mdstatus_showinfo() { + $("#Plugin_MDStatus_InfoTable" + id).slideDown("slow"); + $("#sPlugin_MDStatus_Info" + id).hide(); + $("#hPlugin_MDStatus_Info" + id).show(); }); + $("#hPlugin_MDStatus_Info" + id).click(function mdstatus_hideinfo() { + $("#Plugin_MDStatus_InfoTable" + id).slideUp("slow"); + $("#hPlugin_MDStatus_Info" + id).hide(); + $("#sPlugin_MDStatus_Info" + id).show(); + }); + mdstatus_show = true; }); + + if ($("Plugins Plugin_MDStatus Unused_Devices", xml).length > 0) { + $("#Plugin_MDStatusTable").append("<tr><td>" + genlang(15, false, "MDStatus") + "</td><td>" + $(this).attr("Devices") + "</td></tr>"); + mdstatus_show = true; + } } /** Added: sample/plugin_mdstat/raid7.txt =================================================================== --- sample/plugin_mdstat/raid7.txt (rev 0) +++ sample/plugin_mdstat/raid7.txt 2009-09-05 12:09:52 UTC (rev 319) @@ -0,0 +1,5 @@ +Personalities : [raid6] [raid5] [raid4] +md0 : active raid5 sdi1[3] sde1[2] sdd1[1] sdc1[0] + 2197715712 blocks level 5, 64k chunk, algorithm 2 [4/4] [UUUU] + +unused devices: <none> Property changes on: sample/plugin_mdstat/raid7.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-09-06 10:47:06
|
Revision: 322 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=322&view=rev Author: bigmichi1 Date: 2009-09-06 10:46:58 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Fixed Bug [ 2852716 ] lsb-release on arch Modified Paths: -------------- ChangeLog distros.ini Modified: ChangeLog =================================================================== --- ChangeLog 2009-09-06 10:25:42 UTC (rev 321) +++ ChangeLog 2009-09-06 10:46:58 UTC (rev 322) @@ -10,6 +10,7 @@ - [FIX] Fixed Bug [ 2826271 ] LMSensors XML attributes error - [FIX] Fixed Bug [ 2825582 ] MDStatus plugin spit error to apache log - [FIX] Fixed Bug [ 2825586 ] SMART plugin spit error to apache log + - [FIX] Fixed Bug [ 2852716 ] lsb-release on arch - [ADD] Japanese translation - [ADD] Added FR [ 2804580 ] Memory Usage Display Modified: distros.ini =================================================================== --- distros.ini 2009-09-06 10:25:42 UTC (rev 321) +++ distros.ini 2009-09-06 10:46:58 UTC (rev 322) @@ -99,4 +99,8 @@ [Synology] Name = "Synology" Image = "Synology.png" -Files = "/etc/synoinfo.conf" \ No newline at end of file +Files = "/etc/synoinfo.conf" + +[arch] +Image = "Arch.png" +Name = "Arch Linux" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-09-07 09:58:18
|
Revision: 328 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=328&view=rev Author: bigmichi1 Date: 2009-09-07 09:58:01 +0000 (Mon, 07 Sep 2009) Log Message: ----------- move distros.ini to data folder Modified Paths: -------------- includes/os/class.Linux.inc.php Added Paths: ----------- data/distros.ini Removed Paths: ------------- distros.ini Copied: data/distros.ini (from rev 326, distros.ini) =================================================================== --- data/distros.ini (rev 0) +++ data/distros.ini 2009-09-07 09:58:01 UTC (rev 328) @@ -0,0 +1,106 @@ +; linux-distros.ini - Defines known linux distros for phpSysInfo. +; http://phpsysinfo.sourceforge.net/ +; $Id$ +; + +[Debian] +Name = "Debian" +Image = "Debian.png" +Files = "/etc/debian_release;/etc/debian_version" + +[SUSE LINUX] +Image = "Suse.png" +Files = "/etc/SuSE-release;/etc/UnitedLinux-release" + +[Mandrage] +Image = "Mandrake.png" +Files = "/etc/mandrake-release" + +[MandrivaLinux] +Image = "Mandrake.png" +Files = "/etc/mandrake-release" + +[Gentoo] +Image = "Gentoo.png" +Files = "/etc/gentoo-release" + +[Fedora] +Image = "Fedora.png" +Files = "/etc/fedora-release" + +[FedoraCore] +Image = "Fedora.png" +Files = "/etc/fedora-release" + +[RedHat] +Image = "Redhat.png" +Files = "/etc/redhat-release;/etc/redhat_version" + +[Slackware] +Image = "Slackware.png" +Files = "/etc/slackware-release;/etc/slackware-version" + +[Trustix] +Image = "Trustix.png" +Files = "/etc/trustix-release;/etc/trustix-version" + +[FreeEOS] +Image = "free-eos.png" +Files = "/etc/eos-version" + +[Arch] +Image = "Arch.png" +Files = "/etc/arch-release" + +[Cobalt] +Image = "Cobalt.png" +Files = "/etc/cobalt-release" + +[LinuxFromScratch] +Image = "lfs.png" +Files = "/etc/lfs-release" + +[Rubix] +Image = "Rubix.png" +Files = "/etc/rubix-version" + +[Ubuntu] +Image = "Ubuntu.png" +Files = "/etc/lsb-release" + +[PLD] +Image = "PLD.gif" +Files = "/etc/pld-release" + +[CentOS] +Image = "CentOS.png" +Files = "/etc/redhat-release;/etc/redhat_version" + +[RedHatEnterpriseES] +Image = "Redhat.png" +Files = "/etc/redhat-release;/etc/redhat_version" + +[RedHatEnterpriseAS] +Image = "Redhat.png" +Files = "/etc/redhat-release;/etc/redhat_version" + +[LFS] +Image = "lfs.png" +Files = "/etc/lfs-release;/etc/lfs_version" + +[HLFS] +Image = "hlfs.png" +Files = "/etc/hlfs-release;/etc/hlfs_version" + +[IYCC] +Image = "iycc.png" +Files = "/etc/lsb-release" + +[Synology] +Name = "Synology" +Image = "Synology.png" +Files = "/etc/synoinfo.conf" + +[arch] +Image = "Arch.png" +Name = "Arch Linux" Property changes on: data/distros.ini ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:mergeinfo + Added: svn:eol-style + LF Deleted: distros.ini =================================================================== --- distros.ini 2009-09-07 09:56:45 UTC (rev 327) +++ distros.ini 2009-09-07 09:58:01 UTC (rev 328) @@ -1,106 +0,0 @@ -; linux-distros.ini - Defines known linux distros for phpSysInfo. -; http://phpsysinfo.sourceforge.net/ -; $Id$ -; - -[Debian] -Name = "Debian" -Image = "Debian.png" -Files = "/etc/debian_release;/etc/debian_version" - -[SUSE LINUX] -Image = "Suse.png" -Files = "/etc/SuSE-release;/etc/UnitedLinux-release" - -[Mandrage] -Image = "Mandrake.png" -Files = "/etc/mandrake-release" - -[MandrivaLinux] -Image = "Mandrake.png" -Files = "/etc/mandrake-release" - -[Gentoo] -Image = "Gentoo.png" -Files = "/etc/gentoo-release" - -[Fedora] -Image = "Fedora.png" -Files = "/etc/fedora-release" - -[FedoraCore] -Image = "Fedora.png" -Files = "/etc/fedora-release" - -[RedHat] -Image = "Redhat.png" -Files = "/etc/redhat-release;/etc/redhat_version" - -[Slackware] -Image = "Slackware.png" -Files = "/etc/slackware-release;/etc/slackware-version" - -[Trustix] -Image = "Trustix.png" -Files = "/etc/trustix-release;/etc/trustix-version" - -[FreeEOS] -Image = "free-eos.png" -Files = "/etc/eos-version" - -[Arch] -Image = "Arch.png" -Files = "/etc/arch-release" - -[Cobalt] -Image = "Cobalt.png" -Files = "/etc/cobalt-release" - -[LinuxFromScratch] -Image = "lfs.png" -Files = "/etc/lfs-release" - -[Rubix] -Image = "Rubix.png" -Files = "/etc/rubix-version" - -[Ubuntu] -Image = "Ubuntu.png" -Files = "/etc/lsb-release" - -[PLD] -Image = "PLD.gif" -Files = "/etc/pld-release" - -[CentOS] -Image = "CentOS.png" -Files = "/etc/redhat-release;/etc/redhat_version" - -[RedHatEnterpriseES] -Image = "Redhat.png" -Files = "/etc/redhat-release;/etc/redhat_version" - -[RedHatEnterpriseAS] -Image = "Redhat.png" -Files = "/etc/redhat-release;/etc/redhat_version" - -[LFS] -Image = "lfs.png" -Files = "/etc/lfs-release;/etc/lfs_version" - -[HLFS] -Image = "hlfs.png" -Files = "/etc/hlfs-release;/etc/hlfs_version" - -[IYCC] -Image = "iycc.png" -Files = "/etc/lsb-release" - -[Synology] -Name = "Synology" -Image = "Synology.png" -Files = "/etc/synoinfo.conf" - -[arch] -Image = "Arch.png" -Name = "Arch Linux" Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-09-07 09:56:45 UTC (rev 327) +++ includes/os/class.Linux.inc.php 2009-09-07 09:58:01 UTC (rev 328) @@ -491,7 +491,7 @@ */ private function _distro() { - $list = @parse_ini_file(APP_ROOT."/distros.ini", true); + $list = @parse_ini_file(APP_ROOT."/data/distros.ini", true); if (!$list) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-10-13 09:29:29
|
Revision: 338 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=338&view=rev Author: bigmichi1 Date: 2009-10-13 09:29:12 +0000 (Tue, 13 Oct 2009) Log Message: ----------- fix ups information not displayed Modified Paths: -------------- includes/xml/class.XML.inc.php js/phpSysInfo/phpsysinfo.js Modified: includes/xml/class.XML.inc.php =================================================================== --- includes/xml/class.XML.inc.php 2009-10-05 07:37:32 UTC (rev 337) +++ includes/xml/class.XML.inc.php 2009-10-13 09:29:12 UTC (rev 338) @@ -377,7 +377,6 @@ $upsinfo_data = new $upsinfoclass(); $upsinfo_detail = $upsinfo_data->getUPSInfo(); foreach ($upsinfo_detail->getUpsDevices() as $ups) { - $ups = new UPSDevice(); $item = $upsinfo->addChild('UPS'); $item->addAttribute('Name', $ups->getName()); $item->addAttribute('Model', $ups->getModel()); Modified: js/phpSysInfo/phpsysinfo.js =================================================================== --- js/phpSysInfo/phpsysinfo.js 2009-10-05 07:37:32 UTC (rev 337) +++ js/phpSysInfo/phpsysinfo.js 2009-10-13 09:29:12 UTC (rev 338) @@ -990,7 +990,7 @@ battery_charge_percent = parseInt($(this).attr("BatteryChargePercent"), 10); time_left_minutes = $(this).attr("TimeLeftMinutes"); - html += "<tr><td colspan=\"2\" style=\"text-align: center\"><strong>" + name + " (" + mode + ")</strong></td></tr>\n"; + html += "<tr><td colspan=\"2\"><strong>" + name + " (" + mode + ")</strong></td></tr>\n"; index = tree.push(0); html += "<tr><td style=\"width:160px\">" + genlang(70, false) + "</td><td>" + model + "</td></tr>\n"; tree.push(index); @@ -1034,6 +1034,7 @@ html += "<tr><td style=\"width:160px\">" + genlang(81, false) + "</td><td>" + time_left_minutes + " " + genlang(83, false) + "</td></tr>\n"; tree.push(index); } + values=true; }); html += " </tbody>\n"; html += " </table>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2010-01-22 22:14:44
|
Revision: 351 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=351&view=rev Author: jacky672 Date: 2010-01-22 22:14:38 +0000 (Fri, 22 Jan 2010) Log Message: ----------- [FIX] Remove PSI_SHOW_BIND because not implemented for the moment Modified Paths: -------------- ChangeLog config.php.new Modified: ChangeLog =================================================================== --- ChangeLog 2010-01-22 21:48:58 UTC (rev 350) +++ ChangeLog 2010-01-22 22:14:38 UTC (rev 351) @@ -2,6 +2,7 @@ phpSysInfo 3.0.1 - [FIX] Fixed APCUPSD bug + - [FIX] Remove PSI_SHOW_BIND because not implemented for the moment - [ADD] Patch [ 2933516 ] IPMI status plugin - [ADD] Added PSI_SHOW_MOUNT_OPTION to show or hide mount option Modified: config.php.new =================================================================== --- config.php.new 2010-01-22 21:48:58 UTC (rev 350) +++ config.php.new 2010-01-22 22:14:38 UTC (rev 351) @@ -186,13 +186,6 @@ define('PSI_SHOW_MOUNT_OPTION', true); /** - * Show bind - * - true = display file system mounted with the bind options under Linux - * - false = hide them - */ -define('PSI_SHOW_BIND', false); - -/** * Show inode usage * - true = display used inodes in percent * - false = hide them This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2010-11-11 13:53:51
|
Revision: 389 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=389&view=rev Author: jacky672 Date: 2010-11-11 13:53:45 +0000 (Thu, 11 Nov 2010) Log Message: ----------- commit patch post in the forum (#3843551) Modified Paths: -------------- includes/os/class.Linux.inc.php includes/xml/class.XML.inc.php js/phpSysInfo/phpsysinfo.js Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2010-11-11 13:42:03 UTC (rev 388) +++ includes/os/class.Linux.inc.php 2010-11-11 13:53:45 UTC (rev 389) @@ -258,7 +258,8 @@ $dev->setModel($arrBuff[1]); break; case 'bogomips': - $dev->setCpuSpeed($arrBuff[1]); //BogoMIPS are not BogoMIPS on this CPU, it's the speed, no BogoMIPS available + $dev->setCpuSpeed($arrBuff[1]); //BogoMIPS are not BogoMIPS on this CPU, it's the speed + $dev->setBogomips(null); // no BogoMIPS available, unset previously set BogoMIPS break; case 'i size': case 'd size': Modified: includes/xml/class.XML.inc.php =================================================================== --- includes/xml/class.XML.inc.php 2010-11-11 13:42:03 UTC (rev 388) +++ includes/xml/class.XML.inc.php 2010-11-11 13:53:45 UTC (rev 389) @@ -192,12 +192,14 @@ $tmp->addAttribute('Capacity', $dev->getCapacity()); } } - + $cpu = $hardware->addChild('CPU'); foreach ($this->_sys->getCpus() as $oneCpu) { $tmp = $cpu->addChild('CpuCore'); $tmp->addAttribute('Model', $oneCpu->getModel()); - $tmp->addAttribute('CpuSpeed', $oneCpu->getCpuSpeed()); + if ($oneCpu->getCpuSpeed() !== 0) { + $tmp->addAttribute('CpuSpeed', $oneCpu->getCpuSpeed()); + } if ($oneCpu->getTemp() !== null) { $tmp->addAttribute('CpuTemp', $oneCpu->getTemp()); } Modified: js/phpSysInfo/phpsysinfo.js =================================================================== --- js/phpSysInfo/phpsysinfo.js 2010-11-11 13:42:03 UTC (rev 388) +++ js/phpSysInfo/phpsysinfo.js 2010-11-11 13:53:45 UTC (rev 389) @@ -599,7 +599,9 @@ html += "<tr><td colspan=\"2\">" + model + "</td></tr>\n"; cpucoreposition = tree.push(rootposition); html += "<tr><td style=\"width:50%\">" + genlang(13, true) + ":</td><td>" + formatHertz(speed) + "</td></tr>\n"; - tree.push(cpucoreposition); + if (!isNaN(speed)) { + tree.push(cpucoreposition); + } collapsed.push(cpucoreposition); if (!isNaN(cache)) { html += "<tr><td style=\"width:50%\">" + genlang(15, true) + ":</td><td>" + formatBytes(cache) + "</td></tr>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <na...@us...> - 2012-02-26 21:04:49
|
Revision: 540 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=540&view=rev Author: namiltd Date: 2012-02-26 21:04:42 +0000 (Sun, 26 Feb 2012) Log Message: ----------- Modified Paths: -------------- branches/namiltd/includes/os/class.Linux.inc.php branches/namiltd/includes/os/class.WINNT.inc.php branches/namiltd/js/phpSysInfo/phpsysinfo.js trunk/ChangeLog Modified: branches/namiltd/includes/os/class.Linux.inc.php =================================================================== --- branches/namiltd/includes/os/class.Linux.inc.php 2012-02-25 13:38:06 UTC (rev 539) +++ branches/namiltd/includes/os/class.Linux.inc.php 2012-02-26 21:04:42 UTC (rev 540) @@ -448,14 +448,10 @@ $bufe2 = preg_split("/\n/", $bufr2, -1, PREG_SPLIT_NO_EMPTY); foreach ($bufe2 as $buf2) { if (preg_match('/\s+encap:Ethernet\s+HWaddr\s([^\s]*)/i', $buf2, $ar_buf2)) -// $dev->setInfo('MAC '.preg_replace('/:/', '-', $ar_buf2[1])); $dev->setInfo(preg_replace('/:/', '-', $ar_buf2[1])); else if (preg_match('/^\s+inet\saddr:([^\s]*)/i', $buf2, $ar_buf2)) -// $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').'IP '.$ar_buf2[1]); $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]); -// else if (preg_match('/^\s+inet6\saddr:(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2)) else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2)) -// $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').'IPv6 '.$ar_buf2[1]); $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]); } } Modified: branches/namiltd/includes/os/class.WINNT.inc.php =================================================================== --- branches/namiltd/includes/os/class.WINNT.inc.php 2012-02-25 13:38:06 UTC (rev 539) +++ branches/namiltd/includes/os/class.WINNT.inc.php 2012-02-26 21:04:42 UTC (rev 540) @@ -105,10 +105,12 @@ foreach ($arrProp as $propItem) { eval("\$value = \$objItem->".$propItem->Name.";"); if ( empty($strValue)) { - $arrInstance[$propItem->Name] = trim($value); + if (is_string($value)) $arrInstance[$propItem->Name] = trim($value); + else $arrInstance[$propItem->Name] = $value; } else { if (in_array($propItem->Name, $strValue)) { - $arrInstance[$propItem->Name] = trim($value); + if (is_string($value)) $arrInstance[$propItem->Name] = trim($value); + else $arrInstance[$propItem->Name] = $value; } } } @@ -335,9 +337,31 @@ */ private function _network() { - foreach ($this->_getWMI('Win32_PerfRawData_Tcpip_NetworkInterface') as $device) { + $allDevices = $this->_getWMI('Win32_PerfRawData_Tcpip_NetworkInterface', array('Name', 'BytesSentPersec', 'BytesTotalPersec', 'BytesReceivedPersec', 'PacketsReceivedErrors', 'PacketsReceivedDiscarded')); + $allNetworkAdapterConfigurations = $this->_getWMI('Win32_NetworkAdapterConfiguration', array('Description', 'MACAddress', 'IPAddress')); + + foreach ($allDevices as $device) { $dev = new NetDevice(); - $dev->setName($device['Name']); + + + $name=$device['Name']; + + $cname=preg_replace('/[^A-Za-z0-9]/', '_', $name); //convert to canonical + if (preg_match('/\s-\s([^-]*)$/', $name, $ar_name)) + $name=substr($name,0,strlen($name)-strlen($ar_name[0])); + + $dev->setName($name); + + foreach ($allNetworkAdapterConfigurations as $NetworkAdapterConfiguration) { + if ( preg_replace('/[^A-Za-z0-9]/', '_', $NetworkAdapterConfiguration['Description']) == $cname ) { + $dev->setInfo(preg_replace('/:/', '-', $NetworkAdapterConfiguration['MACAddress'])); + + foreach( $NetworkAdapterConfiguration['IPAddress'] as $ipaddres) + if ($ipaddres!="0.0.0.0") $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ipaddres); + break; + } + } + // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/win32_perfrawdata_tcpip_networkinterface.asp // there is a possible bug in the wmi interfaceabout uint32 and uint64: http://www.ureader.com/message/1244948.aspx, so that // magative numbers would occour, try to calculate the nagative value from total - positive number @@ -354,6 +378,7 @@ $dev->setRxBytes($rxbytes); $dev->setErrors($device['PacketsReceivedErrors']); $dev->setDrops($device['PacketsReceivedDiscarded']); + $this->sys->setNetDevices($dev); } } Modified: branches/namiltd/js/phpSysInfo/phpsysinfo.js =================================================================== --- branches/namiltd/js/phpSysInfo/phpsysinfo.js 2012-02-25 13:38:06 UTC (rev 539) +++ branches/namiltd/js/phpSysInfo/phpsysinfo.js 2012-02-26 21:04:42 UTC (rev 540) @@ -731,7 +731,7 @@ $("#network").empty(); html += "<h2>" + genlang(21, false) + "</h2>\n"; - html + = "<table id=\"NetworkTree\" class=\"tablemain\" style=\"border-spacing:0;\">\n"; + html += "<table id=\"NetworkTree\" class=\"tablemain\" style=\"border-spacing:0;\">\n"; html += " <thead>\n"; html += " <tr>\n"; html += " <th>" + genlang(22, true) + "</th>\n"; Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-02-25 13:38:06 UTC (rev 539) +++ trunk/ChangeLog 2012-02-26 21:04:42 UTC (rev 540) @@ -3,7 +3,8 @@ phpSysInfo 3.0.17 - [ADD] Chakra to detected distros - + - [ADD] MAC/IP info for network interfaces (Linux/WINNT) + - [UPD] Language files (pl, cz) phpSysInfo 3.0.16 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <na...@us...> - 2012-02-26 21:12:40
|
Revision: 541 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=541&view=rev Author: namiltd Date: 2012-02-26 21:12:34 +0000 (Sun, 26 Feb 2012) Log Message: ----------- Modified Paths: -------------- branches/namiltd/ChangeLog trunk/ChangeLog Modified: branches/namiltd/ChangeLog =================================================================== --- branches/namiltd/ChangeLog 2012-02-26 21:04:42 UTC (rev 540) +++ branches/namiltd/ChangeLog 2012-02-26 21:12:34 UTC (rev 541) @@ -3,7 +3,8 @@ phpSysInfo 3.0.17 - [ADD] Chakra to detected distros - + - [ADD] MAC/IP info for network interfaces (Linux/WINNT) + - [UPD] Language files (pl, cz) phpSysInfo 3.0.16 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-02-26 21:04:42 UTC (rev 540) +++ trunk/ChangeLog 2012-02-26 21:12:34 UTC (rev 541) @@ -3,8 +3,7 @@ phpSysInfo 3.0.17 - [ADD] Chakra to detected distros - - [ADD] MAC/IP info for network interfaces (Linux/WINNT) - + - [UPD] Language files (pl, cz) phpSysInfo 3.0.16 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <na...@us...> - 2012-08-27 22:27:06
|
Revision: 663 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=663&view=rev Author: namiltd Date: 2012-08-27 22:27:01 +0000 (Mon, 27 Aug 2012) Log Message: ----------- Modified Paths: -------------- branches/namiltd-ini/phpsysinfo.xslt trunk/phpsysinfo.xslt Modified: branches/namiltd-ini/phpsysinfo.xslt =================================================================== --- branches/namiltd-ini/phpsysinfo.xslt 2012-08-27 17:03:21 UTC (rev 662) +++ branches/namiltd-ini/phpsysinfo.xslt 2012-08-27 22:27:01 UTC (rev 663) @@ -207,7 +207,7 @@ <tr class="odd"> <td style="width:160px;"> <span> - <xsl:text>Processor</xsl:text> + <xsl:text>Processors</xsl:text> </span> </td> <td> Modified: trunk/phpsysinfo.xslt =================================================================== --- trunk/phpsysinfo.xslt 2012-08-27 17:03:21 UTC (rev 662) +++ trunk/phpsysinfo.xslt 2012-08-27 22:27:01 UTC (rev 663) @@ -207,7 +207,7 @@ <tr class="odd"> <td style="width:160px;"> <span> - <xsl:text>Processor</xsl:text> + <xsl:text>Processors</xsl:text> </span> </td> <td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <na...@us...> - 2012-12-05 16:26:19
|
Revision: 713 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=713&view=rev Author: namiltd Date: 2012-12-05 16:26:07 +0000 (Wed, 05 Dec 2012) Log Message: ----------- Modified Paths: -------------- branches/namiltd-ini/includes/os/class.Linux.inc.php trunk/includes/os/class.Linux.inc.php Modified: branches/namiltd-ini/includes/os/class.Linux.inc.php =================================================================== --- branches/namiltd-ini/includes/os/class.Linux.inc.php 2012-12-05 14:09:18 UTC (rev 712) +++ branches/namiltd-ini/includes/os/class.Linux.inc.php 2012-12-05 16:26:07 UTC (rev 713) @@ -539,7 +539,10 @@ $distro_tmp = preg_split("/\n/", $distro_info, -1, PREG_SPLIT_NO_EMPTY); foreach ($distro_tmp as $info) { $info_tmp = preg_split('/:/', $info, 2); - $distro[$info_tmp[0]] = trim($info_tmp[1]); + if ( isset($distro_tmp[0]) && !is_null($distro_tmp[0]) && (trim($distro_tmp[0]) != "") && + isset($distro_tmp[1]) && !is_null($distro_tmp[1]) && (trim($distro_tmp[1]) != "") ) { + $distro[$info_tmp[0]] = trim($info_tmp[1]); + } } if (!isset($distro['Distributor ID']) && !isset($distro['Description'])) { if ( !is_null($distro_tmp[0]) && (trim($distro_tmp[0]) != "") ) { Modified: trunk/includes/os/class.Linux.inc.php =================================================================== --- trunk/includes/os/class.Linux.inc.php 2012-12-05 14:09:18 UTC (rev 712) +++ trunk/includes/os/class.Linux.inc.php 2012-12-05 16:26:07 UTC (rev 713) @@ -262,7 +262,7 @@ } } // sparc64 specific code ends - + // XScale detection code if ($dev->getModel() === "") { foreach ($details as $detail) { @@ -451,17 +451,10 @@ foreach ($bufe2 as $buf2) { if (preg_match('/\s+encap:Ethernet\s+HWaddr\s(\S*)/i', $buf2, $ar_buf2)) $dev->setInfo(preg_replace('/:/', '-', $ar_buf2[1])); - else if (preg_match('/^\s+inet\saddr:(\S*)\s+P-t-P:(\S*)/i', $buf2, $ar_buf2)) { - if ($ar_buf2[1] != $ar_buf2[2]) { - $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1].";:".$ar_buf2[2]); - } else { - $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]); - } - } else if (preg_match('/^\s+inet\saddr:(\S*)/i', $buf2, $ar_buf2)) - $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]); - else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2)) - $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]); + $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]); + else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2)) + $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]); } } $this->sys->setNetDevices($dev); @@ -529,7 +522,6 @@ */ private function _distro() { - $this->sys->setDistribution("Linux"); $list = @parse_ini_file(APP_ROOT."/data/distros.ini", true); if (!$list) { return; @@ -539,166 +531,77 @@ $distro_tmp = preg_split("/\n/", $distro_info, -1, PREG_SPLIT_NO_EMPTY); foreach ($distro_tmp as $info) { $info_tmp = preg_split('/:/', $info, 2); - if ( isset($distro_tmp[0]) && !is_null($distro_tmp[0]) && (trim($distro_tmp[0]) != "") && - isset($distro_tmp[1]) && !is_null($distro_tmp[1]) && (trim($distro_tmp[1]) != "") ) { - $distro[$info_tmp[0]] = trim($info_tmp[1]); - } + $distro[$info_tmp[0]] = trim($info_tmp[1]); } - if (!isset($distro['Distributor ID']) && !isset($distro['Description'])) { - if ( !is_null($distro_tmp[0]) && (trim($distro_tmp[0]) != "") ) { - $this->sys->setDistribution(trim($distro_tmp[0])); - if ( preg_match('/^(\S+)\s*/', $distro_tmp[0], $id_buf) - && isset($list[trim($id_buf[1])]['Image'])) { - $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']); - } - } - } else { - if (isset($distro['Description'])) { - $this->sys->setDistribution($distro['Description']); - } else if (isset($distro['Distributor ID'])) { - $this->sys->setDistribution($distro['Distributor ID']); - } - if (isset($distro['Distributor ID']) && isset($list[$distro['Distributor ID']]['Image'])) { - $this->sys->setDistributionIcon($list[$distro['Distributor ID']]['Image']); - } + if (isset($distro['Distributor ID']) && isset($list[$distro['Distributor ID']]['Image'])) { + $this->sys->setDistributionIcon($list[$distro['Distributor ID']]['Image']); } - } else { - /* default error handler */ - if (function_exists('errorHandlerPsi')) { - restore_error_handler(); + if (isset($distro['Description'])) { + $this->sys->setDistribution($distro['Description']); } - /* fatal errors only */ - $old_err_rep = error_reporting(); - error_reporting(E_ERROR); - - // Fall back in case 'lsb_release' does not exist + } else { + // Fall back in case 'lsb_release' does not exist ;) foreach ($list as $section=>$distribution) { - if (!isset($distribution['Files'])) { + if (!isset($distribution["Files"])) { continue; } else { - foreach (preg_split("/;/", $distribution['Files'], -1, PREG_SPLIT_NO_EMPTY) as $filename) { + foreach (preg_split("/;/", $distribution["Files"], -1, PREG_SPLIT_NO_EMPTY) as $filename) { if (file_exists($filename)) { - if (!CommonFunctions::rfts($filename, $buf, 1, 4096, false)) { - $buf = ""; - } - if (isset($distribution['Image'])) { - $this->sys->setDistributionIcon($distribution['Image']); - } - if (isset($distribution['Name'])) { - if (($distribution['Name'] == 'Synology') || is_null($buf) || (trim($buf) == "")) { - $this->sys->setDistribution($distribution['Name']); + CommonFunctions::rfts($filename, $buf); + + // lsb-release file + if (preg_match('/^DISTRIB_ID=(.*)/m', $buf, $id_buf)) { + if (preg_match('/^DISTRIB_DESCRIPTION="(.*)"/m', $buf, $desc_buf)) { + $this->sys->setDistribution(trim($desc_buf[1])); } else { - $this->sys->setDistribution($distribution['Name']." ".trim($buf)); + if (isset($list[trim($id_buf[1])]['Name'])) { + $dist = trim($list[trim($id_buf[1])]['Name']); + } else { + $dist = trim($id_buf[1]); + } + if (preg_match('/^DISTRIB_RELEASE=(.*)/m', $buf, $vers_buf)) { + $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1]))); + } else { + $this->sys->setDistribution($dist); + } } + if (isset($list[trim($id_buf[1])]['Image'])) { + $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']); + } + // DISTRO_SPECS file + } else if (preg_match('/^DISTRO_NAME=\'(.*)\'/m', $buf, $id_buf)) { + if (isset($list[trim($id_buf[1])]['Name'])) { + $dist = trim($list[trim($id_buf[1])]['Name']); + } else { + $dist = trim($id_buf[1]); + } + if (preg_match('/^DISTRO_VERSION=(.*)/m', $buf, $vers_buf)) { + $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1]))); + } else { + $this->sys->setDistribution($dist); + } + if (isset($list[trim($id_buf[1])]['Image'])) { + $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']); + } } else { - if ( is_null($buf) || (trim($buf) == "") ) { - $this->sys->setDistribution($section); + if (isset($distribution["Image"])) { + $this->sys->setDistributionIcon($distribution["Image"]); + } + if (isset($distribution["Name"])) { + if ($distribution["Name"] == 'Synology') { + $this->sys->setDistribution($distribution["Name"]); + } else { + $this->sys->setDistribution($distribution["Name"]." ".trim($buf)); + } } else { $this->sys->setDistribution(trim($buf)); } } - break 2; + return; } } } } - // Otherwise, if no files found - if ($this->sys->getDistribution() == "Linux") { - if ( file_exists($filename="/etc/lsb-release") - && CommonFunctions::rfts($filename, $buf, 0, 4096, false) - && preg_match('/^DISTRIB_ID="?([^"\n]*)"?/m', $buf, $id_buf) ) { - if (preg_match('/^DISTRIB_DESCRIPTION="?([^"\n]*)"?/m', $buf, $desc_buf)) { - $this->sys->setDistribution(trim($desc_buf[1])); - } else { - if (isset($list[trim($id_buf[1])]['Name'])) { - $dist = trim($list[trim($id_buf[1])]['Name']); - } else { - $dist = trim($id_buf[1]); - } - if (preg_match('/^DISTRIB_RELEASE="?([^"\n]*)"?/m', $buf, $vers_buf)) { - $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1]))); - } else { - $this->sys->setDistribution($dist); - } - } - if (isset($list[trim($id_buf[1])]['Image'])) { - $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']); - } - } else - if ( file_exists($filename="/etc/DISTRO_SPECS") - && CommonFunctions::rfts($filename, $buf, 0, 4096, false) - && preg_match('/^DISTRO_NAME=\'(.*)\'/m', $buf, $id_buf) ) { - if (isset($list[trim($id_buf[1])]['Name'])) { - $dist = trim($list[trim($id_buf[1])]['Name']); - } else { - $dist = trim($id_buf[1]); - } - if (preg_match('/^DISTRO_VERSION=(.*)/m', $buf, $vers_buf)) { - $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1]))); - } else { - $this->sys->setDistribution($dist); - } - if (isset($list[trim($id_buf[1])]['Image'])) { - $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']); - } else { - if (isset($list['Puppy']['Image'])) { - $this->sys->setDistributionIcon($list['Puppy']['Image']); - } - } - } else - if (file_exists($filename="/etc/redhat-release")) { - if (!CommonFunctions::rfts($filename, $buf, 1, 4096, false)) { - $buf = ""; - } - if ( is_null($buf) || (trim($buf) == "") ) { - if (isset($list['RedHat']['Name'])) { - $this->sys->setDistribution(trim($list['RedHat']['Name'])); - } else { - $this->sys->setDistribution('RedHat'); - } - if (isset($list['RedHat']['Image'])) { - $this->sys->setDistributionIcon($list['RedHat']['Image']); - } - } else { - $this->sys->setDistribution(trim($buf)); - if ( preg_match('/^(\S+)\s*/', $buf, $id_buf) - && isset($list[trim($id_buf[1])]['Image'])) { - $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']); - } else { - if (isset($list['RedHat']['Image'])) { - $this->sys->setDistributionIcon($list['RedHat']['Image']); - } - } - } - } else - if (file_exists($filename="/etc/debian_version")){ - if (!CommonFunctions::rfts($filename, $buf, 1, 4096, false)) { - $buf = ""; - } - if (isset($list['Debian']['Image'])) { - $this->sys->setDistributionIcon($list['Debian']['Image']); - } - if (isset($list['Debian']['Name'])) { - if ( is_null($buf) || (trim($buf) == "")) { - $this->sys->setDistribution($list['Debian']['Name']); - } else { - $this->sys->setDistribution($list['Debian']['Name']." ".trim($buf)); - } - } else { - if ( is_null($buf) || (trim($buf) == "") ) { - $this->sys->setDistribution('Debian'); - } else { - $this->sys->setDistribution(trim($buf)); - } - } - } - } - /* restore error level */ - error_reporting($old_err_rep); - /* restore error handler */ - if (function_exists('errorHandlerPsi')) { - set_error_handler('errorHandlerPsi'); - } } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |