From 1c5685d68f1b73270fb814fe04cbb490eb90ba5f Mon Sep 17 00:00:00 2001 From: mensonge Date: Fri, 14 Nov 2008 15:39:19 +0000 Subject: Minor fix: Remove DOJO library (60Mo) replaced by link to Google CDN (online DOJO library) git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@159 b3834d28-1941-0410-a4f8-b48e95affb8f --- includes/js/dojox/grid/tests/support/books.xml | 103 --- includes/js/dojox/grid/tests/support/data.php | 379 --------- includes/js/dojox/grid/tests/support/geography.xml | 51 -- includes/js/dojox/grid/tests/support/json.php | 794 ----------------- includes/js/dojox/grid/tests/support/movies.csv | 9 - includes/js/dojox/grid/tests/support/test_data.js | 30 - .../dojox/grid/tests/support/test_data_objects.js | 31 - includes/js/dojox/grid/tests/support/testtbl.sql | 944 --------------------- .../js/dojox/grid/tests/support/yahoo_search.js | 131 --- 9 files changed, 2472 deletions(-) delete mode 100644 includes/js/dojox/grid/tests/support/books.xml delete mode 100644 includes/js/dojox/grid/tests/support/data.php delete mode 100644 includes/js/dojox/grid/tests/support/geography.xml delete mode 100644 includes/js/dojox/grid/tests/support/json.php delete mode 100644 includes/js/dojox/grid/tests/support/movies.csv delete mode 100644 includes/js/dojox/grid/tests/support/test_data.js delete mode 100644 includes/js/dojox/grid/tests/support/test_data_objects.js delete mode 100644 includes/js/dojox/grid/tests/support/testtbl.sql delete mode 100644 includes/js/dojox/grid/tests/support/yahoo_search.js (limited to 'includes/js/dojox/grid/tests/support') diff --git a/includes/js/dojox/grid/tests/support/books.xml b/includes/js/dojox/grid/tests/support/books.xml deleted file mode 100644 index 4c330e6..0000000 --- a/includes/js/dojox/grid/tests/support/books.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - 1 - Title of 1 - Author of 1 - - - 2 - Title of 2 - Author of 2 - - - 3 - Title of 3 - Author of 3 - - - 4 - Title of 4 - Author of 4 - - - 5 - Title of 5 - Author of 5 - - - 6 - Title of 6 - Author of 6 - - - 7 - Title of 7 - Author of 7 - - - 8 - Title of 8 - Author of 8 - - - 9 - Title of 9 - Author of 9 - - - 10 - Title of 10 - Author of 10 - - - 11 - Title of 11 - Author of 11 - - - 12 - Title of 12 - Author of 12 - - - 13 - Title of 13 - Author of 13 - - - 14 - Title of 14 - Author of 14 - - - 15 - Title of 15 - Author of 15 - - - 16 - Title of 16 - Author of 16 - - - 17 - Title of 17 - Author of 17 - - - 18 - Title of 18 - Author of 18 - - - 19 - Title of 19 - Author of 19 - - - 20 - Title of 20 - Author of 20 - - diff --git a/includes/js/dojox/grid/tests/support/data.php b/includes/js/dojox/grid/tests/support/data.php deleted file mode 100644 index 1beb6f0..0000000 --- a/includes/js/dojox/grid/tests/support/data.php +++ /dev/null @@ -1,379 +0,0 @@ -encode($inData) . ' */'; - } - - function error($inMessage) { - $inMessage = str_replace('"', '\\"', $inMessage); - error_log($inMessage); - //echo '/* ({error: true, message: "' . $inMessage . '"}) */'; - echoJson(array('error' => true, 'message' => $inMessage)); - exit; - } - - - function getArray($inResult, $inArray="true") { - $o = Array(); - while ($row = ($inArray ? mysql_fetch_row($inResult) : mysql_fetch_object($inResult))) - $o[] = $row; - return $o; - } - - // connect to DB - mysql_connect($dbserver, $dbuser, $dbpassword); - - // select DB - $database = getPostString("database"); - $database = ($database ? $database : $db); - if (!mysql_select_db($database)) - error('failed to select db: ' . mysql_error()); - - // select table - $table = getPostString("table"); - $table = ($table ? $table : $dbtable); - - // cache - $colCache = NULL; - $pkCache = NULL; - - // set UTF8 output (MySql > 4.0) - mysql_query("SET NAMES UTF8"); - - // server, database, table meta data - function getDatabases() { - $result = mysql_query("SHOW DATABASES"); - $output = Array(); - while ($row = mysql_fetch_row($result)) { - $r = strtolower($row[0]); - if ($r != 'mysql' && $r != 'information_schema') - $output[] = $row[0]; - } - return $output; - } - - function getTables() { - global $database; - $result = mysql_query("SHOW TABLES FROM $database"); - $output = Array(); - while ($row = mysql_fetch_row($result)) - $output[] = $row[0]; - return $output; - } - - function getColumns() { - global $table, $colCache; - if (!$colCache) { - $result = mysql_query("SHOW COLUMNS FROM `$table`"); - return getArray($result, false); - $colCache = getArray($result, false); - } - return $colCache; - } - - // returns object: $this->name, $this->index - function getPk() { - global $pkCache; - if (!$pkCache) { - $k = ''; - $columns = getColumns(); - for ($i=0; $i < count($columns); $i++) { - $c = $columns[$i]; - if ($c->Key == 'PRI') { - $k = $c->Field; - break; - } - } - $pkCache->index = $i; - $pkCache->name = $k; - } - return $pkCache; - } - - function getTableInfo() { - global $table, $database; - $c = getColumns(); - $r = rowcount(); - return array("count" => $r, "columns" => $c, "database" => $database, "table" => $table); - } - - function getOldPostPkValue() { - $pk = getPk(); - return getPostString('_o' . $pk->index); - } - - function getNewPostPkValue() { - $pk = getPk(); - return getPostString('_' . $pk->index); - } - - function getPostColumns() { - $columns = getColumns(); - for ($i=0, $a=array(), $p; (($p=getPostString("_".$i)) != ''); $i++) { - $r = new stdClass(); - $r->name = $columns[$i]->Field; - $r->value = $p; - $a[] = $r; - } - return $a; - } - - function getOrderBy() { - $ob = getPostString("orderby"); - if (is_numeric($ob)) { - $columns = getColumns(); - $ob = $columns[intval($ob)-1]->Field; - } - return $ob; - } - - function getWhere() { - $w = getPostString("where"); - return ($w ? " WHERE $w" : ""); - } - - // basic operations - function rowcount() { - global $table; - $query = "SELECT COUNT(*) FROM `$table`" . getWhere(); - $result = mysql_query($query); - if (!$result) - error("failed to perform query: $query. " . mysql_error()); - if ($row = mysql_fetch_row($result)) - return $row[0]; - else - return 0; - } - - function select($inQuery = '') { - global $table; - // built limit clause - $lim = (int)getPostString("limit"); - $off = (int)getPostString("offset"); - $limit = ($lim || $off ? " LIMIT $off, $lim" : ""); - // build order by clause - $desc = (boolean)getPostString("desc"); - $ob = getOrderBy(); - $orderby = ($ob ? " ORDER BY `" . $ob . "`" . ($desc ? " DESC" : "") : ""); - // build query - $query = ($inQuery ? $inQuery : "SELECT * FROM `$table`" . getWhere() . $orderby . $limit); - // execute query - if (!$result = mysql_query($query)) - error("failed to perform query: $query. " . mysql_error()); - // fetch each result row - return getArray($result); - } - - function reflectRow() { - global $table; - $pk = getPk(); - $key = getNewPostPkValue(); - $where = "`$pk->name`=\"$key\""; - return select("SELECT * FROM `$table` WHERE $where LIMIT 1"); - } - - function update() { - // build set clause - for ($i=0, $set = array(), $cols = getPostColumns(), $v; ($v=$cols[$i]); $i++) - $set[] = "`$v->name` = '$v->value'"; - $set = implode(', ', $set); - // our table - global $table; - // build query - $pk = getPk(); - $pkValue = getOldPostPkValue(); - $query = "UPDATE `$table` SET $set WHERE `$pk->name` = '$pkValue' LIMIT 1"; - // execute query - if (!mysql_query($query)) - error("failed to perform query: [$query]. " . - "MySql says: [" . mysql_error() ."]"); - else { - return reflectRow(); - } - } - - function insert() { - global $table; - // build values clause - for ($i=0, $values = array(), $cols = getPostColumns(), $v; ($v=$cols[$i]); $i++) - $values[] = $v->value; - $values = '"' . implode('", "', $values) . '"'; - // build query - $query = "INSERT INTO `$table` VALUES($values)"; - // execute query - if (!mysql_query($query)) - error("failed to perform query: [$query]. " . - "MySql says: [" . mysql_error() ."]"); - else { - return reflectRow(); - } - } - - function delete() { - global $table; - // build query - $n = getPostString("count"); - $pk = getPk(); - for ($i = 0, $deleted=array(); $i < $n; $i++) { - $key = getPostString("_$i"); - array_push($deleted, $key); - $query = "DELETE FROM `$table` WHERE `$pk->name`=\"$key\" LIMIT 1"; - // execute query - if (!mysql_query($query) || mysql_affected_rows() != 1) - error("failed to perform query: [$query]. " . - "Affected rows: " . mysql_affected_rows() .". " . - "MySql says: [" . mysql_error() ."]"); - } - return $deleted; - } - - // find (full text search) - function findData($inFindCol, $inFind, $inOrderBy, $inFullText) { - global $table; - $where = ($inFullText ? "WHERE MATCH(`$inFindCol`) AGAINST ('$inFind')" : "WHERE $inFindCol LIKE '$inFind'"); - $query = "SELECT * FROM $table $where $inOrderBy"; - $result = mysql_query($query); - // return rows - return getArray($result); - } - - // binary search through sorted data, supports start point ($inFindFrom) and direction ($inFindForward) - function findRow($inData, $inFindFrom=-1, $inFindForward) { - $b = -1; - $l = count($inData); - if (!$inData) - return $b; - if (!$inFindFrom==-1 || $l < 2) - $b = 0; - else { - // binary search - $t = $l-1; - $b = 0; - while ($b <= $t) { - $p = floor(($b+$t)/2); - $d = $inData[$p][0]; - if ($d < $inFindFrom) - $b = $p + 1; - else if ($d > $inFindFrom) - $t = $p - 1; - else { - $b = $p; - break; - } - } - if ($inFindFrom == $inData[$b][0]) { - // add or subtract 1 - $b = ($inFindForward ? ($b+1 > $l-1 ? 0 : $b+1) : ($b-1 < 0 ? $l-1 : $b-1) ); - } - else if (!$inFindForward) - // subtract 1 - $b = ($b-1 < 0 ? $l-1 : $b-1); - } - return $inData[$b][0]; - } - - function buildFindWhere($inFindData, $inKey, $inCol) { - $o = Array(); - foreach($inFindData as $row) - $o[] = $inCol . "='" . $row[$inKey] . "'"; - return (count($o) ? ' WHERE ' . implode(' OR ', $o) : ''); - } - - function find($inFindCol, $inFind='', $inOb='', $inFindFrom=0, $inFindForward=true, $inFullText=true) { - global $table; - // build order by clause - $desc = (boolean)getPostString("desc"); - if (!$inOb) - $inOb = getOrderBy(); - if ($inOb) - $inOb = "`" . $inOb . "`" ; - $orderby = ($inOb ? " ORDER BY $inOb " . ($desc ? " DESC" : "") : ""); - // update inputs from post - if (!$inFind) - $inFind = getPostString('findText'); - if (!$inFindCol) - $inFindCol = getPostString('findCol'); - if (empty($inFindFrom)) - $inFindFrom = getPostString('findFrom'); - $ff = getPostString('findForward'); - if ($ff) - $inFindForward = (strtolower($ff) == 'true' ? true : false); - $ft = getPostString('findFullText'); - if ($ft) - $inFullText = (strtolower($ft) == 'true' ? true : false); - - // get find data - $f = findData($inFindCol, $inFind, $orderby, $inFullText); - $pk = getPk(); - - // execute query - $where = buildFindWhere($f, $pk->index, 'f'); - $query = "SELECT Row, f FROM (SELECT @row := @row + 1 AS Row, $pk->name as f FROM `$table` $orderby) AS tempTable $where"; - mysql_query('SET @row = -1;'); - if (!$result = mysql_query($query)) - error("failed to perform query: $query. " . mysql_error()); - - // return row number - return findRow(getArray($result), $inFindFrom, $inFindForward); - } - - // our command list - $cmds = array( - "count" => "rowcount", - "select" => "select", - "update" => "update", - "insert" => "insert", - "delete" => "delete", - "find" => "find", - "databases" => "getDatabases", - "tables" => "getTables", - "columns" => "getColumns", - "info" => "getTableInfo" - ); - - // process input params - $cmd = @$_POST["command"]; - - //$cmd="select"; - - // dispatch command - $func = @$cmds[$cmd]; - if (function_exists($func)) - echoJson(call_user_func($func)); - else - error("bad command"); -?> diff --git a/includes/js/dojox/grid/tests/support/geography.xml b/includes/js/dojox/grid/tests/support/geography.xml deleted file mode 100644 index 070a8c1..0000000 --- a/includes/js/dojox/grid/tests/support/geography.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - geography.opml - 2006-11-10 - 2006-11-13 - Magellan, Ferdinand - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/includes/js/dojox/grid/tests/support/json.php b/includes/js/dojox/grid/tests/support/json.php deleted file mode 100644 index 84e3dfa..0000000 --- a/includes/js/dojox/grid/tests/support/json.php +++ /dev/null @@ -1,794 +0,0 @@ - -* @author Matt Knapp -* @author Brett Stimmerman -* @copyright 2005 Michal Migurski -* @license http://www.opensource.org/licenses/bsd-license.php -* @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198 -*/ - -/** -* Marker constant for Services_JSON::decode(), used to flag stack state -*/ -define('SERVICES_JSON_SLICE', 1); - -/** -* Marker constant for Services_JSON::decode(), used to flag stack state -*/ -define('SERVICES_JSON_IN_STR', 2); - -/** -* Marker constant for Services_JSON::decode(), used to flag stack state -*/ -define('SERVICES_JSON_IN_ARR', 4); - -/** -* Marker constant for Services_JSON::decode(), used to flag stack state -*/ -define('SERVICES_JSON_IN_OBJ', 8); - -/** -* Marker constant for Services_JSON::decode(), used to flag stack state -*/ -define('SERVICES_JSON_IN_CMT', 16); - -/** -* Behavior switch for Services_JSON::decode() -*/ -define('SERVICES_JSON_LOOSE_TYPE', 10); - -/** -* Behavior switch for Services_JSON::decode() -*/ -define('SERVICES_JSON_STRICT_TYPE', 11); - -/** -* Encodings -*/ -define('SERVICES_JSON_ISO_8859_1', 'iso-8859-1'); -define('SERVICES_JSON_UTF_8', 'utf-8'); - -/** -* Converts to and from JSON format. -* -* Brief example of use: -* -* -* // create a new instance of Services_JSON -* $json = new Services_JSON(); -* -* // convert a complexe value to JSON notation, and send it to the browser -* $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4))); -* $output = $json->encode($value); -* -* print($output); -* // prints: ["foo","bar",[1,2,"baz"],[3,[4]]] -* -* // accept incoming POST data, assumed to be in JSON notation -* $input = file_get_contents('php://input', 1000000); -* $value = $json->decode($input); -* -*/ -class Services_JSON -{ - /** - * constructs a new JSON instance - * - //>> SJM2005 - * @param string $encoding Strings are input/output in this encoding - * @param int $encode Encode input is expected in this character encoding - //<< SJM2005 - * - * @param int $use object behavior: when encoding or decoding, - * be loose or strict about object/array usage - * - * possible values: - * - SERVICES_JSON_STRICT_TYPE: strict typing, default. - * "{...}" syntax creates objects in decode(). - * - SERVICES_JSON_LOOSE_TYPE: loose typing. - * "{...}" syntax creates associative arrays in decode(). - */ - function Services_JSON($encoding = SERVICES_JSON_UTF_8, $use = SERVICES_JSON_STRICT_TYPE) - { - //>> SJM2005 - $this->encoding = $encoding; - //<< SJM2005 - - $this->use = $use; - } - - /** - * convert a string from one UTF-16 char to one UTF-8 char - * - * Normally should be handled by mb_convert_encoding, but - * provides a slower PHP-only method for installations - * that lack the multibye string extension. - * - * @param string $utf16 UTF-16 character - * @return string UTF-8 character - * @access private - */ - function utf162utf8($utf16) - { - // oh please oh please oh please oh please oh please - if(function_exists('mb_convert_encoding')) - return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16'); - - $bytes = (ord($utf16{0}) << 8) | ord($utf16{1}); - - switch(true) { - case ((0x7F & $bytes) == $bytes): - // this case should never be reached, because we are in ASCII range - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0x7F & $bytes); - - case (0x07FF & $bytes) == $bytes: - // return a 2-byte UTF-8 character - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0xC0 | (($bytes >> 6) & 0x1F)) - . chr(0x80 | ($bytes & 0x3F)); - - case (0xFFFF & $bytes) == $bytes: - // return a 3-byte UTF-8 character - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0xE0 | (($bytes >> 12) & 0x0F)) - . chr(0x80 | (($bytes >> 6) & 0x3F)) - . chr(0x80 | ($bytes & 0x3F)); - } - - // ignoring UTF-32 for now, sorry - return ''; - } - - /** - * convert a string from one UTF-8 char to one UTF-16 char - * - * Normally should be handled by mb_convert_encoding, but - * provides a slower PHP-only method for installations - * that lack the multibye string extension. - * - * @param string $utf8 UTF-8 character - * @return string UTF-16 character - * @access private - */ - function utf82utf16($utf8) - { - // oh please oh please oh please oh please oh please - if(function_exists('mb_convert_encoding')) - return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); - - switch(strlen($utf8)) { - case 1: - // this case should never be reached, because we are in ASCII range - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return $utf8; - - case 2: - // return a UTF-16 character from a 2-byte UTF-8 char - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0x07 & (ord($utf8{0}) >> 2)) - . chr((0xC0 & (ord($utf8{0}) << 6)) - | (0x3F & ord($utf8{1}))); - - case 3: - // return a UTF-16 character from a 3-byte UTF-8 char - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr((0xF0 & (ord($utf8{0}) << 4)) - | (0x0F & (ord($utf8{1}) >> 2))) - . chr((0xC0 & (ord($utf8{1}) << 6)) - | (0x7F & ord($utf8{2}))); - } - - // ignoring UTF-32 for now, sorry - return ''; - } - - /** - * encodes an arbitrary variable into JSON format - * - * @param mixed $var any number, boolean, string, array, or object to be encoded. - * see argument 1 to Services_JSON() above for array-parsing behavior. - * if var is a strng, note that encode() always expects it - * to be in ASCII or UTF-8 format! - * - * @return string JSON string representation of input var - * @access public - */ - function encode($var) - { - switch (gettype($var)) { - case 'boolean': - return $var ? 'true' : 'false'; - - case 'NULL': - return 'null'; - - case 'integer': - return (int) $var; - - case 'double': - case 'float': - return (float) $var; - - case 'string': - //>> SJM2005 - if ($this->encoding == SERVICES_JSON_UTF_8) - ; - else if ($this->encoding == SERVICES_JSON_ISO_8859_1) - $var = utf8_encode($var); - else if (!function_exists('mb_convert_encoding')) - die('Requested encoding requires mb_strings extension.'); - else - $var = mb_convert_encoding($var, "utf-8", $this->encoding); - //<< SJM2005 - - // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT - $ascii = ''; - $strlen_var = strlen($var); - - /* - * Iterate over every character in the string, - * escaping with a slash or encoding to UTF-8 where necessary - */ - for ($c = 0; $c < $strlen_var; ++$c) { - - $ord_var_c = ord($var{$c}); - - switch (true) { - case $ord_var_c == 0x08: - $ascii .= '\b'; - break; - case $ord_var_c == 0x09: - $ascii .= '\t'; - break; - case $ord_var_c == 0x0A: - $ascii .= '\n'; - break; - case $ord_var_c == 0x0C: - $ascii .= '\f'; - break; - case $ord_var_c == 0x0D: - $ascii .= '\r'; - break; - - case $ord_var_c == 0x22: - case $ord_var_c == 0x2F: - case $ord_var_c == 0x5C: - // double quote, slash, slosh - $ascii .= '\\'.$var{$c}; - break; - - case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): - // characters U-00000000 - U-0000007F (same as ASCII) - $ascii .= $var{$c}; - break; - - case (($ord_var_c & 0xE0) == 0xC0): - // characters U-00000080 - U-000007FF, mask 110XXXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, ord($var{$c + 1})); - $c += 1; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xF0) == 0xE0): - // characters U-00000800 - U-0000FFFF, mask 1110XXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2})); - $c += 2; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xF8) == 0xF0): - // characters U-00010000 - U-001FFFFF, mask 11110XXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3})); - $c += 3; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xFC) == 0xF8): - // characters U-00200000 - U-03FFFFFF, mask 111110XX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4})); - $c += 4; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xFE) == 0xFC): - // characters U-04000000 - U-7FFFFFFF, mask 1111110X - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4}), - ord($var{$c + 5})); - $c += 5; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - } - } - - return '"'.$ascii.'"'; - - case 'array': - /* - * As per JSON spec if any array key is not an integer - * we must treat the the whole array as an object. We - * also try to catch a sparsely populated associative - * array with numeric keys here because some JS engines - * will create an array with empty indexes up to - * max_index which can cause memory issues and because - * the keys, which may be relevant, will be remapped - * otherwise. - * - * As per the ECMA and JSON specification an object may - * have any string as a property. Unfortunately due to - * a hole in the ECMA specification if the key is a - * ECMA reserved word or starts with a digit the - * parameter is only accessible using ECMAScript's - * bracket notation. - */ - - // treat as a JSON object - if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { - return '{' . - join(',', array_map(array($this, 'name_value'), - array_keys($var), - array_values($var))) - . '}'; - } - - // treat it like a regular array - return '[' . join(',', array_map(array($this, 'encode'), $var)) . ']'; - - case 'object': - $vars = get_object_vars($var); - return '{' . - join(',', array_map(array($this, 'name_value'), - array_keys($vars), - array_values($vars))) - . '}'; - - default: - return ''; - } - } - - /** - * array-walking function for use in generating JSON-formatted name-value pairs - * - * @param string $name name of key to use - * @param mixed $value reference to an array element to be encoded - * - * @return string JSON-formatted name-value pair, like '"name":value' - * @access private - */ - function name_value($name, $value) - { - return $this->encode(strval($name)) . ':' . $this->encode($value); - } - - /** - * reduce a string by removing leading and trailing comments and whitespace - * - * @param $str string string value to strip of comments and whitespace - * - * @return string string value stripped of comments and whitespace - * @access private - */ - function reduce_string($str) - { - $str = preg_replace(array( - - // eliminate single line comments in '// ...' form - '#^\s*//(.+)$#m', - - // eliminate multi-line comments in '/* ... */' form, at start of string - '#^\s*/\*(.+)\*/#Us', - - // eliminate multi-line comments in '/* ... */' form, at end of string - '#/\*(.+)\*/\s*$#Us' - - ), '', $str); - - // eliminate extraneous space - return trim($str); - } - - /** - * decodes a JSON string into appropriate variable - * - * @param string $str JSON-formatted string - * - * @return mixed number, boolean, string, array, or object - * corresponding to given JSON input string. - * See argument 1 to Services_JSON() above for object-output behavior. - * Note that decode() always returns strings - * in ASCII or UTF-8 format! - * @access public - */ - function decode($str) - { - $str = $this->reduce_string($str); - - switch (strtolower($str)) { - case 'true': - return true; - - case 'false': - return false; - - case 'null': - return null; - - default: - if (is_numeric($str)) { - // Lookie-loo, it's a number - - // This would work on its own, but I'm trying to be - // good about returning integers where appropriate: - // return (float)$str; - - // Return float or int, as appropriate - return ((float)$str == (integer)$str) - ? (integer)$str - : (float)$str; - - } elseif (preg_match('/^("|\').+(\1)$/s', $str, $m) && $m[1] == $m[2]) { - // STRINGS RETURNED IN UTF-8 FORMAT - $delim = substr($str, 0, 1); - $chrs = substr($str, 1, -1); - $utf8 = ''; - $strlen_chrs = strlen($chrs); - - for ($c = 0; $c < $strlen_chrs; ++$c) { - - $substr_chrs_c_2 = substr($chrs, $c, 2); - $ord_chrs_c = ord($chrs{$c}); - - switch (true) { - case $substr_chrs_c_2 == '\b': - $utf8 .= chr(0x08); - ++$c; - break; - case $substr_chrs_c_2 == '\t': - $utf8 .= chr(0x09); - ++$c; - break; - case $substr_chrs_c_2 == '\n': - $utf8 .= chr(0x0A); - ++$c; - break; - case $substr_chrs_c_2 == '\f': - $utf8 .= chr(0x0C); - ++$c; - break; - case $substr_chrs_c_2 == '\r': - $utf8 .= chr(0x0D); - ++$c; - break; - - case $substr_chrs_c_2 == '\\"': - case $substr_chrs_c_2 == '\\\'': - case $substr_chrs_c_2 == '\\\\': - case $substr_chrs_c_2 == '\\/': - if (($delim == '"' && $substr_chrs_c_2 != '\\\'') || - ($delim == "'" && $substr_chrs_c_2 != '\\"')) { - $utf8 .= $chrs{++$c}; - } - break; - - case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)): - //echo ' matching single escaped unicode character from ' . substr($chrs, $c, 6); - // single, escaped unicode character - $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2))) - . chr(hexdec(substr($chrs, ($c + 4), 2))); - $utf8 .= $this->utf162utf8($utf16); - $c += 5; - break; - - case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F): - $utf8 .= $chrs{$c}; - break; - - case ($ord_chrs_c & 0xE0) == 0xC0: - // characters U-00000080 - U-000007FF, mask 110XXXXX - //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 2); - ++$c; - break; - - case ($ord_chrs_c & 0xF0) == 0xE0: - // characters U-00000800 - U-0000FFFF, mask 1110XXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 3); - $c += 2; - break; - - case ($ord_chrs_c & 0xF8) == 0xF0: - // characters U-00010000 - U-001FFFFF, mask 11110XXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 4); - $c += 3; - break; - - case ($ord_chrs_c & 0xFC) == 0xF8: - // characters U-00200000 - U-03FFFFFF, mask 111110XX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 5); - $c += 4; - break; - - case ($ord_chrs_c & 0xFE) == 0xFC: - // characters U-04000000 - U-7FFFFFFF, mask 1111110X - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 6); - $c += 5; - break; - - } - - } - - //>> SJM2005 - if ($this->encoding == SERVICES_JSON_UTF_8) - return $utf8; - if ($this->encoding == SERVICES_JSON_ISO_8859_1) - return utf8_decode($utf8); - else if (!function_exists('mb_convert_encoding')) - die('Requested encoding requires mb_strings extension.'); - else - return mb_convert_encoding($utf8, $this->encoding, SERVICES_JSON_UTF_8); - //<< SJM2005 - - return $utf8; - - } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) { - // array, or object notation - if ($str{0} == '[') { - $stk = array(SERVICES_JSON_IN_ARR); - $arr = array(); - } else { - if ($this->use == SERVICES_JSON_LOOSE_TYPE) { - $stk = array(SERVICES_JSON_IN_OBJ); - $obj = array(); - } else { - $stk = array(SERVICES_JSON_IN_OBJ); - $obj = new stdClass(); - } - } - - array_push($stk, array('what' => SERVICES_JSON_SLICE, - 'where' => 0, - 'delim' => false)); - - $chrs = substr($str, 1, -1); - $chrs = $this->reduce_string($chrs); - - if ($chrs == '') { - if (reset($stk) == SERVICES_JSON_IN_ARR) { - return $arr; - - } else { - return $obj; - - } - } - - //print("\nparsing {$chrs}\n"); - - $strlen_chrs = strlen($chrs); - for ($c = 0; $c <= $strlen_chrs; ++$c) { - - $top = end($stk); - $substr_chrs_c_2 = substr($chrs, $c, 2); - - if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) { - // found a comma that is not inside a string, array, etc., - // OR we've reached the end of the character list - $slice = substr($chrs, $top['where'], ($c - $top['where'])); - array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false)); - //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - if (reset($stk) == SERVICES_JSON_IN_ARR) { - // we are in an array, so just push an element onto the stack - array_push($arr, $this->decode($slice)); - - } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) { - // we are in an object, so figure - // out the property name and set an - // element in an associative array, - // for now - if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) { - // "name":value pair - $key = $this->decode($parts[1]); - $val = $this->decode($parts[2]); - - if ($this->use == SERVICES_JSON_LOOSE_TYPE) { - $obj[$key] = $val; - } else { - $obj->$key = $val; - } - } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) { - // name:value pair, where name is unquoted - $key = $parts[1]; - $val = $this->decode($parts[2]); - - if ($this->use == SERVICES_JSON_LOOSE_TYPE) { - $obj[$key] = $val; - } else { - $obj->$key = $val; - } - } - - } - - } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) { - // found a quote, and we are not inside a string - array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c})); - //print("Found start of string at {$c}\n"); - - //>> SAO2006 - /*} elseif (($chrs{$c} == $top['delim']) && - ($top['what'] == SERVICES_JSON_IN_STR) && - (($chrs{$c - 1} != '\\') || - ($chrs{$c - 1} == '\\' && $chrs{$c - 2} == '\\'))) {*/ - } elseif ($chrs{$c} == $top['delim'] && - $top['what'] == SERVICES_JSON_IN_STR) { - //print("Found potential end of string at {$c}\n"); - // verify quote is not escaped: it has no or an even number of \\ before it. - for ($i=0; ($chrs{$c - ($i+1)} == '\\'); $i++); - /*$i = 0; - while ( $chrs{$c - ($i+1)} == '\\') - $i++;*/ - //print("Found {$i} \ before delim\n"); - if ($i % 2 != 0) - { - //print("delim escaped, not end of string\n"); - continue; - } - //>> SAO2006 - // found a quote, we're in a string, and it's not escaped - array_pop($stk); - //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n"); - - } elseif (($chrs{$c} == '[') && - in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { - // found a left-bracket, and we are in an array, object, or slice - array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false)); - //print("Found start of array at {$c}\n"); - - } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) { - // found a right-bracket, and we're in an array - array_pop($stk); - //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - } elseif (($chrs{$c} == '{') && - in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { - // found a left-brace, and we are in an array, object, or slice - array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false)); - //print("Found start of object at {$c}\n"); - - } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) { - // found a right-brace, and we're in an object - array_pop($stk); - //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - } elseif (($substr_chrs_c_2 == '/*') && - in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { - // found a comment start, and we are in an array, object, or slice - array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false)); - $c++; - //print("Found start of comment at {$c}\n"); - - } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) { - // found a comment end, and we're in one now - array_pop($stk); - $c++; - - for ($i = $top['where']; $i <= $c; ++$i) - $chrs = substr_replace($chrs, ' ', $i, 1); - - //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - } - - } - - if (reset($stk) == SERVICES_JSON_IN_ARR) { - return $arr; - - } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) { - return $obj; - - } - - } - } - } - -} - - /*function hex($s) - { - $l = strlen($s); - for ($i=0; $i < $l; $i++) - //echo '['.(ord($s{$i})).']'; - echo '['.bin2hex($s{$i}).']'; - } - - //$d = '["hello world\\""]'; - $d = '["\\\\\\"hello world,\\\\\\""]'; - //$d = '["\\\\", "\\\\"]'; - hex($d); - $test = new Services_JSON(); - echo('
');
-	print_r($d . "\n");
-	print_r($test->decode($d));
-	echo('
'); - */ -?> \ No newline at end of file diff --git a/includes/js/dojox/grid/tests/support/movies.csv b/includes/js/dojox/grid/tests/support/movies.csv deleted file mode 100644 index baf71eb..0000000 --- a/includes/js/dojox/grid/tests/support/movies.csv +++ /dev/null @@ -1,9 +0,0 @@ -Title, Year, Producer -City of God, 2002, Katia Lund -Rain,, Christine Jeffs -2001: A Space Odyssey, , Stanley Kubrick -"This is a ""fake"" movie title", 1957, Sidney Lumet -Alien, 1979 , Ridley Scott -"The Sequel to ""Dances With Wolves.""", 1982, Ridley Scott -"Caine Mutiny, The", 1954, "Dymtryk ""the King"", Edward" - diff --git a/includes/js/dojox/grid/tests/support/test_data.js b/includes/js/dojox/grid/tests/support/test_data.js deleted file mode 100644 index 4707380..0000000 --- a/includes/js/dojox/grid/tests/support/test_data.js +++ /dev/null @@ -1,30 +0,0 @@ -// example sample data and code -(function(){ - // some sample data - // global var "data" - data = [ - [ "normal", false, "new", 'But are not followed by two hexadecimal', 29.91, 10, false ], - [ "important", false, "new", 'Because a % sign always indicates', 9.33, -5, false ], - [ "important", false, "read", 'Signs can be selectively', 19.34, 0, true ], - [ "note", false, "read", 'However the reserved characters', 15.63, 0, true ], - [ "normal", false, "replied", 'It is therefore necessary', 24.22, 5.50, true ], - [ "important", false, "replied", 'To problems of corruption by', 9.12, -3, true ], - [ "note", false, "replied", 'Which would simply be awkward in', 12.15, -4, false ] - ]; - var rows = 100; - for(var i=0, l=data.length; i{text}', {href: inData[0], text: inData[1] }); -}; - -formatImage = function(inData, inRowIndex) { - if (!inData[0] || !inData[1]) - return ' '; - var o = { - href: inData[0], - src: inData[1].Url, - width: inData[1].Width, - height: inData[1].Height - } - return turbo.supplant('', o); -}; - -formatDate = function(inDatum, inRowIndex) { - if (inDatum == '') - return ' '; - var d = new Date(inDatum * 1000); - return turbo.printf('%s/%s/%s', d.getMonth(), d.getDate(), d.getFullYear()); -}; - -formatDimensions = function(inData, inRowIndex) { - if (!inData[0] || !inData[1]) - return ' '; - return inData[0] + ' x ' + inData[1]; -} -- cgit v1.2.3