Dev Fixed a couple strict error in Excel export

Dev Corrected button naming in tokens section git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@7080 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jun 12, 2009 · 9294ef8 · 9294ef8
1 parent 22282ca
commit 9294ef8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/admin/classes/pear/OLE/OLE.php b/admin/classes/pear/OLE/OLE.php
@@ -305,7 +305,7 @@ function getDataLength($index)
     * @param string $ascii The ASCII string to transform
     * @return string The string in Unicode
     */
-    function Asc2Ucs($ascii)
+    static function Asc2Ucs($ascii)
     {
         $rawname = '';
         for ($i = 0; $i < strlen($ascii); $i++) {
@@ -323,7 +323,7 @@ function Asc2Ucs($ascii)
     * @param integer $date A timestamp 
     * @return string The string for the OLE container
     */
-    function LocalDate2OLE($date = null)
+    static function LocalDate2OLE($date = null)
     {
         if (!isset($date)) {
             return "\x00\x00\x00\x00\x00\x00\x00\x00";
@@ -370,7 +370,7 @@ function LocalDate2OLE($date = null)
     * @param integer $string A binary string with the encoded date
     * @return string The timestamp corresponding to the string
     */
-    function OLE2LocalDate($string)
+    static function OLE2LocalDate($string)
     {
         if (strlen($string) != 8) {
             return new PEAR_Error("Expecting 8 byte string");

diff --git a/admin/classes/pear/PEAR.php b/admin/classes/pear/PEAR.php
@@ -263,10 +263,10 @@ function registerShutdownFunc($func, $args = array())
      *                        $code is an integer and $obj->getCode() == $code
      * @access  public
      * @return  bool    true if parameter is an error
-     */
+     */                             
     function isError($data, $code = null)
     {
-        if (is_a($data, 'PEAR_Error')) {
+        if ($data instanceof PEAR_Error) {
             if (is_null($code)) {
                 return true;
             } elseif (is_string($code)) {

diff --git a/admin/tokens.php b/admin/tokens.php
@@ -1913,13 +1913,13 @@
 	switch($subaction)
 	{
 		case "edit":
-			$tokenoutput .= "\t\t<input type='submit' value='".$clang->gT("Update Token")."' />\n"
+			$tokenoutput .= "\t\t<input type='submit' value='".$clang->gT("Update token entry")."' />\n"
 			."\t\t<input type='hidden' name='subaction' value='updatetoken' />\n"
 			."\t\t<input type='hidden' name='tid' value='{$tokenid}' />\n"
 			."\t\t<input type='hidden' name='urlextra' value='&amp;start=".$_GET['start']."&amp;limit=".$_GET['limit']."&amp;order=".$_GET['order']."' />\n";
 			break;
 		case "addnew":
-			$tokenoutput .= "\t\t<input type='submit' value='".$clang->gT("Add Token")."' />\n"
+			$tokenoutput .= "\t\t<input type='submit' value='".$clang->gT("Add token entry")."' />\n"
 			."\t\t<input type='hidden' name='subaction' value='inserttoken' />\n";
 			break;
 	}