[PHPPlanner-cvs] phpplanner common.php,1.15,1.16 day.php,1.2,1.3

[Tom S. <tom...@us...>]

Update of /cvsroot/phpplanner/phpplanner
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3864

Modified Files:
	common.php day.php 
Log Message:
Fixed a shitload of bugs


Index: day.php
===================================================================
RCS file: /cvsroot/phpplanner/phpplanner/day.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- day.php	7 Sep 2003 16:07:53 -0000	1.2
+++ day.php	25 Apr 2004 22:01:42 -0000	1.3
@@ -61,15 +61,7 @@
                                                  $_SESSION['userid'] => lang('private_only_you')
                                                  )
                         );
-        $smarty->assign('special_values', array_keys($config['colors']));
-        
-        /* Bloody workaround, hrumpf */
-        foreach($config['colors'] as $id => $values)
-        {
-            $valuelist[] = key($values);
-        }
         
-        $smarty->assign('special_labels', $valuelist );
         $smarty->assign('form', $smarty->fetch('day.form.html') );
     }
     else

Index: common.php
===================================================================
RCS file: /cvsroot/phpplanner/phpplanner/common.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- common.php	24 Apr 2004 22:50:20 -0000	1.15
+++ common.php	25 Apr 2004 22:01:32 -0000	1.16
@@ -57,7 +57,7 @@
     {
         $_SESSION['language'] = $_POST['new_lang'];
     }
-    if (!isset($_SESSION['language']))
+    if (!isset($_SESSION['language']) && isset($config['language']) )
     {
         $_SESSION['language'] = $config['language'];
     }
@@ -132,9 +132,9 @@
 // ************************************************************************
     function GetUserPermission($userid,$permission) 
     {
-        $SQL = mysql_query("SELECT $permission FROM cal_users where id = $userid") or die(mysql_error());
+        $SQL = mysql_query("SELECT $permission, is_admin FROM cal_users where id = $userid") or die(mysql_error());
         $RS = mysql_fetch_array($SQL);
-        if ($RS[$permission] == 'true') {
+        if ($RS[$permission] == 'true' || $RS['is_admin'] == 'true' ) {
             return true;
         } else {
             return false;