Changeset 2566:9bf417837888 for inc/core/class.dc.media.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• inc/core/class.dc.media.php (modified) (73 diffs)

inc/core/class.dc.media.php

@@ -26 +26 @@
      protected $postmedia;
      protected $file_sort = 'name-asc';
-     
+
      protected $file_handler = array(); ///< <b>array</b> Array of callbacks
-     
+
      public $thumb_tp = '%s/.%s_%s.jpg';     ///< <b>string</b> Thumbnail file pattern
      public $thumb_tp_alpha = '%s/.%s_%s.png'; ///< <b>string</b> Thumbnail file pattern (with alpha layer)
-     
+
      /**
      <b>array</b> Tubmnail sizes:
@@ -39 +39 @@
      - sq: square image
      */
-     public $thumb_sizes = array(  
+     public $thumb_sizes = array(
           'm' => array(448,'ratio','medium'),
           's' => array(240,'ratio','small'),
@@ -45 +45 @@
           'sq' => array(48,'crop','square')
      );
-     
+
      public $icon_img = 'images/media/%s.png';    ///< <b>string</b> Icon file pattern
-     
+
      /**
      Object constructor.
-     
+
      @param    core      <b>dcCore</b>       dcCore instance
      @param    type      <b>string</b>       Media type filter
@@ -59 +59 @@
           $this->con =& $core->con;
           $this->postmedia = new dcPostMedia($core);
-          
+
           if ($this->core->blog == null) {
                throw new Exception(__('No blog defined.'));
           }
-          
+
           $this->table = $this->core->prefix.'media';
           $root = $this->core->blog->public_path;
-          
+
           if (preg_match('#^http(s)?://#',$this->core->blog->settings->system->public_url)) {
                $root_url = rawurldecode($this->core->blog->settings->system->public_url);
@@ -72 +72 @@
                $root_url = rawurldecode($this->core->blog->host.path::clean($this->core->blog->settings->system->public_url));
           }
-          
+
           if (!is_dir($root)) {
                # Check public directory
@@ -81 +81 @@
                }
           }
-          
+
           $this->type = $type;
-          
+
           parent::__construct($root,$root_url);
           $this->chdir('');
-          
+
           $this->path = $this->core->blog->settings->system->public_path;
-          
+
           $this->addExclusion(DC_RC_PATH);
           $this->addExclusion(dirname(__FILE__).'/../');
-          
+
           $this->exclude_pattern = $core->blog->settings->system->media_exclusion;
-          
+
           # Event handlers
           $this->addFileHandler('image/jpeg','create',array($this,'imageThumbCreate'));
           $this->addFileHandler('image/png','create',array($this,'imageThumbCreate'));
           $this->addFileHandler('image/gif','create',array($this,'imageThumbCreate'));
-          
+
           $this->addFileHandler('image/png','update',array($this,'imageThumbUpdate'));
           $this->addFileHandler('image/jpeg','update',array($this,'imageThumbUpdate'));
           $this->addFileHandler('image/gif','update',array($this,'imageThumbUpdate'));
-          
+
           $this->addFileHandler('image/png','remove',array($this,'imageThumbRemove'));
           $this->addFileHandler('image/jpeg','remove',array($this,'imageThumbRemove'));
           $this->addFileHandler('image/gif','remove',array($this,'imageThumbRemove'));
-          
+
           $this->addFileHandler('image/jpeg','create',array($this,'imageMetaCreate'));
-          
+
           $this->addFileHandler('image/jpeg','recreate',array($this,'imageThumbCreate'));
           $this->addFileHandler('image/png','recreate',array($this,'imageThumbCreate'));
           $this->addFileHandler('image/gif','recreate',array($this,'imageThumbCreate'));
-          
+
           $this->addFileHandler('image/jpeg','recreate',array($this,'imageThumbCreate'));
           $this->addFileHandler('image/png','recreate',array($this,'imageThumbCreate'));
           $this->addFileHandler('image/gif','recreate',array($this,'imageThumbCreate'));
-          
+
           # Thumbnails sizes
           $this->thumb_sizes['m'][0] = abs($core->blog->settings->system->media_img_m_size);
           $this->thumb_sizes['s'][0] = abs($core->blog->settings->system->media_img_s_size);
           $this->thumb_sizes['t'][0] = abs($core->blog->settings->system->media_img_t_size);
-          
+
           # Thumbnails sizes names
           $this->thumb_sizes['m'][2] = __($this->thumb_sizes['m'][2]);
@@ -127 +127 @@
           $this->thumb_sizes['t'][2] = __($this->thumb_sizes['t'][2]);
           $this->thumb_sizes['sq'][2] = __($this->thumb_sizes['sq'][2]);
-          
+
           # --BEHAVIOR-- coreMediaConstruct
-          $this->core->callBehavior('coreMediaConstruct',$this); 
-     }
-     
+          $this->core->callBehavior('coreMediaConstruct',$this);
+     }
+
      /**
      Changes working directory.
-     
+
      @param    dir       <b>string</b>       Directory name.
      */
@@ -142 +142 @@
           $this->relpwd = preg_replace('/^'.preg_quote($this->root,'/').'\/?/','',$this->pwd);
      }
