]> dev.renevier.net Git - syp.git/commitdiff
projects / syp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 19730f2)
fixes notices master
authorArno Renevier <arno@renevier.net>
Sun, 4 Dec 2011 11:26:01 +0000 (12:26 +0100)
committerArno Renevier <arno@renevier.net>
Sun, 4 Dec 2011 11:35:01 +0000 (12:35 +0100)
inc/html/admin.php patch | blob | history
inc/html/install.php patch | blob | history
inc/langutils.php patch | blob | history

diff --git a/inc/html/admin.php b/inc/html/admin.php
index ef43708a4b50f03314742deadafb2527c329420a..d15846a255b7ed4fe5744c87c07213ca32f5d9f9 100644 (file)
--- a/inc/html/admin.php
+++ b/inc/html/admin.php
@@ -39,8 +39,10 @@ if (!$usrtblexists || !$itemstblexists) {
     exit ();
     } // if ($error)
 
-    $user = $_COOKIE [sprintf ("%suser", DBPREFIX)];
-    $pwd = $_COOKIE [sprintf ("%sauth", DBPREFIX)];
+    $userkey = sprintf ("%suser", DBPREFIX);
+    $user = (isset($_COOKIE [$userkey]))? $_COOKIE[$userkey]: "";
+    $pwdkey = sprintf ("%sauth", DBPREFIX);
+    $pwd = (isset($_COOKIE [$pwdkey]))? $_COOKIE[$pwdkey]: "";
     $logged = ($connection->checkpwdmd5 ($user, $pwd));
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
diff --git a/inc/html/install.php b/inc/html/install.php
index 7bab8efd67b21eed0fa9c9f52be97d38583ea4b5..c5ff654fa72d068b5a3359b7f9f84cce539db141 100644 (file)
--- a/inc/html/install.php
+++ b/inc/html/install.php
@@ -244,7 +244,7 @@
         par_success (trans ('Found user table.'));
     } else {
         $empty_pass = (isset ($_POST ["admin_pass"]) && (strlen ($_POST ["admin_pass"]) == 0));
-        if ($_POST ["admin_pass"]) {
+        if (isset ($_POST["admin_pass"]) and $_POST ["admin_pass"]) {
             try {
                 $connection->create_users_table (true);
             } catch (Exception $e) {
diff --git a/inc/langutils.php b/inc/langutils.php
index 8d458fa53e08c21be76a89803d845c14ca30ab81..758fef65f0141f5366821cb317047bced616a483 100644 (file)
--- a/inc/langutils.php
+++ b/inc/langutils.php
@@ -11,7 +11,9 @@ function ptrans ($str) {
 function trans ($str) {
     global $translations, $lang;
 
-    $res = $translations[$lang][$str];
+    if (isset ($translations[$lang]) and isset($translations[$lang][$str])) {
+        $res = $translations[$lang][$str];
+    }
     if (!isset ($res) || strlen ($res) == 0) {
         return $str;
     } else {
@@ -36,7 +38,8 @@ function parse_accept_language () {
                 if ($val > 1.0) {
                     $val = 1.0;
                 }
-                $possibilities [$matches [1]] = max ($val, $possibilities [$matches [1]]);
+                $ceil = (isset ($possibilities[$matches[1]]))? $possibilities[$matches[1]]: 0;
+                $possibilities [$matches [1]] = max ($val, $ceil);
             }
         }
         arsort ($possibilities);
Show Your Places