Changeset 187 for trunk/globals/functions.php

Timestamp:

12/10/2008 04:45:22 PM (3 years ago)

Author:

Ernest0x

Message:

PHP 5.x fixes (mostly fixes for warnings and notices)

File:

• trunk/globals/functions.php (modified) (9 diffs)

trunk/globals/functions.php

@@ -49 +49 @@
         global $page_admin, $main;
         if ($_SERVER['REQUEST_METHOD'] == 'GET') {
-                $ret = $_GET[$key];
+                $ret = "";
+                if (isset($_GET[$key])) {
+                    $ret = $_GET[$key];
+                }               
         } else {
                 parse_str($_POST['query_string'], $output);
-                $ret = $output[$key];
+                $ret = "";
+                if (isset($output[$key])) {
+                    $ret = $output[$key];
+                }
         }
         switch ($key) {
@@ -102 +108 @@
         }
         if ($cur_gs_vars == TRUE) {
-                $o = array_merge($o, $qs_vars);
-        }
-        $o = array_merge($o, $extra);
+                $o = array_merge($o, (array)$qs_vars);
+        }
+        $o = array_merge($o, (array)$extra);
         return ($htmlspecialchars?htmlspecialchars('?'.query_str($o)):'?'.query_str($o));
 }
@@ -163 +169 @@
 function reset_smarty() {
         global $smarty, $lang;
-        $smarty->clear_all_assign;
+        $smarty->clear_all_assign();
         $smarty->assign_by_ref('lang', $lang);
         $smarty->assign('tpl_dir', $smarty->template_dir);
@@ -289 +295 @@
 
 function generate_account_code() {
+        $ret = 0;
         for ($i=1;$i<=20;$i++) {
                 $ret .= rand(0, 9);
@@ -310 +317 @@
         $name = strtolower($name);
         $allowchars = 'abcdefghijklmnopqrstuvwxyz0123456789-';
+        $ret = '';
         for ($i=0; $i<strlen($name); $i++) {
                 $char = substr($name, $i, 1);
@@ -316 +324 @@
         if ($ret == '') $ret = 'noname';
         $i=2;
+        $extension = '';
         do {
                 $cnt = $db->cnt('', 'nodes', "name_ns = '".$ret.$extension."' AND id != '".$node."'");
@@ -339 +348 @@
         global $main, $vars, $lang;
         $dirname = dirname($_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF']);
-        $gmap_key = $vars['gmap']['keys'][$dirname];
-        if ($gmap_key == '') $gmap_key = $vars['gmap']['keys'][$dirname."/"];
-        if ($gmap_key == '') $gmap_key = $vars['gmap']['keys']["http://".$dirname];
-        if ($gmap_key == '') $gmap_key = $vars['gmap']['keys']["http://".$dirname."/"];
+        $gmap_key = '' ;
+        if (isset($vars['gmap']['keys'][$dirname])) {
+                $gmap_key = $vars['gmap']['keys'][$dirname];
+        }
+        if (isset($vars['gmap']['keys'][$dirname."/"]) && $gmap_key == '') {
+                $gmap_key = $vars['gmap']['keys'][$dirname."/"];
+        }
+        if (isset($vars['gmap']['keys']["http://".$dirname]) && $gmap_key == '') {
+                $gmap_key = $vars['gmap']['keys']["http://".$dirname];
+        }
+        if (isset($vars['gmap']['keys']["http://".$dirname."/"]) && $gmap_key == '') {
+                $gmap_key = $vars['gmap']['keys']["http://".$dirname."/"];
+        }
         if ($gmap_key == '') return FALSE;
-
+        
         $main->html->head->add_script("text/javascript", "http://".$vars['gmap']['server']."/maps?file=api&v=".$vars['gmap']['api']."&key=".$gmap_key."&hl=".$lang["iso639"]);
         $main->html->head->add_script("text/javascript", $javascript);
@@ -355 +373 @@
         
         $main->html->body->tags['onload'] = "gmap_onload()";    
-    $main->html->body->tags['onunload'] = "GUnload()"; //added to reduce IE memory leaks
+        $main->html->body->tags['onunload'] = "GUnload()"; //added to reduce IE memory leaks
         return TRUE;
 }
@@ -386 +404 @@
         } elseif (get('lang') != '') {
                 $tl = get('lang');
-        } elseif ($_SESSION['lang'] != '') {
+        } elseif (isset($_SESSION['lang']) && $_SESSION['lang'] != '') {
                 $tl = $_SESSION['lang'];
         } elseif ($language != '') {