-     
+
      /**
      Adds a new file handler for a given media type and event.
-     
+
      Available events are:
      - create: file creation
      - update: file update
      - remove: file deletion
-     
+
      @param    type      <b>string</b>       Media type
      @param    event     <b>string</b>       Event
@@ -161 +161 @@
           }
      }
-     
+
      protected function callFileHandler($type,$event)
      {
@@ -169 +169 @@
                array_shift($args);
                array_shift($args);
-               
+
                foreach ($this->file_handler[$type][$event] as $f)
                {
@@ -176 +176 @@
           }
      }
-     
+
      /**
      Returns HTML breadCrumb for media manager navigation.
-     
+
      @param    href      <b>string</b>       URL pattern
      @param    last      <b>string</b>       Last item pattern
@@ -201 +201 @@
           }
           return $res;
-          
-     }
-     
+
+     }
+
      protected function fileRecord($rs)
      {
           if ($rs->isEmpty()) { return null; }
-          
+
           if (!$this->isFileExclude($this->root.'/'.$rs->media_file) && is_file($this->root.'/'.$rs->media_file))
           {
                $f = new fileItem($this->root.'/'.$rs->media_file,$this->root,$this->root_url);
-               
+
                if ($this->type && $f->type_prefix != $this->type) {
                     return null;
                }
-               
+
                $meta = @simplexml_load_string($rs->media_meta);
-               
+
                $f->editable = true;
                $f->media_id = $rs->media_id;
@@ -226 +226 @@
                $f->media_dt = strtotime($rs->media_dt);
                $f->media_dtstr = dt::str('%Y-%m-%d %H:%M',$f->media_dt);
-               
+
                $f->media_image = false;
-               
+
                if (!$this->core->auth->check('media_admin',$this->core->blog->id)
                && $this->core->auth->userID() != $f->media_user) {
@@ -234 +234 @@
                     $f->editable = false;
                }
-               
+
                $type_prefix = explode('/',$f->type);
                $type_prefix = $type_prefix[0];
-               
+
                switch ($type_prefix) {
                     case 'image':
@@ -297 +297 @@
                          break;
                }
-               
+
                $f->media_type = $f->media_icon;
                $f->media_icon = sprintf($this->icon_img,$f->media_icon);
-               
+
                # Thumbnails
                $f->media_thumb = array();
@@ -309 +309 @@
                $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root.'/'.$p['dirname'],$p['base'],'%s');
                $thumb_url = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root_url.$p['dirname'],$p['base'],'%s');
-               
+
                # Cleaner URLs
                $thumb_url = preg_replace('#\./#','/',$thumb_url);
@@ -321 +321 @@
                     $thumb_url_alt = preg_replace('#(?<!:)/+#','/',$thumb_url_alt);
                }
-               
+
                foreach ($this->thumb_sizes as $suffix => $s) {
                     if (file_exists(sprintf($thumb,$suffix))) {
@@ -329 +329 @@
                     }
                }
-               
+
                if (isset($f->media_thumb['sq']) && $f->media_type == 'image') {
                     $f->media_icon = $f->media_thumb['sq'];
                }
-               
+
                return $f;
           }
-          
+
           return null;
      }
-     
-     
+
+
      public function setFileSort($type='name')
      {
@@ -347 +347 @@
           }
      }
-     
+
      protected function sortFileHandler($a,$b)
      {
@@ -368 +368 @@
                     return strcasecmp($a->basename,$b->basename);
           }
-          
+
      }
 
@@ -381 +381 @@
 
      /**
-     Gets current working directory content. 
-     
+     Gets current working directory content.
+
      @param    type      <b>string</b>       Media type filter
      */
