Changes in / [20:30]

Files:

• /trunk/pici-proxy/index.php (modified) (1 diff)
• /trunk/pici-server/external/class.rFastTemplate.php (modified) (17 diffs)
• /trunk/pici-server/G/error_download.png (modified) (previous)
• /trunk/pici-server/G/error_email.png (modified) (previous)
• /trunk/pici-server/G/error_notresponding.png (modified) (previous)
• /trunk/pici-server/G/error_unhandled.png (modified) (previous)
• /trunk/pici-server/ADMIN/setup.php (modified) (3 diffs)
• /trunk/pici-server/ADMIN/get_picture.php (modified) (1 diff)
• /trunk/pici-server/ADMIN/mkpicture.sh (modified) (1 diff)
• /trunk/pici-server/ADMIN/common.php (modified) (3 diffs)

/trunk/pici-proxy/index.php

@@ -50 +50 @@
-                        'basic_auth_var_name'      => '____pbavn',
-                        'max_file_size'            => -1,
-0
+1
-                        'upon_hotlink'             => 1,
-                        'compress_output'          => 0

/trunk/pici-server/external/class.rFastTemplate.php

@@ -4 +4 @@
-//             2001 Alister Bulman <alister@minotaur.nu> Re-Port multi template-roots + more
-// PHP3 Port: Copyright  1999 CDI <cdi@thewebmasters.net>, All Rights Reserved.
+// PHP5 Port: Copyright  2008 Marguerie Jérémie <jiem78@homail.com>, All Rights Reserved.
-// Perl Version: Copyright  1998 Jason Moore <jmoore@sober.com>, All Rights Reserved.
-//
@@ -311 +312 @@
-      reset ($fileList);
-      while (list ($tpl, $file) = each ($fileList)) {
-file => $file, dynamic
+'file' => $file, 'dynamic'
-      }
-      return true;
@@ -320 +321 @@
-         reset ($tplList);
-         while (list ($tpl, $parent) = each ($tplList)) {
-parent
-dynamic
+'parent'
+'dynamic'
-         }
-      } else {
-         // $tplList is not an array, but a single child/parent pair.
-parent
-dynamic
+'parent'
+'dynamic'
-      }
-   }
@@ -362 +363 @@
-   //
-   function &load ($file) {
-
+
+
+
+
+
+
+
+
+
+
+
+
-      if (! count($this->ROOT)) {
-         if ($debug)
@@ -394 +406 @@
-   //
-   function &parse_internal_1 ($tag, $rest = '') {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if (empty($tag)) {
-         $this->error ("parse_internal_1: empty tag invalid", true);
@@ -568 +593 @@
-   //
-   function parse_internal ($tag) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      $append = false;
-      if ($debug)
@@ -589 +627 @@
-         // complicated and only makes sense if we start keeping it floating
-         // around between page loads as a persistent variable.
-loaded
-dynamic
+'loaded'
+'dynamic'
-               // Template was declared via define_dynamic().
-parent
-parent
+'parent'
+'parent'
-               else {
-                  // Try to find a non-dynamic template with the same file.
@@ -600 +638 @@
-                  foreach (array_keys($this->TEMPLATE) as $ptag) {
-                     $this->logwrite ("parse_internal: looking for non-dynamic parent, $ptag");
-dynamic
-file] == $this->TEMPLATE[$tag][file
+'dynamic'
+'file'] == $this->TEMPLATE[$tag]['file'
-                        $tag = $ptag;
-                        break;
@@ -608 +646 @@
-               }
-            }
-string] = &$this->load($this->TEMPLATE[$tag][file
-loaded
+'string'] = &$this->load($this->TEMPLATE[$tag]['file'
+'loaded'
-         }
-
@@ -616 +654 @@
-         // markers have a very rigid syntax as HTML comments....
-         if ($this->DYNAMIC) {
-tag
- $this->TEMPLATE[$tag][parsed
-part] = $this->parse_internal_1 ($tag, $this->TEMPLATE[$tag][string
-parsed
+'tag'
+isset($this->TEMPLATE[$tag]['parsed']) OR !$this->TEMPLATE[$tag]['parsed'
+'part'] = $this->parse_internal_1 ($tag, $this->TEMPLATE[$tag]['string'
+'parsed'
-            }
-         }
@@ -650 +688 @@
-   function subst ($handle, $tag, $autoload = true) {
-      $append = false;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      $this->LAST = $handle;
-
@@ -680 +730 @@
-      // entry.
-      if (isset($this->TEMPLATE[$tag])) {
- $this->TEMPLATE[$tag][parsed
+isset($this->TEMPLATE[$tag]['parsed']) OR !$this->TEMPLATE[$tag]['parsed'
-            $this->parse_internal ($tag);
-      } else {
@@ -707 +757 @@
-      }
-      if (!$append) {
-result
+'result'
-         if ($debug)
-            $this->logwrite ("subst (handle=$handle, tag=$tag, autoload=$autoload) in overwrite mode");
@@ -713 +763 @@
-      if ($debug)
-         $this->logwrite ("subst: type(this->TEMPLATE[$tag][part]) => " .
-part
+'part'
-      // Hmmm, clear() called before subst() seems to result in this not
-      // being defined which leaves me a bit confused....
-      $result = '';
-part
-part
-part
+'part'
+'part'
+'part'
-            $this->logwrite ("subst: looking at TEMPLATE[$tag][part][$p]");
-part
+'part'
-            // Don't try if ($p == 'parent')....
-            if (strcmp ($p, 'parent') == 0) {
-               $this->logwrite ("subst: skipping part $p");
-               $tmp = '';
-part
+'part'
-               $this->logwrite ("subst: using part $p");
-               reset ($this->VAR);
@@ -747 +797 @@
-               $result .= $tmp;
-            } else {
-part][$p][tag
+'part'][$p]['tag'
-               if ($this->debug) {
-                  $this->logwrite ("subst: substituting other tag $xtag result in $tag");
@@ -779 +829 @@
-            $this->logwrite ("subst: setting TEMPLATE[$tag][result] = $result");
-         $this->HANDLE[$handle]  = $result;
-result
+'result'
-      }
-      return $this->HANDLE[$handle];
@@ -936 +986 @@
-   }
-}
+?>

/trunk/pici-server/ADMIN/setup.php

@@ -55 +55 @@
-                                                .'</small> seems not to be correct.<br/>Edit your configuration-file and insert the correct path to your
-                                                pici-server for the variable $path2site.
+                                                </div>';
+                        $return = false;
+        }
+        // check whether the Server Variable was set
+        elseif (!isset ($server)) 
+        {
+                        $message .= '<div class="problem">
+                                                <strong>$server variable is not set</strong><br/>
+                                                Uncomment the line 53 or 54 in your configuration-file.<br/>
+                                                Set the variable to "darwin" for Mac OSX and to "linux" for a Linux system.
-                                                </div>';
-                        $return = false;
@@ -100 +110 @@
-                                                Change file permissions<br/>
-                                                via shell:
-
+-R 
-                                                .$path2CACHE
-                                                .'</pre>
@@ -238 +248 @@
-  `created` double default NULL,
-  `loading` int(11) NOT NULL default '1',
-
+nr
-  PRIMARY KEY  (`idx`),
-  KEY `url` (`url`),

/trunk/pici-server/ADMIN/get_picture.php

@@ -178 +178 @@
-                mysql_query(sprintf($addStmt), $DB_link);
-                
-
-
+
+
+
-                if ($debug) echo ("shell = $shell <br/>\n");
-        }

/trunk/pici-server/ADMIN/mkpicture.sh

@@ -1 +1 @@
-#!/bin/sh
-
+
+
-export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4/site-packages/PyObjC
-path2python $path2site/ADMIN/picidae.py -F -o $path2CACHE/$imgnr $url
-path2CACHE/$imgnr
+4 $3/ADMIN/picidae.py -F -o $6/$2 $1
+6/$2
-

/trunk/pici-server/ADMIN/common.php

@@ -23 +23 @@
-
-
+// ----------------------------------------------------------
+// set local timezone (patch by jeremie78)
+// ----------------------------------------------------------
+if(function_exists('date_default_timezone_set'))
+        date_default_timezone_set(date_default_timezone_get());
+        
-
-// ----------------------------------------------------------
@@ -29 +35 @@
-function pici_decrypt ($key, $str)
-{
+        global $debug;
+        
-        $str1 = base64_decode($str);
-
+
+
+
+
+
-        {
-                $td = mcrypt_module_open('des', '', 'ecb', '');
@@ -36 +48 @@
-                $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-                mcrypt_generic_init($td, $key, $iv);
-
+
+
+
+
-        }
-        else
-        {
-                $str2 = des ($key,$str1,0,0,null);
+                
+                if ($debug) echo  ("decrypted with des.php: $str2 <br/>\n"); 
-        }
-