Changeset 381

Timestamp:

03/30/08 22:31:40 (16 years ago)

Author:

sacha

Message:

Remote Latex - GIF support ; configuration page

Location:

plugins/remotelatex

Files:

• _admin.php (modified) (7 diffs)
• _define.php (modified) (2 diffs)
• forms.php (added)
• index.php (added)

plugins/remotelatex/_admin.php

@@ -1 +1 @@
 <?php /* -*- tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
 /***************************************************************\
- *  This is 'Remote Latex', a plugin for Dotclear              *
+ *  This is 'Remote LaTeX', a plugin for Dotclear              *
  *                                                             *
  *  Copyright (c) 2007-2008                                    *
@@ -10 +10 @@
  *                                                             *
  *  You should have received a copy of the GNU General Public  *
- *  License along with 'Remote Latex' (see COPYING.txt);       *
+ *  License along with 'Remote LaTeX' (see COPYING.txt);       *
  *  if not, write to the Free Software Foundation, Inc.,       *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    *
 \***************************************************************/
+
+$_menu['Plugins']->addItem('LaTeX','plugin.php?p=remotelatex',
+     null,
+     preg_match('/plugin.php\?p=remotelatex(&.*)?$/',$_SERVER['REQUEST_URI']),
+     $core->auth->check('contentadmin',$core->blog->id));
 
 $core->addBehavior('coreInitWikiPost',array('remoteLatex','coreInitWikiPost'));
@@ -34 +39 @@
                self::getSettings($latex_server,$root_path,$root_url);
                
-               $file_name = sprintf('%s/%s/%s.png',
+               $file_name = sprintf('%s/%s/%s',
                     $root_path,
                     substr($hash,0,2),
@@ -40 +45 @@
                );
                
-               $file_url = sprintf('%s/%s/%s.png',
+               $file_url = sprintf('%s/%s/%s',
                     $root_url,
                     substr($hash,0,2),
@@ -58 +63 @@
                $dist_url = $latex_server.rawurlencode($tex);
                
-               # Get rendered PNG picture
+               # Get rendered PNG image
                if (netHttp::quickGet($dist_url,$file_name) === false) {
                     throw new Exception(sprintf(
-                         __('Unable to get Latex image from the server %s.'),
+                         __('Unable to get LaTeX image from the server %s.'),
                          html::escapeHTML($latex_server)
                     ));
                }
                
-               # Verify that we got a correct PNG file
+               # Verify that we got a valid PNG / GIF file
+               $accept_sig = array(
+                    "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a",     # PNG
+                    "\x47\x49\x46\x38\x39\x61",             # GIF87a
+                    "\x47\x49\x46\x38\x37\x61"              # GIF89a
+               );
                $signature = file_get_contents($file_name,false,null,0,8);
                
-               if ($signature != "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a") {
-                    @unlink($file_name);
-                    throw new Exception(__('File is not a valid PNG image'));
+               foreach ($accept_sig as $sig)
+               {
+                    if (strncmp($signature,$sig,strlen($sig)) === 0) {
+                         return self::getHtml($tex,$file_url);
+                    }
                }
+               
+               @unlink($file_name);
+               throw new Exception(__('File is not a valid PNG / GIF image'));
           }
           catch (Exception $e) {
-               # If something is wrong, Laex code is returned in plain text
+               # If something is wrong, LaTeX code is returned in plain text
                #$core->error->add($e->getMessage());
                return self::getHtml($tex);
           }
-          
-          return self::getHtml($tex,$file_url);
      }
      
@@ -95 +108 @@
      }
      
-     public static function getSettings(&$latex_server,&$root_path,&$root_url)
+     public static function getSettings(&$latex_server='',&$root_path='',&$root_url='')
      {
           global $core;
           
           $root_path = path::real($core->blog->public_path).'/latex-images';
-          $root_url = $core->blog->host.
-               path::clean($core->blog->settings->public_url).'/latex-images';
+          $root_url = path::clean($core->blog->settings->public_url).'/latex-images';
           
           $latex_server = $core->blog->settings->latex_server;
@@ -111 +123 @@
                     $latex_server,
                     'string',
-                    'Latex server URL'
+                    'LaTeX server URL'
                );
           }

plugins/remotelatex/_define.php

@@ -1 +1 @@
 <?php /* -*- tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
 /***************************************************************\
- *  This is 'Remote Latex', a plugin for Dotclear              *
+ *  This is 'Remote LaTeX', a plugin for Dotclear              *
  *                                                             *
  *  Copyright (c) 2007-2008                                    *
@@ -10 +10 @@
  *                                                             *
  *  You should have received a copy of the GNU General Public  *
- *  License along with 'Remote Latex' (see COPYING.txt);       *
+ *  License along with 'Remote LaTeX' (see COPYING.txt);       *
  *  if not, write to the Free Software Foundation, Inc.,       *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    *