@@ -390 +390 @@
                $this->type = $type;
           }
-          
+
           $media_dir = $this->relpwd ? $this->relpwd : '.';
-          
+
           $strReq =
           'SELECT media_file, media_id, media_path, media_title, media_meta, media_dt, '.
@@ -399 +399 @@
           "WHERE media_path = '".$this->path."' ".
           "AND media_dir = '".$this->con->escape($media_dir)."' ";
-          
+
           if (!$this->core->auth->check('media_admin',$this->core->blog->id))
           {
                $strReq .= 'AND (media_private <> 1 ';
-               
+
                if ($this->core->auth->userID()) {
                     $strReq .= "OR user_id = '".$this->con->escape($this->core->auth->userID())."'";
@@ -409 +409 @@
                $strReq .= ') ';
           }
-          
+
           $rs = $this->con->select($strReq);
-          
+
           parent::getDir();
-          
+
           $f_res = array();
           $p_dir = $this->dir;
-          
+
           # If type is set, remove items from p_dir
           if ($this->type)
@@ -426 +426 @@
                }
           }
-          
+
           $f_reg = array();
-          
+
           while ($rs->fetch())
           {
@@ -435 +435 @@
                     continue;
                }
-               
+
                if ($this->inFiles($rs->media_file))
                {
@@ -442 +442 @@
                          if (isset($f_reg[$rs->media_file]))
                          {
-                              # That media is duplicated in the database, 
+                              # That media is duplicated in the database,
                               # time to do a bit of house cleaning.
                               $this->con->execute(
@@ -468 +468 @@
                }
           }
-          
+
           $this->dir['files'] = $f_res;
           foreach ($this->dir['dirs'] as $k => $v) {
                $v->media_icon = sprintf($this->icon_img,($v->parent ? 'folder-up' : 'folder'));
           }
-          
+
           # Check files that don't exist in database and create them
           if ($this->core->auth->check('media,media_admin',$this->core->blog->id))
@@ -488 +488 @@
           usort($this->dir['files'],array($this,'sortFileHandler'));
      }
-     
+
      /**
      Gets file by its id. Returns a filteItem object.
-     
+
      @param    id        <b>integer</b>      File ID
      @return   <b>fileItem</b>
@@ -504 +504 @@
           "WHERE media_path = '".$this->path."' ".
           'AND media_id = '.(integer) $id.' ';
-          
+
           if (!$this->core->auth->check('media_admin',$this->core->blog->id))
           {
                $strReq .= 'AND (media_private <> 1 ';
-               
+
                if ($this->core->auth->userID()) {
                     $strReq .= "OR user_id = '".$this->con->escape($this->core->auth->userID())."'";
@@ -514 +514 @@
                $strReq .= ') ';
           }
-          
+
           $rs = $this->con->select($strReq);
           return $this->fileRecord($rs);
      }
-     
+
      /**
      Returns media items attached to a blog post. Result is an array containing
      fileItems objects.
-     
+
      @param    post_id   <b>integer</b>      Post ID
      @param    media_id  <b>integer</b>      Optionnal media ID
@@ -537 +537 @@
           }
           $rs = $this->postmedia->getPostMedia($params);
-          
+
           $res = array();
-          
+
           while ($rs->fetch()) {
                $f = $this->fileRecord($rs);
@@ -546 +546 @@
                }
           }
-          
+
           return $res;
      }
-     
+
      /**
      @deprecated since version 2.4
@@ -558 +558 @@
           $this->postmedia->addPostMedia($post_id,$media_id);
      }
-     
+
      /**
      @deprecated since version 2.4
@@ -567 +567 @@
           $this->postmedia->removePostMedia($post_id,$media_id,"attachment");
      }
-     
+
      /**
      Rebuilds database items collection. Optional <var>$pwd</var> parameter is
      the path where to start rebuild.
-     
+
      @param    pwd       <b>string</b>       Directory to rebuild
      */
@@ -579 +579 @@
                throw new Exception(__('You are not a super administrator.'));
           }
