Page MenuHomePhorge
Files F223830

No OneTemporary
Actions

View Options

diff --git a/bin/jsshrink.sh b/bin/jsshrink.sh
index 1d77ff388..c79f90405 100755
--- a/bin/jsshrink.sh
+++ b/bin/jsshrink.sh
@@ -1,67 +1,67 @@
#!/bin/sh
JS_DIR=`dirname "$0"`/../program/js
JAR_DIR='/tmp'
LANG_IN='ECMASCRIPT3'
CLOSURE_COMPILER_URL='http://closure-compiler.googlecode.com/files/compiler-latest.zip'
do_shrink() {
rm -f "$2"
java -jar $JAR_DIR/compiler.jar --compilation_level=SIMPLE_OPTIMIZATIONS --js="$1" --js_output_file="$2" --language_in="$3"
}
if [ ! -d "$JS_DIR" ]; then
echo "Directory $JS_DIR not found."
exit 1
fi
if [ ! -w "$JAR_DIR" ]; then
JAR_DIR=`dirname "$0"`
fi
if java -version >/dev/null 2>&1; then
:
else
echo "Java not found. Please ensure that the 'java' program is in your PATH."
exit 1
fi
if [ ! -r "$JAR_DIR/compiler.jar" ]; then
if which wget >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
wget "$CLOSURE_COMPILER_URL" -O "/tmp/$$.zip"
elif which curl >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
curl "$CLOSURE_COMPILER_URL" -o "/tmp/$$.zip"
else
echo "Please download $CLOSURE_COMPILER_URL and extract compiler.jar to $JAR_DIR/."
exit 1
fi
(cd $JAR_DIR && unzip "/tmp/$$.zip" "compiler.jar")
rm -f "/tmp/$$.zip"
fi
# compress single file from argument
if [ $# -gt 0 ]; then
JS_DIR=`dirname "$1"`
JS_FILE="$1"
if [ $# -gt 1 ]; then
LANG_IN="$2"
fi
if [ ! -r "${JS_FILE}.src" ]; then
mv "$JS_FILE" "${JS_FILE}.src"
fi
echo "Shrinking $JS_FILE"
do_shrink "${JS_FILE}.src" "$JS_FILE" "$LANG_IN"
exit
fi
# default: compress application scripts
-for fn in app common googiespell list; do
+for fn in app common googiespell list treelist; do
if [ -r "$JS_DIR/${fn}.js.src" ]; then
echo "$JS_DIR/${fn}.js.src already exists, not overwriting"
else
mv "$JS_DIR/${fn}.js" "$JS_DIR/${fn}.js.src"
fi
echo "Shrinking $JS_DIR/${fn}.js"
do_shrink "$JS_DIR/${fn}.js.src" "$JS_DIR/${fn}.js" "$LANG_IN"
done
diff --git a/bin/jsunshrink.sh b/bin/jsunshrink.sh
index 9d7755092..ef1bb47a1 100755
--- a/bin/jsunshrink.sh
+++ b/bin/jsunshrink.sh
@@ -1,14 +1,14 @@
#!/bin/sh
JS_DIR=`dirname "$0"`/../program/js
if [ ! -d "$JS_DIR" ]; then
echo "Directory $JS_DIR not found."
exit 1
fi
-for fn in app common googiespell list; do
+for fn in app common googiespell list treelist; do
if [ -r "$JS_DIR/${fn}.js.src" ]; then
mv "$JS_DIR/${fn}.js.src" "$JS_DIR/${fn}.js"
echo "Reverted $JS_DIR/${fn}.js"
fi
done
diff --git a/program/lib/Roundcube/rcube_result_set.php b/program/lib/Roundcube/rcube_result_set.php
index 1391e5e4b..a4b070e28 100644
--- a/program/lib/Roundcube/rcube_result_set.php
+++ b/program/lib/Roundcube/rcube_result_set.php
@@ -1,68 +1,91 @@
<?php
/*
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2006-2011, The Roundcube Dev Team |
+ | Copyright (C) 2006-2013, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
| See the README file for a full license statement. |
| |
| PURPOSE: |
| Class representing an address directory result set |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
*/
/**
- * Roundcube result set class.
+ * Roundcube result set class
+ *
* Representing an address directory result set.
+ * Implenets Iterator and thus be used in foreach() loops.
*
* @package Framework
* @subpackage Addressbook
*/
-class rcube_result_set
+class rcube_result_set implements Iterator
{
- var $count = 0;
- var $first = 0;
- var $current = 0;
- var $searchonly = false;
- var $records = array();
+ public $count = 0;
+ public $first = 0;
+ public $searchonly = false;
+ public $records = array();
+ private $current = 0;
function __construct($c=0, $f=0)
{
$this->count = (int)$c;
$this->first = (int)$f;
}
function add($rec)
{
$this->records[] = $rec;
}
function iterate()
{
return $this->records[$this->current++];
}
function first()
{
$this->current = 0;
- return $this->records[$this->current++];
+ return $this->records[$this->current];
+ }
+
+ function seek($i)
+ {
+ $this->current = $i;
+ }
+
+ /*** PHP 5 Iterator interface ***/
+
+ function rewind()
+ {
+ $this->current = 0;
+ }
+
+ function current()
+ {
+ return $this->records[$this->current];
+ }
+
+ function key()
+ {
+ return $this->current;
}
- // alias for iterate()
function next()
{
return $this->iterate();
}
- function seek($i)
+ function valid()
{
- $this->current = $i;
+ return isset($this->records[$this->current]);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 5:56 AM (1 d, 20 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
166049
Default Alt Text
(5 KB)

Event Timeline