Incorporating JHR's fixes for #575, #576, #577, #578, #579

addons/tree/maketree.inc.php

@@ -218,6 +218,10 @@ function makeRadio($direction,$type,$checked) {
 }
 $showSomedays=!$showingall && $items[$idlist[0]]['isSomeday']==='y';
 
+$referrer = ( preg_match("/[^\/]+$/", $_SERVER['REQUEST_URI'] ,$matches ) ) ?
+            ("&referrer=".urlencode($matches[0])) : "";
+
+
 /* ---------------------------------------------------------------------------
     finished processing - now produce the HTML
 */
@@ -370,7 +374,7 @@ function makeRadio($direction,$type,$checked) {
 
 <div id='treepopup' class='hidden'>
 <a href='itemReport.php?itemId=0'>View</a>
-<a href='item.php?itemId=0'>Edit</a>
+<a href='item.php?itemId=0<?php echo $referrer;?>'>Edit</a>
 <a href='#' onclick='return GTD.tree.prune()'>Prune</a>
 </div>
 

backup.php

@@ -17,7 +17,8 @@
 
 // output the database backup
 header("Content-type: text/plain; $charset");
-header('Content-Disposition: attachment; filename="gtdphpBackup.sql"');
+header('Content-Disposition: attachment; filename="gtdphpBackup'
+        .date("Y-m-d").'.sql"');
 echo backupData($_SESSION['prefix']);
 
 

gtd_constants.inc.php

@@ -1,5 +1,5 @@
 <?php
-define('_GTD_REVISION',609);
+define('_GTD_REVISION',610);
 define('_GTD_VERSION','0.8z.09'); // DATABASE version
 define('_GTDPHP_VERSION','0.9beta');  // gtd-php version, as per the TRAC system
 

gtdfuncs.inc.php

@@ -676,19 +676,18 @@ function checkUTF8() { // check php ini values are ok for utf-8
 
     if (stristr(ini_get('mbstring.http_input'  ),'UTF-8')===false) {
         $_SESSION['message'][]="Either set mbstring.http_input=UTF-8,ASCII in php.ini;
-            or add this line to .htaccess: phpvalue mbstring.http_input UTF-8,ASCII";
+            or add this line to .htaccess: php_value mbstring.http_input UTF-8,ASCII";
         $passed=false;
     }
 
     if (stristr(ini_get('mbstring.detect_order'),'UTF-8')===false) {
         $_SESSION['message'][]="Either set mbstring.detect_order=UTF-8,ASCII in php.ini;
-            or add this line to .htaccess: phpvalue mbstring.detect_order UTF-8,ASCII";
+            or add this line to .htaccess: php_value mbstring.detect_order UTF-8,ASCII";
         $passed=false;
     }
 
     if (!(ini_get('mbstring.func_overload') & 6)) {
-        $_SESSION['message'][]="Either set mbstring.func_overload=6 in php.ini;
-            or add this line to .htaccess: phpvalue mbstring.func_overload 6";
+        $_SESSION['message'][]="Either add this line to .htaccess: php_value mbstring.func_overload 6 (this may not work in php5.2.8 onwards); or set mbstring.func_overload=6 in php.ini";
         $passed=false;
     }
 

itemReport.php

@@ -209,7 +209,10 @@
 
     while ($i < count($maintable)) {
         $row=&$maintable[$i];
-		$cleantitle=makeclean($row['title']);
+        $cleantitle=makeclean($row['title']);
+
+        $row['doreport']=!($row['type']=="a" || $row['type']==="r" || $row['type']==="w" || $row['type']==="i");
+
 
         if ($i >= $limit) {
             if ($_SESSION['useLiveEnhancements']) {

license.php

@@ -115,7 +115,8 @@
       <a href='http://www.gtd-php.com/Developers/NextActionsBooklet'>printable
       Next-actions booklet</a></td></tr>
 
-	<tr><td>Sonic, Ismail Onur Filiz, Red, Chris 'Dwarfsoft' Bennett</td><td>Testing and patching</td></tr>
+	<tr><td>John Holland Robinson, Sonic, Ismail Onur Filiz, Red, Chris 'Dwarfsoft' Bennett</td>
+      <td>Testing and patching</td></tr>
 
 	<tr><td><b>You!</b></td>
         <td>For the invaluable feedback on our <a href='http://toae.org/boards/index.php'>forum</a>

mysql.inc.php

@@ -789,13 +789,12 @@ function getsql($querylabel,$values,$sort) {
 			break;
 
         case "updateconfig":
-            $sql="REPLACE INTO `{$prefix}preferences` (`uid`,`option`,`value`)
-                    VALUES ('{$values['uid']}','config'   ,'{$values['config']}'   ),
-                           ('{$values['uid']}','keys'     ,'{$values['keys']}'     ),
-                           ('{$values['uid']}','hierarchy','{$values['hierarchy']}'),
-                           ('{$values['uid']}','debug'    ,'{$values['debug']}'    ),
-                           ('{$values['uid']}','sort'     ,'{$values['sort']}'     ),
-                           ('{$values['uid']}','addons'   ,'{$values['addons']}'   )";
+            // config, keys, hierarchy, debug, sort, addons;
+            $sql="REPLACE INTO `{$prefix}preferences` (`uid`,`option`,`value`) VALUES\n";
+            foreach ($values as $key=>$val)
+                if ($key !== "uid" && preg_match('/^[a-zA-Z0-9]+$/',$key))
+                    $sql.= "('{$values['uid']}','{$key}','{$val}'),\n";
+            $sql=rtrim($sql,",\n");
             break;
 
 		case "updatedeadline":

themes/default/style.css

@@ -274,6 +274,7 @@ input[type='submit']:disabled, button:disabled,select:disabled {
     border: solid green 2px;
     font-weight:bold;
     padding:2px;
+    margin-bottom:4px;
     background-color:#CFC;
 }