-          
+
           $this->chdir($pwd);
           parent::getDir();
-          
+
           $dir = $this->dir;
-          
+
           foreach ($dir['dirs'] as $d) {
                if (!$d->parent) {
@@ -590 +590 @@
                }
           }
-          
+
           foreach ($dir['files'] as $f) {
                $this->chdir(dirname($f->relname));
                $this->createFile($f->basename);
           }
-          
+
           $this->rebuildDB($pwd);
      }
-     
+
      protected function rebuildDB($pwd)
      {
           $media_dir = $pwd ? $pwd : '.';
-          
+
           $strReq =
           'SELECT media_file, media_id '.
@@ -608 +608 @@
           "WHERE media_path = '".$this->path."' ".
           "AND media_dir = '".$this->con->escape($media_dir)."' ";
-          
+
           $rs = $this->con->select($strReq);
-          
+
           $delReq = 'DELETE FROM '.$this->table.' '.
                     'WHERE media_id IN (%s) ';
           $del_ids = array();
-          
+
           while ($rs->fetch())
           {
@@ -621 +621 @@
                }
           }
-          
+
           if (!empty($del_ids)) {
                $this->con->execute(sprintf($delReq,implode(',',$del_ids)));
           }
      }
-     
+
      public function makeDir($d)
      {
@@ -632 +632 @@
           parent::makeDir($d);
      }
-     
+
      /**
      Creates or updates a file in database. Returns new media ID or false if
      file does not exist.
-     
+
      @param    name      <b>string</b>       File name (relative to working directory)
      @param    title     <b>string</b>       File title
@@ -648 +648 @@
                throw new Exception(__('Permission denied.'));
           }
-          
+
           $file = $this->pwd.'/'.$name;
           if (!file_exists($file)) {
                return false;
           }
-          
+
           $media_file = $this->relpwd ? path::clean($this->relpwd.'/'.$name) : path::clean($name);
           $media_type = files::getMimeType($name);
-          
+
           $cur = $this->con->openCursor($this->table);
-          
+
           $strReq = 'SELECT media_id '.
                     'FROM '.$this->table.' '.
                     "WHERE media_path = '".$this->con->escape($this->path)."' ".
                     "AND media_file = '".$this->con->escape($media_file)."' ";
-          
+
           $rs = $this->con->select($strReq);
-          
+
           if ($rs->isEmpty())
           {
@@ -673 +673 @@
                     $rs = $this->con->select('SELECT MAX(media_id) FROM '.$this->table);
                     $media_id = (integer) $rs->f(0) + 1;
-                    
+
                     $cur->media_id = $media_id;
                     $cur->user_id = (string) $this->core->auth->userID();
@@ -681 +681 @@
                     $cur->media_creadt = date('Y-m-d H:i:s');
                     $cur->media_upddt = date('Y-m-d H:i:s');
-                    
+
                     $cur->media_title = !$title ? (string) $name : (string) $title;
                     $cur->media_private = (integer) (boolean) $private;
-                    
+
                     if ($dt) {
                          $cur->media_dt = (string) $dt;
@@ -690 +690 @@
                          $cur->media_dt = strftime('%Y-%m-%d %H:%M:%S',filemtime($file));
                     }
-                    
+
                     try {
                          $cur->insert();
@@ -708 +708 @@
           {
                $media_id = (integer) $rs->media_id;
-               
+
                $cur->media_upddt = date('Y-m-d H:i:s');
-               
+
                $cur->update('WHERE media_id = '.$media_id);
           }
-          
+
           $this->callFileHandler($media_type,'create',$cur,$name,$media_id,$force);
-          
+
           return $media_id;
      }
-     
+
      /**
      Updates a file in database.
-     
+
      @param    file      <b>fileItem</b>     Current fileItem object
      @param    newFile   <b>fileItem</b>     New fileItem object
@@ -730 +730 @@
                throw new Exception(__('Permission denied.'));
           }
-          
+
           $id = (integer) $file->media_id;
-          
+
           if (!$id) {
                throw new Exception('No file ID');
           }
-          
+
           if (!$this->core->auth->check('media_admin',$this->core->blog->id)
           && $this->core->auth->userID() != $file->media_user) {
                throw new Exception(__('You are not the file owner.'));
           }
-          
+
           $cur = $this->con->openCursor($this->table);
-          
+
           # We need to tidy newFile basename. If dir isn't empty, concat to basename
           $newFile->relname = files::tidyFileName($newFile->basename);
@@ -749 +749 @@
                $newFile->relname = $newFile->dir.'/'.$newFile->relname;
           }
-          
+
           if ($file->relname != $newFile->relname) {
                $newFile->file = $this->root.'/'.$newFile->relname;
-               
+
                if ($this->isFileExclude($newFile->relname)) {
                     throw new Exception(__('This file is not allowed.'));
                }
-               
+
                if (file_exists($newFile->file)) {
                     throw new Exception(__('New file already exists.'));
                }
-               
+
                $this->moveFile($file->relname,$newFile->relname);
-               
+
                $cur->media_file = (string) $newFile->relname;
                $cur->media_dir = (string) dirname($newFile->relname);
           }
-          
+
           $cur->media_title = (string) $newFile->media_title;
           $cur->media_dt = (string) $newFile->media_dtstr;
           $cur->media_upddt = date('Y-m-d H:i:s');
           $cur->media_private = (integer) $newFile->media_priv;
-          
+
           $cur->update('WHERE media_id = '.$id);
-          
+
           $this->callFileHandler($file->type,'update',$file,$newFile);
      }
-     
+
      /**
      Uploads a file.
-     
+
      @param    tmp       <b>string</b>       Full path of temporary uploaded file
      @param    name      <b>string</b>       File name (relative to working directory)
@@ -790 +790 @@
                throw new Exception(__('Permission denied.'));
           }
-          
+
           $name = files::tidyFileName($name);
-          
+
           parent::uploadFile($tmp,$name,$overwrite);
-          
+
           return $this->createFile($name,$title,$private);
      }
-     
+
      /**
      Creates a file from binary content.
-     
+
      @param    name      <b>string</b>       File name (relative to working directory)
      @param    bits      <b>string</b>       Binary file content
@@ -809 +809 @@
                throw new Exception(__('Permission denied.'));
           }
-          
+
           $name = files::tidyFileName($name);
-          
+
           parent::uploadBits($name,$bits);
-          
+
           return $this->createFile($name,null,null);
      }
-     
+
      /**
      Removes a file.
-     
+
      @param    f         <b>fileItem</b>     fileItem object
      */
