Changeset 316

Timestamp:

01/23/08 09:33:14 (15 years ago)

Author:

ralle030583

Message:

Tickets #72 , #73
- assign kb_host to smarty
- type and reformot in portrait_grab

Location:

dev

Files:

• common/includes/globals.php (modified) (1 diff)
• common/index.php (modified) (1 diff)
• common/portrait_grab.php (modified) (2 diffs)
• templates/igb.tpl (modified) (1 diff)

dev/common/includes/globals.php

@@ -1 +1 @@
 <?php
 // current subversion revision
-preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 314 $', $match);
+preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 316 $', $match);
 define('SVN_REV', $match[1]);
 

dev/common/index.php

@@ -104 +104 @@
 $smarty->assign('style_url', STYLE_URL);
 $smarty->assign('img_url', IMG_URL);
+$smarty->assign('kb_host', KB_HOST);
 $smarty->assign_by_ref('config', $config);
 

dev/common/portrait_grab.php

@@ -33 +33 @@
         $id = intval($_SERVER['HTTP_EVE_CHARID']);
         $pilot->setCharacterID($id);
-                if (file_exists("cache/portraits/".$id."_256.jpg") && 1 == $_REQUEST['force']) 
-                {
-                        // Remove just in case.
-                        @unlink("cache/portraits/".$id."}_32.jpg");
-                    @unlink("cache/portraits/".$id."_64.jpg");
-                        @unlink("cache/portraits/".$id."_128.jpg");
-                        @unlink("cache/portraits/".$id."_256.jpg");
-                        if (0 == create_portraits($id))
-                        {
-                                $message = "Character portrait uploaded.";
-                        }
-                        else
-                        {
-                                $message = "Character portrait update failed.";
-                        }
-                }
-                elseif (file_exists("cache/portraits/".$id."_256.jpg"))
-                {
-                        $message = "Character portrait not updated, as it already exists. <a href='".KB_HOST."?a=portrait_grab&force=1'>Click</a> to force an update.";
-                }
-                else
-                {
-                        if (0 == create_portraits($id))
-                        {
-                                $message = "Character portrait uploaded.";
-                        }
-                        else
-                        {
-                                $message = "Character portrait update failed.";
-                        }
-                        
-        }
-        $html .= "<img src='".$pilot->getPortraitURL(64)."' border='0' />";
-        $html .= "<br />$message <br />$port_error_msg <br />";
-        $html .= "<a href='".KB_HOST."?a=igb'>Return</a> to the killboard.<br />";
-        }
+        if (file_exists("cache/portraits/".$id."_256.jpg") && 1 == $_REQUEST['force']) 
+        {
+            // Remove just in case.
+            @unlink("cache/portraits/".$id."_32.jpg");
+            @unlink("cache/portraits/".$id."_64.jpg");
+            @unlink("cache/portraits/".$id."_128.jpg");
+            @unlink("cache/portraits/".$id."_256.jpg");
+            if (0 == create_portraits($id))
+            {
+                $message = "Character portrait uploaded.";
+            }
+            else
+            {
+                $message = "Character portrait update failed.";
+            }
+        }
+        elseif (file_exists("cache/portraits/".$id."_256.jpg"))
+        {
+            $message = "Character portrait not updated, as it already exists. <a href='".KB_HOST."?a=portrait_grab&force=1'>Click</a> to force an update.";
+        }
+        else
+        {
+            if (0 == create_portraits($id))
+            {
+                $message = "Character portrait uploaded.";
+            }
+            else
+            {
+                $message = "Character portrait update failed.";
+            }
+            
+        }
+        $html .= "<img src='".$pilot->getPortraitURL(64)."' border='0' />";
+        $html .= "<br />$message <br />$port_error_msg <br />";
+        $html .= "<a href='".KB_HOST."?a=igb'>Return</a> to the killboard.<br />";
+    }
 }
 
@@ -77 +77 @@
 
 function create_portraits($id) {
-        global $port_error_msg;
-        if (1 != ini_get('allow_url_fopen')) {
-                $port_error_msg = 'This web host does not allow PHP to create HTTP connections.  Check allow_url_fopen.';
-                return -99;
-        }
-        if (! is_writable('cache/portraits/')) {
-                $port_error_msg = 'The portraits directory is not writable.  Please fix this.';
-                return -99;
-        }
+    global $port_error_msg;
+    if (1 != ini_get('allow_url_fopen')) {
+        $port_error_msg = 'This web host does not allow PHP to create HTTP connections.  Check allow_url_fopen.';
+        return -99;
+    }
+    if (! is_writable('cache/portraits/')) {
+        $port_error_msg = 'The portraits directory is not writable.  Please fix this.';
+        return -99;
+    }
 
-        $img = @imagecreatefromjpeg("http://img.eve.is/serv.asp?s=".IS_IMG_MAX."&c=".$id);
-        if ($img)
-        {
-                $dims = array (32, 64, 128);
-                foreach ($dims as $dim) {
-                        $newimg = @imagecreatetruecolor($dim,$dim);
-                        @imagecopyresampled($newimg, $img, 0,0,0,0,$dim,$dim,IS_IMG_MAX,IS_IMG_MAX);
-                        @imagejpeg($newimg, "cache/portraits/".$id."_".$dim.".jpg");
-                }
-                @imagejpeg($img, "cache/portraits/" . $id . "_256.jpg");
-                $return = 0;
-        }
-        else
-        {
-                $port_error_msg = 'Attempting to create an image failed, and it was not because the directory was not writable.';
-                $return = -99;
-        }
-        return $return;
+    $img = @imagecreatefromjpeg("http://img.eve.is/serv.asp?s=".IS_IMG_MAX."&c=".$id);
+    if ($img)
+    {
+        $dims = array (32, 64, 128);
+        foreach ($dims as $dim) {
+            $newimg = @imagecreatetruecolor($dim,$dim);
+            @imagecopyresampled($newimg, $img, 0,0,0,0,$dim,$dim,IS_IMG_MAX,IS_IMG_MAX);
+            @imagejpeg($newimg, "cache/portraits/".$id."_".$dim.".jpg");
+        }
+        @imagejpeg($img, "cache/portraits/".$id . "_256.jpg");
+        $return = 0;
+    }
+    else
+    {
+        $port_error_msg = 'Attempting to create an image failed, and it was not because the directory was not writable.';
+        $return = -99;
+    }
+
+    if (filesize("cache/portraits/".$id."_256.jpg") == '3863')
+    {
+        $port_error_msg = 'CCP have not generated an image for you yet.  Be patient.';
+    }
+    return $return;
 }
 ?>

dev/templates/igb.tpl

@@ -1 @@
-<a href="{KB_HOST}/?a=igb_home">Home</a> | <a href="{KB_HOST}/?a=post_igb">Post killmail</a> | <a href="{KB_HOST}/?a=portrait_grab">Update portrait</a>
+<a href="{kb_host}/?a=igb_home">Home</a> | <a href="{kb_host}/?a=post_igb">Post killmail</a> | <a href="{kb_host}/?a=portrait_grab">Update portrait</a>