cvs: pear /MP3_IDv2/IDv2 Frame.php /MP3_IDv2/IDv2/Frame CommonLink.php CommonText.php

From: Date: Tue, 11 Dec 2007 07:19:09 +0000
Subject: cvs: pear /MP3_IDv2/IDv2 Frame.php /MP3_IDv2/IDv2/Frame CommonLink.php CommonText.php
Groups: php.pear.cvs 
Request: Send a blank email to pear-cvs+get-49716@lists.php.net to get a copy of this message
alexmerz Tue Dec 11 07:19:09 2007 UTC Modified files: /pear/MP3_IDv2/IDv2 Frame.php /pear/MP3_IDv2/IDv2/Frame CommonText.php CommonLink.php Log: fix CS issues

http://cvs.php.net/viewvc.cgi/pear/MP3_IDv2/IDv2/Frame.php?r1=1.4&r2=1.5&diff_format=u Index: pear/MP3_IDv2/IDv2/Frame.php diff -u pear/MP3_IDv2/IDv2/Frame.php:1.4 pear/MP3_IDv2/IDv2/Frame.php:1.5 --- pear/MP3_IDv2/IDv2/Frame.php:1.4 Thu Oct 18 20:58:55 2007 +++ pear/MP3_IDv2/IDv2/Frame.php Tue Dec 11 07:19:09 2007 @@ -2,9 +2,11 @@ /** * This file contains the implementation for the Idv2 frame data structure class * - * Copyright (C) 2006 Alexander Merz + * PHP version 5 + * + * Copyright (C) 2006-2007 Alexander Merz * - * This library is free software; you can redistribute it and/or + * LICENSE: This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License. @@ -18,14 +20,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * @category File Formats - * @package MP3_IDv2 - * @author Alexander Merz <alexander.merz@web.de> - * @copyright 2006 Alexander Merz - * @license http://www.gnu.org/licenses/lgpl.html - * @version CVS: $Id: Frame.php,v 1.4 2007/10/18 20:58:55 alexmerz Exp $ - * @link http://pear.php.net/package/MP3_IDv2 - * @since File available since Release 0.1 + * @category File_Formats + * @package MP3_IDv2 + * @author Alexander Merz <alexander.merz@web.de> + * @copyright 2006-2007 Alexander Merz + * @license http://www.gnu.org/licenses/lgpl.html LGPL 2.1 + * @version CVS: $Id: Frame.php,v 1.5 2007/12/11 07:19:09 alexmerz Exp $ + * @link http://pear.php.net/package/MP3_IDv2 + * @since File available since Release 0.1 */ @@ -39,119 +41,125 @@ * * This implementation supports currently 2.3 * - * @category File Formats - * @package MP3_IDv2 - * @author Alexander Merz <alexander.merz@web.de> - * @copyright 2006 Alexander Merz - * @version Release: @package_version@ - * @link http://pear.php.net/package/MP3_IDv2 - * @since Class available since Release 0.1.0 + * @category File_Formats + * @package MP3_IDv2 + * @author Alexander Merz <alexander.merz@web.de> + * @copyright 2006-2007 Alexander Merz + * @license http://www.gnu.org/licenses/lgpl.html LGPL 2.1 + * @version Release: @package_version@ + * @link http://pear.php.net/package/MP3_IDv2 + * @since Class available since Release 0.1.0 */ -class MP3_IDv2_Frame { +class MP3_IDv2_Frame +{ /** - * the identifier of the frame (name of the frame) + * The identifier of the frame (name of the frame) + * * @var string */ protected $_id = null; /** - * indicates that the content of the frame was changed + * Indicates that the content of the frame was changed * * @var bool true if content was changed and must created again */ protected $_changed = false; /** - * the purpose of this frame + * The purpose of this frame + * * @var string */ protected $_purpose = null; /** - * the raw content of the tag + * The raw content of the tag + * * @var string */ protected $_content = null; /** - * flag to indicate to drop this frame or not while changing the tag if unknown + * Flag to indicate to drop this frame or not while changing the tag if unknown * * @var bool */ - protected $_flagTagAlterPres=false; + protected $_flagTagAlterPres = false; /** - * flag to indicate to drop this frame or not while changing the file if unknown + * Flag to indicate to drop this frame or not while changing the file if unknown * * @var bool */ - protected $_flagFileAlterPres=false; + protected $_flagFileAlterPres = false; /** - * flag to indicate to that tis frame should nor be changed + * Flag to indicate to that tis frame should nor be changed * * @var bool */ - protected $_flagReadOnly=false; + protected $_flagReadOnly = false; /** - * flag to indicate that the frame content is compressed + * Flag to indicate that the frame content is compressed * * @var bool */ - protected $_flagCompression=false; + protected $_flagCompression = false; /** - * flag to indicate that the frame has a group identifier + * Flag to indicate that the frame has a group identifier * * @var bool */ - protected $_flagGroup=false; + protected $_flagGroup = false; /** - * flag to indicate that the frame encrypted + * Flag to indicate that the frame encrypted * * @var bool */ - protected $_flagEncryption=false; + protected $_flagEncryption = false; /** - * size of the frame data after uncompression + * Size of the frame data after uncompression * * @var int */ - protected $_decompressedSize=null; + protected $_decompressedSize = null; /** * Identifier of the method used for encryption * * @var string */ - protected $_encryptionMethod=null; + protected $_encryptionMethod = null; /** * The identifier for the group * * @var string */ - protected $_groupid=null; + protected $_groupid = null; /** - * Singleton method the create a specific frame object. - * If a specific frame class does not exists, a Frame - * object is returned. - * - * @param String $frameId the frame type - * @return Object the specific frame object - * @access public - */ - public static function getInstance($frameId) { + * Singleton method the create a specific frame object. + * If a specific frame class does not exists, a Frame + * object is returned. + * + * @param String $frameId the frame type + * + * @return Object the specific frame object + */ + public static function getInstance($frameId) + { $frameId = trim($frameId); - if($frameId != '') { - @require_once 'MP3/IDv2/Frame/'.$frameId.'.php'; + if ($frameId != '') { + @include_once 'MP3/IDv2/Frame/'.$frameId.'.php'; $class = 'MP3_IDv2_Frame_'.$frameId; - if(class_exists($class)) { + if (class_exists($class)) { $frame = new $class(); } else { $frame = new MP3_IDv2_Frame(); @@ -166,9 +174,9 @@ * Returns the purpose of the frame * * @return string the frame purpose - * @access public */ - public function getPurpose() { + public function getPurpose() + { return $this->_purpose; } @@ -176,9 +184,11 @@ * Sets the purpose text of the frame * * @param string $purpose the frame purpose - * @access public + * + * @return void */ - protected function setPurpose($purpose) { + protected function setPurpose($purpose) + { $this->_purpose = $purpose; } @@ -187,9 +197,11 @@ * Enables/disables the use of encryption for the frame data * * @param bool $b true for enabling, false to disable - * @access public + * + * @return void */ - public function useEncryption($b = true) { + public function useEncryption($b = true) + { $this->_flagEncryption = $b; } @@ -197,9 +209,9 @@ * Checks if the frame data is encrypted or should be * * @return bool true if encryption is/should be used - * @access public */ - public function isEncrypted() { + public function isEncrypted() + { return $this->_flagEncryption; } @@ -208,9 +220,11 @@ * Enables/disables the use of a group identifier * * @param bool $b true to use a group identifier - * @access public + * + * @return void */ - public function useGroupingIdentifier($b = true) { + public function useGroupingIdentifier($b = true) + { $this->_flagGroup = $b; } @@ -218,9 +232,9 @@ * Checks if the frame belongs to a group or should be * * @return bool true if should belongs to a group - * @access public */ - public function hasGroupingIdentifier() { + public function hasGroupingIdentifier() + { return $this->_flagGroup; } @@ -228,9 +242,11 @@ * Enables/disables the compression of the frame data * * @param bool $b true if compression should be used - * @access public + * + * @return void */ - public function useCompression($b = true) { + public function useCompression($b = true) + { $this->_flagCompression = $b; } @@ -239,20 +255,22 @@ * Checks if the frame data is compressed or should be * * @return bool true if compression is/should be used - * @access public */ - public function isCompressed() { + public function isCompressed() + { return $this->_flagCompression; } - /** - * Sets the grouping identifier for the frame. - * - * @param string $gid one character as group identifier - * @see MP3_IDv2_Frame::useGroupingIdentifier() - * @access public - */ - public function setGroupIdentifier($gid) { + /** + * Sets the grouping identifier for the frame. + * + * @param string $gid one character as group identifier + * + * @return void + * @see MP3_IDv2_Frame::useGroupingIdentifier() + */ + public function setGroupIdentifier($gid) + { $this->_groupid = $gid; $this->useGroupingIdentifier(); } @@ -262,9 +280,9 @@ * * @return bool the group identifier or null * @see MP3_IDv2_Frame::useGroupingIdentifier() - * @access public */ - public function getGroupIdentifier() { + public function getGroupIdentifier() + { return $this->_groupid; } @@ -272,10 +290,12 @@ * Sets the encryption method * * @param string $m one character for the method identifier + * + * @return void * @see MP3_IDv2_Frame::useEncryption() - * @access public */ - public function setEncryptionMethod($m) { + public function setEncryptionMethod($m) + { $this->_encryptionMethod = $m; } @@ -284,9 +304,9 @@ * * @return string the method identifier or null * @see MP3_IDv2_Frame::useGroupingIdentifier() - * @access public */ - public function getEncryptionMethod() { + public function getEncryptionMethod() + { return $this->_encryptionMethod; } @@ -295,19 +315,21 @@ * Sets the identifier of the frame. * * @param string $id a four byte string for the name of the frame - * @access public + * + * @return void */ - protected function setId($id) { + protected function setId($id) + { $this->_id = $id; } /** * Returns the identifier of the frame. * - * @return string - * @access public + * @return string the frame identifier, a four byte text */ - public function getId() { + public function getId() + { return $this->_id; } @@ -315,9 +337,11 @@ * Sets the unproccess content of the frame (excluding header!) * * @param string $content the raw frame data without the header - * @access public + * + * @return void */ - public function setRawContent($content) { + public function setRawContent($content) + { $this->_changed = true; $this->_content = $content; } @@ -325,10 +349,12 @@ /** * Sets the header flag "Tag alter preservation" * - * @param bool $f true to set the tag - * @access public + * @param bool $f true to set the tag + * + * @return void */ - public function setFlagTagAlterPres($f = true) { + public function setFlagTagAlterPres($f = true) + { $this->flagTagAlterPres = $f; } @@ -336,9 +362,11 @@ * Sets the header flag "File alter preservation" * * @param bool $f true to set the tag - * @access public + * + * @return void */ - public function setFlagFileAlterPres($f = true) { + public function setFlagFileAlterPres($f = true) + { $this->flagFileAlterPres = $f; } @@ -346,9 +374,11 @@ * Sets the header flag "Read only". * * @param bool $f true to set the tag - * @access public + * + * @return void */ - public function setFlagReadOnly($f) { + public function setFlagReadOnly($f) + { $this->_flagReadOnly = $f; } @@ -357,29 +387,29 @@ * Checks if the header flag "Tag alter preservation" is set. * * @return bool true if flag is set - * @access public */ - public function isFlagTagAlterPres() { + public function isFlagTagAlterPres() + { return $this->_flagTagAlterPres; } /** - * Checks if the header flag "File alter preservation" is set. - * - * @return bool true if flag is set - * @access public - */ - public function isFlagFileAlterPres() { + * Checks if the header flag "File alter preservation" is set. + * + * @return bool true if flag is set + */ + public function isFlagFileAlterPres() + { return $this->_flagFileAlterPres; } /** - * Checks if the frame is marked as read only - * - * @return bool true if flag is set - * @access public - */ - public function isFlagReadOnly() { + * Checks if the frame is marked as read only + * + * @return bool true if flag is set + */ + public function isFlagReadOnly() + { return $this->_flagReadOnly; } @@ -388,11 +418,12 @@ * according to the frame settings. * * @return string the created header - * @access public */ - public function createHeader() { + public function createHeader() + { $header = ''; $extheader = ''; + $header = $header.$this->getId(); // TODO use numbers! @@ -413,29 +444,29 @@ //$sb = str_pad(decbin($this->decompressedSize), 32, '0', STR_PAD_LEFT); $sb = '0'; $sa = array(); - for($i=3; $i>=0; $i--) { - $sa[$i] = str_pad(substr($sb, $i*8,8), 8, '0', STR_PAD_LEFT); + for ($i=3; $i>=0; $i--) { + $sa[$i] = str_pad(substr($sb, $i*8, 8), 8, '0', STR_PAD_LEFT); } - $extheader = $extheader.pack("cccc", $sb[0],$sb[1],$sb[2],$sb[3]); + $extheader = $extheader.pack("cccc", $sb[0], $sb[1], $sb[2], $sb[3]); } if ($this->isEncrypted()) { - $flag2 = $flag2 | bindec('01000000'); - $extheader = $extheader.pack('c', $this->getEncryptionMethod); + $flag2 = $flag2 | bindec('01000000'); + $extheader = $extheader.pack('c', $this->getEncryptionMethod); } if ($this->hasGroupingIdentifier()) { - $flag2 = $flag2 | bindec('00100000'); - $extheader = $extheader.$this->getGroupIdentifier(); + $flag2 = $flag2 | bindec('00100000'); + $extheader = $extheader.$this->getGroupIdentifier(); } $size = strlen($this->getRawContent()); $size = $size+strlen($extheader); - + $sb = str_pad(decbin($size), 32, '0', STR_PAD_LEFT); $sa = array(); - for($i=3; $i>=0;$i--) { - $sa[$i] = bindec(str_pad(substr($sb, $i*8,8), 8, '0', STR_PAD_LEFT)); + for ($i=3; $i>=0;$i--) { + $sa[$i] = bindec(str_pad(substr($sb, $i*8, 8), 8, '0', STR_PAD_LEFT)); } - $header = $header.pack("cccc", $sa[0],$sa[1],$sa[2],$sa[3]); + $header = $header.pack("cccc", $sa[0], $sa[1], $sa[2], $sa[3]); $header = $header.pack('cc', $flag1, $flag2); $header = $header.$extheader; @@ -446,12 +477,12 @@ * Returns the unprocessed content of the frame (excluding header) * * @return string the content 'as is'description - * @access public */ - public function getRawContent() { + public function getRawContent() + { if ($this->_changed) { $this->_content = $this->createContent(); - $this->changed = false; + $this->changed = false; } return $this->_content; } @@ -461,10 +492,10 @@ * * This method must be overwritten by the FrameID-specific implementations. * - * @return string the created content - * @access public + * @return string the created content */ - public function createContent() { + public function createContent() + { return $this->_content; } @@ -472,9 +503,9 @@ * Creates the whole frame (header + headerdata + content). * * @return string - * @access public */ - public function createFrame() { + public function createFrame() + { $header = $this->createHeader(); // TODO check for compression and encryption return $header.$this->getRawContent(); @@ -484,9 +515,9 @@ * Returns the frame content as something printable * * @return string the frame content - * @access public */ - public function toString() { + public function toString() + { return $this->getID(); } } http://cvs.php.net/viewvc.cgi/pear/MP3_IDv2/IDv2/Frame/CommonText.php?r1=1.2&r2=1.3&diff_format=u Index: pear/MP3_IDv2/IDv2/Frame/CommonText.php diff -u pear/MP3_IDv2/IDv2/Frame/CommonText.php:1.2 pear/MP3_IDv2/IDv2/Frame/CommonText.php:1.3 --- pear/MP3_IDv2/IDv2/Frame/CommonText.php:1.2 Wed Oct 11 07:25:38 2006 +++ pear/MP3_IDv2/IDv2/Frame/CommonText.php Tue Dec 11 07:19:09 2007 @@ -2,30 +2,33 @@ /** * This file contains the generic implementation for text frames * - * Copyright (C) 2006 Alexander Merz + * PHP version 5 + * + * Copyright (C) 2006-2007 Alexander Merz * - * This library is free software; you can redistribute it and/or + * LICENSE: This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * @category File Formats - * @package MP3_IDv2 - * @author Alexander Merz <alexander.merz@web.de> - * @copyright 2006 Alexander Merz - * @license http://www.gnu.org/licenses/lgpl.html - * @version CVS: $Id: CommonText.php,v 1.2 2006/10/11 07:25:38 alexmerz Exp $ - * @link http://pear.php.net/package/MP3_IDv2 - * @since File available since Release 0.1 + * @category File_Formats + * @package MP3_IDv2 + * @author Alexander Merz <alexander.merz@web.de> + * @copyright 2006-2007 Alexander Merz + * @license LGPL http://www.gnu.org/licenses/lgpl.html + * @version CVS: $Id: CommonText.php,v 1.3 2007/12/11 07:19:09 alexmerz Exp $ + * @link http://pear.php.net/package/MP3_IDv2 + * @since File available since Release 0.1 + * */ /** @@ -35,86 +38,117 @@ /** * Data stucture for text frames in a tag. - * These frames starts with a T in the frame id. - * - * - * @category File Formats - * @package MP3_IDv2 - * @author Alexander Merz <alexander.merz@web.de> - * @version Release: @package_version@ - * @link http://pear.php.net/package/MP3_IDv2 - * @since Class available since Release 0.1.0 + * These frames starts with a T in the frame identifier + * except 'txxx' + * + * A text frame consists of a starting single byte for the encoding + * of the text and is followed by a string of arbitrary length. A string + * may separated into multiple parts using a null value. + * + * @category File_Formats + * @package MP3_IDv2 + * @author Alexander Merz <alexander.merz@web.de> + * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 + * @version Release: @package_version@ + * @link http://pear.php.net/package/MP3_IDv2 + * @since Class available since Release 0.1.0 */ -class MP3_IDv2_Frame_CommonText extends MP3_IDv2_Frame { - +abstract class MP3_IDv2_Frame_CommonText extends MP3_IDv2_Frame +{ + /** * Contains the encoding of the text. + * * @var string one byte representing the encoding */ private $_encoding = "\0"; /** * Contains the text in the frame - * @var string one byte representing the encoding + * + * @var string a string of an arbitrary length */ private $_text = null; - /** + /** * Sets the text for the frame. + * * @param string $text the text to set + * + * @return void * @access public */ - public function setText($text) { + public function setText($text) + { $this->_changed = true; - $this->_text = $text; + $this->_text = $text; } /** * Returns the text in the frame. + * * @return string the text + * * @access public */ - public function getText() { + public function getText() + { return $this->_text; } /** * Sets the encoding for the text for the frame. + * * @param string $enc the byte containing the encoding identifier + * + * @return void * @access public */ - public function setEncoding($enc) { - $this->_changed = true; + public function setEncoding($enc) + { + $this->_changed = true; $this->_encoding = $enc; - } + } /** - * Returns the encoding identifier for the text in the frame. + * Returns the encoding identifier for the text in the frame. + * * @return string the identifier + * * @access public */ - public function getEncoding() { + public function getEncoding() + { return $this->_encoding; } /** * Creates the content of the frame (encoding+text) + * * @return string the frame content + * * @access public */ - public function createContent() { + public function createContent() + { return pack("c", $this->getEncoding()).$this->getText(); } /** * Sets the data of the frame and processes it. - * @param string content the unproccess content for the frame + * + * @param string $content the unproccess content for the frame + * + * @return void * @access public */ - public function setRawContent($content) { + public function setRawContent($content) + { $this->_changed = true; $this->_content = $content; + $c = unpack('C1enc', $content[0]); + $this->setEncoding($c['enc']); $this->setText(substr($content, 1)); } @@ -123,11 +157,12 @@ * Returns the frame content as something printable * * @return string the frame content + * * @access public */ - public function toString() { - return $this->getID()." (".$this->getPurpose().") ". - $this->getText(); + public function toString() + { + return $this->getID()." (".$this->getPurpose().") ".$this->getText(); } } ?> \ No newline at end of file http://cvs.php.net/viewvc.cgi/pear/MP3_IDv2/IDv2/Frame/CommonLink.php?r1=1.2&r2=1.3&diff_format=u Index: pear/MP3_IDv2/IDv2/Frame/CommonLink.php diff -u pear/MP3_IDv2/IDv2/Frame/CommonLink.php:1.2 pear/MP3_IDv2/IDv2/Frame/CommonLink.php:1.3 --- pear/MP3_IDv2/IDv2/Frame/CommonLink.php:1.2 Wed Oct 11 07:25:38 2006 +++ pear/MP3_IDv2/IDv2/Frame/CommonLink.php Tue Dec 11 07:19:09 2007 @@ -2,9 +2,11 @@ /** * This file contains the generic implementation for link frames * - * Copyright (C) 2006 Alexander Merz + * PHP version 5 + * + * Copyright (C) 2006, 2007 Alexander Merz * - * This library is free software; you can redistribute it and/or + * LICENSE This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License. @@ -18,14 +20,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * @category File Formats - * @package MP3_IDv2 - * @author Alexander Merz <alexander.merz@web.de> - * @copyright 2006 Alexander Merz - * @license http://www.gnu.org/licenses/lgpl.html - * @version CVS: $Id: CommonLink.php,v 1.2 2006/10/11 07:25:38 alexmerz Exp $ - * @link http://pear.php.net/package/MP3_IDv2 - * @since File available since Release 0.1 + * @category File_Formats + * @package MP3_IDv2 + * @author Alexander Merz <alexander.merz@web.de> + * @copyright 2006-2007 Alexander Merz + * @license http://www.gnu.org/licenses/lgpl.html LGPL License 2.1 + * @version CVS: $Id: CommonLink.php,v 1.3 2007/12/11 07:19:09 alexmerz Exp $ + * @link http://pear.php.net/package/MP3_IDv2 + * @since File available since Release 0.1 */ /** @@ -35,40 +37,52 @@ /** * Data stucture for link frames in a tag. - * These frames starts with a W in the frame id. + * These frames starts with a W in the frame identifier + * except 'wxxx'. * * - * @category File Formats - * @package MP3_IDv2 - * @author Alexander Merz <alexander.merz@web.de> - * @version Release: @package_version@ - * @link http://pear.php.net/package/MP3_IDv2 - * @since Class available since Release 0.1.0 + * @category File_Formats + * @package MP3_IDv2 + * @author Alexander Merz <alexander.merz@web.de> + * @license http://www.gnu.org/licenses/lgpl.html LGPL License 2.1 + * @version Release: @package_version@ + * @link http://pear.php.net/package/MP3_IDv2 + * @since Class available since Release 0.1.0 */ -class MP3_IDv2_Frame_CommonLink extends MP3_IDv2_Frame { +abstract class MP3_IDv2_Frame_CommonLink extends MP3_IDv2_Frame +{ /** - * the url + * The url stored in the frame + * + * @var string $_url */ - private $_url=null; + private $_url = null; /** * Creates the content of the frame + * * @return string the frame content + * * @access public */ - public function createContent() { + public function createContent() + { return $this->getUrl(); } /** * Sets the data of the frame and processes it. - * @param string content the unproccess content for the frame - * @access public + * + * @param string $content the unproccess content for the frame + * + * @return void */ - public function setRawContent($content) { + public function setRawContent($content) + { $this->_changed = true; - $this->_content = $content; + $this->_content = $content; + $this->setUrl($content); } @@ -76,18 +90,22 @@ * Sets the URL in the frame. * * @param string $url the url + * + * @return void */ - public function setUrl($url) { + public function setUrl($url) + { $this->_changed = true; - $this->_url = $url; + $this->_url = $url; } /** * Gets the URL in the frame. * - * @param string the url + * @return string the URL */ - public function getUrl() { + public function getUrl() + { return $this->_url; } @@ -95,11 +113,10 @@ * Returns the frame content as something printable * * @return string the frame content - * @access public */ - public function toString() { - return $this->getID()." (".$this->getPurpose().") ". - $this->getUrl(); + public function toString() + { + return $this->getID()." (".$this->getPurpose().") ".$this->getUrl(); } } ?> \ No newline at end of file
« previous php.pear.cvs (#49716) next »