@@ -827 +827 @@
                throw new Exception(__('Permission denied.'));
           }
-          
+
           $media_file = $this->relpwd ? path::clean($this->relpwd.'/'.$f) : path::clean($f);
-          
+
           $strReq = 'DELETE FROM '.$this->table.' '.
                     "WHERE media_path = '".$this->con->escape($this->path)."' ".
                     "AND media_file = '".$this->con->escape($media_file)."' ";
-          
+
           if (!$this->core->auth->check('media_admin',$this->core->blog->id))
           {
                $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."'";
           }
-          
+
           $this->con->execute($strReq);
-          
+
           if ($this->con->changes() == 0) {
                throw new Exception(__('File does not exist in the database.'));
           }
-          
+
           parent::removeFile($f);
-          
+
           $this->callFileHandler(files::getMimeType($media_file),'remove',$f);
      }
@@ -861 +861 @@
      {
           $media_dir = $this->relpwd ? $this->relpwd : '.';
-          
+
           $strReq =
           'SELECT distinct media_dir '.
@@ -871 +871 @@
                     $dir[] = ($rs->media_dir == '.' ? '' : $rs->media_dir);
           }
-          
+
           return $dir;
      }
-     
+
      /**
      Extract zip file in current location
-     
+
      @param    f         <b>fileRecord</b>   fileRecord object
      */
@@ -885 +885 @@
           $zip->setExcludePattern($this->exclude_pattern);
           $zip->getList(false,'#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
-          
+
           if ($create_dir)
           {
@@ -896 +896 @@
                     $target = $f->dir.'/'.$destination;
                }
-               
+
                if (is_dir($f->dir.'/'.$destination)) {
-                    throw new Exception(sprintf(__('Extract destination directory %s already exists.'),dirname($f->relname).'/'.$destination)); 
+                    throw new Exception(sprintf(__('Extract destination directory %s already exists.'),dirname($f->relname).'/'.$destination));
                }
           }
@@ -906 +906 @@
                $destination = '';
           }
-          
+
           $zip->unzipAll($target);
           $zip->close();
           return dirname($f->relname).'/'.$destination;
      }
-     
+
      /**
      Returns zip file content
-     
+
      @param    f         <b>fileRecord</b>   fileRecord object
      @return <b>array</b>
@@ -928 +928 @@
      /**
      Calls file handlers registered for recreate event
-     
+
      @param    f    <b>fileItem</b>     fileItem object
      */
@@ -936 +936 @@
           $this->callFileHandler($media_type,'recreate',null,$f->basename); // Args list to be completed as necessary (Franck)
      }
-     
+
      /* Image handlers
      ------------------------------------------------------- */
@@ -942 +942 @@
      {
           $file = $this->pwd.'/'.$f;
-          
+
           if (!file_exists($file)) {
                return false;
           }
-          
+
           $p = path::info($file);
           $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
           $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s');
-          
+
           try
           {
                $img = new imageTools();
                $img->loadImage($file);
-               
+
                $w = $img->getW();
                $h = $img->getH();
-               
+
                if ($force) $this->imageThumbRemove($f);
-               
+
                foreach ($this->thumb_sizes as $suffix => $s) {
                     $thumb_file = sprintf($thumb,$suffix);
@@ -981 +981 @@
           }
      }
-     
+
      protected function imageThumbUpdate($file,$newFile)
      {
@@ -989 +989 @@
                $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
                $thumb_old = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s');
-               
+
                $p = path::info($newFile->relname);
                $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
                $thumb_new = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s');
-               
+
                foreach ($this->thumb_sizes as $suffix => $s) {
                     try {
@@ -1001 +1001 @@
           }
      }
-     
+
      protected function imageThumbRemove($f)
      {
@@ -1007 +1007 @@
           $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
           $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),'',$p['base'],'%s');
-          
+
           foreach ($this->thumb_sizes as $suffix => $s) {
                try {
@@ -1014 +1014 @@
           }
      }
-     
+
      protected function imageMetaCreate($cur,$f,$id)
      {
           $file = $this->pwd.'/'.$f;
-          
+
           if (!file_exists($file)) {
                return false;
           }
-          
+
           $xml = new xmlTag('meta');
           $meta = imageMeta::readMeta($file);
           $xml->insertNode($meta);
-          
+
           $c = $this->core->con->openCursor($this->table);
           $c->media_meta = $xml->toXML();
-          
+
           if ($cur->media_title !== null && $cur->media_title == basename($cur->media_file))
           {
@@ -1036 +1036 @@
                }
           }
-          
+
           if ($meta['DateTimeOriginal'] && $cur->media_dt === '')
           {
@@ -1046 +1046 @@
                }
           }
-          
+
           $c->update('WHERE media_id = '.$id);
      }
-     
+
      /**
      Returns HTML code for MP3 player
-     
+
      @param    url       <b>string</b>       MP3 URL to play
      @param    player    <b>string</b>       Player URL
@@ -1063 +1063 @@
                $player = 'player_mp3.swf';
           }
-          
+
           if (!is_array($args))
           {
@@ -1078 +1078 @@
                );
           }
-          
+
           $args['mp3'] = $url;
-          
+
           if (empty($args['width'])) {
                $args['width'] = 200;
@@ -1087 +1087 @@
                $args['height'] = 20;
           }
-          
+
           $vars = array();
           foreach ($args as $k => $v) {
                $vars[] = $k.'='.$v;
           }
-          
+
           return
           '<object type="application/x-shockwave-flash" '.
@@ -1103 +1103 @@
           '</object>';
      }
-     
+
      public static function flvplayer($url,$player=null,$args=null)
      {
@@ -1109 +1109 @@
                $player = 'player_flv.swf';
           }
-          
+
           if (!is_array($args))
           {
@@ -1123 +1123 @@
                );
           }
-          
+
           $args['flv'] = $url;
-          
+
           if (empty($args['width'])) {
                $args['width'] = 400;
@@ -1132 +1132 @@
                $args['height'] = 300;
           }
-          
+
           $vars = array();
           foreach ($args as $k => $v) {
                $vars[] = $k.'='.$v;
           }
-          
+
           return
           '<object type="application/x-shockwave-flash" '.
@@ -1150 +1150 @@
      }
 }
-?>