Avant-Première Hanna Arendt : Tweet Wall

# HG changeset patch # User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> # Date 1366574064 -7200 # Node ID 1e110b03ae9614caf1daf34de4836bcaecd9f032 # Parent 2251fb41dbc7a44a43695238702873366d85cc63# Parent 82982f1ba7382a071c291a591040159ebbc05361 Merge with 3f065d9fff36d44448d653295ac4dc40e1a56967 diff -r 2251fb41dbc7 -r 1e110b03ae96 .project --- a/.project Sun Apr 21 10:07:03 2013 +0200 +++ b/.project Sun Apr 21 21:54:24 2013 +0200 @@ -6,24 +6,19 @@ - org.eclipse.ui.externaltools.ExternalToolBuilder - full,incremental, + org.python.pydev.PyDevBuilder - - LaunchConfigHandle - <project>/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch - - org.python.pydev.PyDevBuilder + com.aptana.ide.core.unifiedBuilder + com.aptana.projects.webnature org.python.pydev.pythonNature - org.eclipse.wst.jsdt.core.jsNature diff -r 2251fb41dbc7 -r 1e110b03ae96 .pydevproject diff -r 2251fb41dbc7 -r 1e110b03ae96 script/lib/iri_tweet/iri_tweet/utils.py --- a/script/lib/iri_tweet/iri_tweet/utils.py Sun Apr 21 10:07:03 2013 +0200 +++ b/script/lib/iri_tweet/iri_tweet/utils.py Sun Apr 21 21:54:24 2013 +0200 @@ -416,8 +416,8 @@ 'id': self.json_dict["id"], 'id_str': self.json_dict["id_str"], #'in_reply_to_screen_name': ts["to_user"], - 'in_reply_to_user_id': self.json_dict["to_user_id"], - 'in_reply_to_user_id_str': self.json_dict["to_user_id_str"], + 'in_reply_to_user_id': self.json_dict.get("in_reply_to_user_id",None), + 'in_reply_to_user_id_str': self.json_dict.get("in_reply_to_user_id_str", None), #'place': ts["place"], 'source': self.json_dict["source"], 'text': self.json_dict["text"], @@ -625,3 +625,4 @@ writer.flush() return writer + diff -r 2251fb41dbc7 -r 1e110b03ae96 script/stream/recorder_stream.py diff -r 2251fb41dbc7 -r 1e110b03ae96 script/utils/export_twitter_alchemy.py --- a/script/utils/export_twitter_alchemy.py Sun Apr 21 10:07:03 2013 +0200 +++ b/script/utils/export_twitter_alchemy.py Sun Apr 21 21:54:24 2013 +0200 @@ -2,14 +2,15 @@ # coding=utf-8 from lxml import etree -from iri_tweet.models import setup_database +from iri_tweet.models import setup_database, Tweet, User from optparse import OptionParser #@UnresolvedImport -from sqlalchemy import Table, Column, BigInteger +from sqlalchemy import Table, Column, BigInteger, event, bindparam +from sqlalchemy.sql import select, func from iri_tweet.utils import (set_logging_options, set_logging, get_filter_query, get_logger) import anyjson import datetime -import httplib2 +import requests import os.path import re import sys @@ -24,6 +25,15 @@ # def __repr__(self): # return "" % (self.id) +LDT_CONTENT_REST_API_PATH = "api/ldt/1.0/contents/" +LDT_PROJECT_REST_API_PATH = "api/ldt/1.0/projects/" + +def re_fn(expr, item): + reg = re.compile(expr, re.I) + res = reg.search(item) + if res: + get_logger().debug("re_fn : " + repr(expr) + "~" + repr(item)) #@UndefinedVariable + return res is not None def parse_polemics(tw, extended_mode): """ @@ -87,6 +97,12 @@ help="list of file to process", metavar="LIST_CONF", default=None) parser.add_option("-E", "--extended", dest="extended_mode", action="store_true", help="Trigger polemic extended mode", metavar="EXTENDED", default=False) + parser.add_option("-b", "--base-url", dest="base_url", + help="base URL of the platform", metavar="BASE_URL", default="http://ldt.iri.centrepompidou.fr/ldtplatform/") + parser.add_option("-p", "--project", dest="project_id", + help="Project id", metavar="PROJECT_ID", default=None) + parser.add_option("-P", "--post-param", dest="post_param", + help="Post param", metavar="POST_PARAM", default=None) parser.add_option("--user-whitelist", dest="user_whitelist", action="store", help="A list of user screen name", metavar="USER_WHITELIST",default=None) @@ -116,7 +132,10 @@ engine, metadata, Session = setup_database(conn_str, echo=((options.verbose-options.quiet)>0), create_all = False) conn = None try : - conn = engine.connect() + conn = engine.connect() + @event.listens_for(conn, "begin") + def do_begin(conn): + conn.connection.create_function('regexp', 2, re_fn) session = None try : session = Session(bind=conn) @@ -127,8 +146,32 @@ if options.exclude and os.path.exists(options.exclude): with open(options.exclude, 'r+') as f: tei = tweet_exclude_table.insert() + ex_regexp = re.compile("(?P\w+)(?P[~=])(?P.+)", re.I) for line in f: - conn.execute(tei.values(id=long(line.strip()))) + res = ex_regexp.match(line.strip()) + if res: + if res.group('field') == "id": + conn.execute(tei.values(id=res.group('value'))) + else: + exclude_query = session.query(Tweet) + filter_obj = Tweet + filter_field = res.group('field') + if filter_field.startswith("user__"): + exclude_query = exclude_query.outerjoin(User, Tweet.user_id==User.id) + filter_obj = User + filter_field = filter_field[len("user__"):] + + if res.group('op') == "=": + exclude_query = exclude_query.filter(getattr(filter_obj, filter_field) == res.group('value')) + else: + exclude_query = exclude_query.filter(getattr(filter_obj, filter_field).op('regexp')(res.group('value'))) + + test_query = select([func.count()]).where(tweet_exclude_table.c.id==bindparam('t_id')) + for t in exclude_query.all(): + get_logger().debug("t : " + repr(t)) + if conn.execute(test_query, t_id=t.id).fetchone()[0] == 0: + conn.execute(tei.values(id=t.id)) + user_whitelist_file = options.user_whitelist user_whitelist = None @@ -141,6 +184,11 @@ for snode in node: if snode.tag == "path": params['content_file'] = snode.text + params['content_file_write'] = snode.text + elif snode.tag == "project_id": + params['content_file'] = options.base_url + LDT_PROJECT_REST_API_PATH + snode.text + "/?format=json" + params['content_file_write'] = options.base_url + LDT_PROJECT_REST_API_PATH + snode.text + "/?format=json" + params['project_id'] = snode.text elif snode.tag == "start_date": params['start_date'] = snode.text elif snode.tag == "end_date": @@ -152,15 +200,24 @@ if options.hashtag or 'hashtags' not in params : params['hashtags'] = options.hashtag parameters.append(params) - else: + else: + if options.project_id: + content_file = options.base_url + LDT_PROJECT_REST_API_PATH + options.project_id + "/?format=json" + else: + content_file = options.content_file parameters = [{ 'start_date': options.start_date, 'end_date' : options.end_date, 'duration' : options.duration, - 'content_file' : options.content_file, - 'hashtags' : options.hashtag + 'content_file' : content_file, + 'content_file_write' : content_file, + 'hashtags' : options.hashtag, + 'project_id' : options.project_id }] - + post_param = {} + if options.post_param: + post_param = anyjson.loads(options.post_param) + for params in parameters: get_logger().debug("PARAMETERS " + repr(params)) #@UndefinedVariable @@ -169,6 +226,7 @@ end_date_str = params.get("end_date", None) duration = params.get("duration", None) content_file = params.get("content_file", None) + content_file_write = params.get("content_file_write", None) hashtags = params.get('hashtags', []) if user_whitelist_file: @@ -181,15 +239,6 @@ start_date = parse_date(start_date_str) ts = time.mktime(start_date.timetuple()) - end_date = None - if end_date_str: - end_date = parse_date(end_date_str) - elif start_date and duration: - end_date = start_date + datetime.timedelta(seconds=duration) - - query = get_filter_query(session, start_date, end_date, hashtags, tweet_exclude_table, user_whitelist) - - query_res = query.all() root = None ensemble_parent = None @@ -200,19 +249,18 @@ get_logger().debug("url : " + content_file) #@UndefinedVariable - h = httplib2.Http() - resp, content = h.request(content_file) - - get_logger().debug("url response " + repr(resp) + " content " + repr(content)) #@UndefinedVariable - - project = anyjson.deserialize(content) - root = etree.fromstring(project["ldt"]) + r = requests.get(content_file, params=post_param) + #get_logger().debug("url response " + repr(r) + " content " + repr(r.text)) #@UndefinedVariable + project = r.json() + text_match = re.match(r"\<\?\s*xml.*?\?\>(.*)", project['ldt'], re.I|re.S) + root = etree.fromstring(text_match.group(1) if text_match else project['ldt']) elif content_file and os.path.exists(content_file): doc = etree.parse(content_file) root = doc.getroot() - + + content_id = None if root is None: @@ -227,6 +275,8 @@ content = etree.SubElement(annotations, u"content", {u"id":unicode(options.content_id)}) ensemble_parent = content + content_id = options.content_id + if ensemble_parent is None: file_type = None @@ -249,6 +299,7 @@ if content_node is None: content_node = etree.SubElement(annotations_node,u"content", id=media.get(u"id")) ensemble_parent = content_node + content_id = content_node.get(u"id") elif file_type == "iri": body_node = root.find(u"body") if body_node is None: @@ -257,6 +308,7 @@ if ensembles_node is None: ensembles_node = etree.SubElement(body_node, u"ensembles") ensemble_parent = ensembles_node + content_id = root.xpath("head/meta[@name='id']/@content")[0] if ensemble_parent is None: @@ -285,6 +337,25 @@ elements = etree.SubElement(decoupage, u"elements") + end_date = None + if end_date_str: + end_date = parse_date(end_date_str) + elif start_date and duration: + end_date = start_date + datetime.timedelta(seconds=duration) + elif start_date and options.base_url: + # get duration from api + content_url = options.base_url + LDT_CONTENT_REST_API_PATH + content_id + "/?format=json" + r = requests.get(content_url) + duration = int(r.json()['duration']) + get_logger().debug("get duration " + content_url) #@UndefinedVariable + get_logger().debug("get duration " + repr(duration)) #@UndefinedVariable + + end_date = start_date + datetime.timedelta(seconds=int(duration/1000)) + + query = get_filter_query(session, start_date, end_date, hashtags, tweet_exclude_table, user_whitelist) + + query_res = query.all() + for tw in query_res: tweet_ts_dt = tw.created_at @@ -333,21 +404,23 @@ output_data = etree.tostring(root, encoding="utf-8", method="xml", pretty_print=False, xml_declaration=True) - if content_file and content_file.find("http") == 0: + if content_file_write and content_file_write.find("http") == 0: project["ldt"] = output_data - body = anyjson.serialize(project) - get_logger().debug("write http " + content_file) #@UndefinedVariable - get_logger().debug("write http " + repr(body)) #@UndefinedVariable - h = httplib2.Http() - resp, content = h.request(content_file, "PUT", headers={'content-type':'application/json'}, body=body) - get_logger().debug("write http " + repr(resp) + " content " + content) #@UndefinedVariable - if resp.status != 200: - get_logger().error("Error http " + repr(resp) + " content " + content) #@UndefinedVariable - raise Exception("Error writing content : %d : %s"%(resp.status, resp.reason)) + post_param = {} + if options.post_param: + post_param = anyjson.loads(options.post_param) + + get_logger().debug("write http " + content_file_write) #@UndefinedVariable + get_logger().debug("write http " + repr(post_param)) #@UndefinedVariable + get_logger().debug("write http " + repr(project)) #@UndefinedVariable + r = requests.put(content_file_write, data=anyjson.dumps(project), headers={'content-type':'application/json'}, params=post_param); + get_logger().debug("write http " + repr(r) + " content " + r.text) #@UndefinedVariable + if r.status_code != requests.codes.ok: + r.raise_for_status() else: - if content_file and os.path.exists(content_file): - dest_file_name = content_file + if content_file_write and os.path.exists(content_file_write): + dest_file_name = content_file_write else: dest_file_name = options.filename diff -r 2251fb41dbc7 -r 1e110b03ae96 script/utils/merge_tweets.py --- a/script/utils/merge_tweets.py Sun Apr 21 10:07:03 2013 +0200 +++ b/script/utils/merge_tweets.py Sun Apr 21 21:54:24 2013 +0200 @@ -31,7 +31,9 @@ return parser.parse_args() if __name__ == "__main__": - + + sys.stdout = codecs.getwriter(sys.stdout.encoding)(sys.stdout) + options = get_option() access_token = None diff -r 2251fb41dbc7 -r 1e110b03ae96 script/virtualenv/res/lib/lib_create_env.py diff -r 2251fb41dbc7 -r 1e110b03ae96 script/virtualenv/res/src/lxml-3.1.2.tar.gz diff -r 2251fb41dbc7 -r 1e110b03ae96 script/virtualenv/res/src/requests-1.1.0.tar.gz Binary file script/virtualenv/res/src/requests-1.1.0.tar.gz has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/bpidoudou/config.php --- a/web/bpidoudou/config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/bpidoudou/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -4,7 +4,7 @@ 'title' => "Internet est-il notre nouveau doudou ?", - 'abstract' => "Cycle Cultures numériques :
De nouveaux collectifs d'auteurs
Lundi 21 janvier 2013, 19h00, entrée libre
Centre Pompidou, Petite Salle", + 'abstract' => "Cycle Cultures numériques :
Internet est-il notre nouveau doudou ?
Lundi 21 janvier 2013, 19h00, entrée libre
Centre Pompidou, Petite Salle", 'description'=> "

Internet est-il notre nouveau doudou ?

Comment caractériser la relation que nous entretenons avec les nouveaux objets de la culture numérique que sont ordinateurs, consoles, tablettes et autres smartphones ? Si nous ne suçons plus toujours nos pouces pour nous consoler, nous les posons maintenant en permanence sur des écrans tactiles, qui se laissent apprivoiser dès le plus jeune âge. Peut-on les considérer pour autant comme de véritables objets transitionnels ? Sont-ils les instruments de notre régression ou nous aident-ils à nous émanciper ? Une véritable addiction aux jeux vidéo ou aux réseaux sociaux peut-elle devenir problématique pour notre développement ou notre équilibre ?

@@ -36,7 +36,8 @@ 'rep' => basename(__DIR__), - 'partenaires'=> "chroniquesdelarentreelitteraire.com + 'partenaires'=> "Bibliothèque Publique d'Information/a> + | chroniquesdelarentreelitteraire.com | InternetActu.net | Institut de Recherche et d'Innovation", @@ -48,9 +49,9 @@ 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels - 'archive_title' => "De nouveaux collectifs d'auteurs", + 'archive_title' => "Internet est-il notre nouveau doudou ?", 'archive_description' => 'par la Bibliothèque Publique d\'Information
au Centre Pompidou le 21/01/2013 19h00', // After the event - 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be" + 'metadata' => "43b1188a-6a06-11e2-baaf-00145ea4a2be" ); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/bpidoudou/index.php --- a/web/bpidoudou/index.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/bpidoudou/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,6 +1,6 @@ \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/common.php --- a/web/common.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/common.php Sun Apr 21 21:54:24 2013 +0200 @@ -17,7 +17,7 @@ $ldt_platform = 'http://ldt.iri.centrepompidou.fr/'; $project_url_base = 'ldtplatform/ldt/cljson/id/'; -$C_default_rep = 'enmi12'; +$C_default_rep = 'edito-1213-06-modeles-economiques'; $C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0'; $archives_list = array( @@ -28,17 +28,20 @@ "iii-catastrophe", "edito-inaugurale", "enmi2011", "2011-2012-museo-structured-data", "edito-webdoc","edito-intelligence", "2011-2012-museo-contribution", "2011-2012-museo-ingenierie", "edito-serious-games", "enmi2012-seminaire-1", "2011-2012-museo-audiovisuel", "edito-reseaux-sociaux", + "edito-arts-numeriques", 'fens2012-gamestudies', 'fens2012-designmetadata', 'fens2012-museo-culture-opendata', 'fens2012-vinyl-numerique', 'fens2012-edito-datajournalisme', - 'fens2012-wiid' + 'fens2012-wiid', + 'edito-1213-01-contextes', 'edito-1213-02-collectifs-auteurs', + "enmi12", "bpidoudou", 'edito-1213-04-lire-ecrire' ); $configuration = array( - 'siteUrl' => 'http://twitter.com/oauth', + 'siteUrl' => 'https://api.twitter.com/oauth', 'consumerKey' => '***REMOVED***', 'consumerSecret' => '***REMOVED***' ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-01-contextes/config.php --- a/web/edito-1213-01-contextes/config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/edito-1213-01-contextes/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -49,5 +49,5 @@ 'archive_description' => 'par Sens Public et l\'IRI
au Centre Pompidou le 15/11/2012 17:30', // After the event - 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be" + 'metadata' => "449b0e32-5fd3-11e2-bad5-00145ea4a2be" ); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-01-contextes/index.php --- a/web/edito-1213-01-contextes/index.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/edito-1213-01-contextes/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,6 +1,6 @@ \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-02-collectifs-auteurs/config.php --- a/web/edito-1213-02-collectifs-auteurs/config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/edito-1213-02-collectifs-auteurs/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -46,5 +46,5 @@ 'archive_description' => 'par Sens Public et l\'IRI
au Centre Pompidou le 13/12/2012 17:30', // After the event - 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be" + 'metadata' => "fa98b8e4-63af-11e2-baaf-00145ea4a2be" ); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-02-collectifs-auteurs/index.php --- a/web/edito-1213-02-collectifs-auteurs/index.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/edito-1213-02-collectifs-auteurs/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,6 +1,6 @@ \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-04-lire-ecrire/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/edito-1213-04-lire-ecrire/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,59 @@ + '#edito12', + + 'title' => "Écritures numériques et éditorialisation", + + 'abstract' => "Séminaire « écritures numériques et éditorialisation » :
Lire : une manière d’écrire ?
le 14/02/2013 à Paris 17h30, à Montréal 11h30
Centre Pompidou et Université de Montréal", + + 'description'=> "

Lire : une manière d’écrire ?

le 14/02/2013 +
À Paris : De 17h30 à 19h30, au Centre Pompidou, salle Triangle - entrée libre et gratuite +
À Montréal : De 11h30 à 13h30, à l'Université de Montréal, salle P217 du Pavillon Roger-Gaudry, 2900, boul. Édouard-Montpetit

avec Milad Doueihi et Susan Brown

Lire c’est produire, inventer, créer. Que devient la lecture face à la profusion inouïe des contenus sur Internet ? La différence entre écriture et lecture se réduit de plus en plus, le lecteur devenant lui-même un auteur écrivant. On analysera pendant la séance un certain nombre de dispositifs d’éditorialisation qui cristallisent ainsi des parcours de lecture et transforment la lecture en écriture.

+
+ Milad Doueihi est professeur, historien des religions et titulaire de la Chaire de recherche sur les cultures numériques à l’Université Laval. + Il a publié plusieurs ouvrages sur la culture numérique, dont le plus récent est Pour un humanisme numérique (Seuil, 2011). +
+
+
+ Susan Brown est professeure invitée au Département d’études anglaises et cinématographiques de l’Université d’Alberta, professeure d’études anglaises et théâtrales à l’Université de Guelph et directrice du projet Orlando. +
+
+
+ Hadrien Gardeur, co-fondateur de feedbooks.com. +
+

Programme complet sur sens-public.org

Supports : les nouveaux matériaux d’écriture.

le 21/03/2013 +
À Paris : De 17h30 à 19h30, au Centre Pompidou, salle Triangle - entrée libre et gratuite +
À Montréal : De 11h30 à 13h30, à l'Université de Montréal, salle P217 du Pavillon Roger-Gaudry, 2900, boul. Édouard-Montpetit

avec Ariane Mayer, Valérie Jeanne-Perrier et Guy Boulianne.

+
+ Ariane Mayer est doctorante, à l’Institut de Recherche et d'Innovation (IRI) et au laboratoire Costech de l’Université de Technologie de Compiègne (UTC), + sur les implications philosophiques de la lecture numérique et de l’écriture collaborative. +
+
+
+ Valérie Jeanne-Perrier est sociologue des médias et des organisations. Ses interventions portent sur les mutations professionnelles et éditoriales liées à l’utilisation des outils informatisés comme sources et ressources d’écriture, de structuration de la production de l’information et du travail +
+
+
+ Guy Boulianne est fondateur des éditions Dédicaces. +
+

Programme complet sur sens-public.org

Modèles économiques de l’écriture numérique.

le 18/04/2013 +
À Paris : De 17h30 à 19h30, au Centre Pompidou, salle Triangle - entrée libre et gratuite +
À Montréal : De 11h30 à 13h30, à l'Université de Montréal, salle P217 du Pavillon Roger-Gaudry, 2900, boul. Édouard-Montpetit

avec Virginie Clayssen et Dominique Bérubé.

L’exigence de gratuité sur Internet opposée à la réclamation d’une juste rétribution des producteurs de contenu n’a cessé de poser question ces dernières années, en particulier dans les domaines de la musique, de la presse et de l’édition. Comment soutenir financièrement des sites Internet spécialisés, faire vivre des activités créatives dont la productivité ont un coût, là où règnent les sources d’informations gratuites, parfois le piratage, et les grands sites commerciaux du web ?

+
+ Virginie Clayssen est directrice de la stratégie numérique au sein du groupe Editis. +
+
+ Architecte de formation, Virginie Clayssen s’est très vite orientée vers les nouvelles technologies, vidéo puis multimédia. + Dès 1995, concepteur réalisateur indépendante, elle aborde l’édition par son versant électronique, avec la publication de plusieurs CD-Rom grand public, puis la participation à de nombreux projets d’édition on-line et off-line. + Elle rejoint la société Tralalère, spécialisée dans le multimédia jeunesse, en 2005, puis devient en 2007 responsable numérique aux éditions Magnard, avant de rejoindre Editis en 2008. + Elle a présidé la commission numérique du Syndicat Nationale de l’Edition de juin 2009 à septembre 2011, et en est aujourd’hui vice-présidente. + Elle intervient régulièrement dans des conférences sur l’édition numérique, en France et à l’étranger. +
+
+
+ Dominique Bérubé, Université de Montréal. +
+

Programme complet sur sens-public.org

+ ", + + 'link' => 'http://seminaire.sens-public.org', + + 'islive' => true, + + 'keywords' => 'editorialisation, écritures, numérique, iri', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "Sens Public | IRI | Centre de recherche Interdisciplinaire sur les Technologies Émergentes | Maison des Sciences de l'Homme Paris Nord", + + 'client_visual' => 'images/client_visual.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/logo-edito.png', // 171 × 63 pixels + + 'slide_background' => 'images/slide_background.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels + + 'archive_title' => "Modèles économiques de l’écriture numérique.", + + 'archive_description' => 'par Sens Public et l\'IRI
au Centre Pompidou le 18/04/2013 17:30', + + // After the event + 'metadata' => "f0a659f2-7ab8-11e2-88b4-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-06-modeles-economiques/images/archive_img.jpg Binary file web/edito-1213-06-modeles-economiques/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-06-modeles-economiques/images/client_visual.jpg Binary file web/edito-1213-06-modeles-economiques/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-06-modeles-economiques/images/logo-edito.png Binary file web/edito-1213-06-modeles-economiques/images/logo-edito.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-06-modeles-economiques/images/slide_background.jpg Binary file web/edito-1213-06-modeles-economiques/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-1213-06-modeles-economiques/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/edito-1213-06-modeles-economiques/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-arts-numeriques/config.php --- a/web/edito-arts-numeriques/config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/edito-arts-numeriques/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -46,6 +46,6 @@ 'archive_description' => 'par Sens Public et l\'IRI
au Centre Pompidou le jeudi 24 mai 2012 17:30 - 19:30', // After the event - 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be", + 'metadata' => "e3c409ec-c9dc-11e1-9443-00145ea4a2be", 'pad_url' => 'http://pads.iri-research.org/p/edito-arts-numeriques?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' ); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-arts-numeriques/index.php --- a/web/edito-arts-numeriques/index.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/edito-arts-numeriques/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,6 +1,6 @@ \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito-inaugurale/config.php --- a/web/edito-inaugurale/config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/edito-inaugurale/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -23,7 +23,7 @@ 'archive_img' => 'images/archive-editorialisation.jpg', // 270 × 150 pixels - 'archive_title' => "Séance d'ouverture - les nouvelles écriture", + 'archive_title' => "Séance d'ouverture - les nouvelles écritures", 'archive_description' => 'par Sens Public et l\'IRI
au Centre Pompidou le jeudi 3 novembre 2011 17:30 - 19:30', // After the event diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/edito/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,44 @@ + array( + 'edito-1213-05-supports-ecriture', + 'edito-1213-04-lire-ecrire', + 'edito-1213-02-collectifs-auteurs', + 'edito-1213-01-contextes', + "edito-reseaux-sociaux", + "edito-serious-games", + "edito-intelligence", + "edito-webdoc", + "edito-inaugurale", + ), + 'hashtag' => '#edito12', + + 'title' => "Séminaire Nouvelles formes d’éditorialisation", + + 'description'=> "", + + 'link' => 'http://seminaire.sens-public.org/', + + 'islive' => true, + + 'keywords' => 'séminaire, éditorialisation, écriture, numérique', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "Sens Public | IRI | Centre de recherche Interdisciplinaire sur les Technologies Émergentes | Maison des Sciences de l'Homme Paris Nord", + + 'client_visual' => 'images/client_visual.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/logo-edito.png', // 171 × 63 pixels + + 'slide_background' => 'images/slide_background.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels + + 'archive_title' => "Séminaire Nouvelles formes d’éditorialisation", + + 'archive_description' => 'par Sens Public et l\'IRI
au Centre Pompidou', + + // After the event + 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito/images/archive_img.jpg Binary file web/edito/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito/images/client_visual.jpg Binary file web/edito/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito/images/logo-edito.png Binary file web/edito/images/logo-edito.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito/images/slide_background.jpg Binary file web/edito/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/edito/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/edito/polemicaltimeline.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/edito/polemicaltimeline.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/conference/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/eduinov-2013/conference/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,127 @@ + '#eduinov', + + 'title' => "Journées de l'Innovation 2013, Conférences", + + 'abstract' => "Journées de l'Innovation 2013
« Innover pour refonder »
les 27 et 28 Mars 2013
Unesco", + + 'description'=> " +

Innover pour Refonder

Programme des Conférences, salle II

+
27 mars 2013 (9 h 30- 11 h 30)
+
Conférence inaugurale :
+
Claude Lelièvre, professeur d'histoire de l'éducation à la Faculté des sciences humaines et sociales Sorbonne (université de Paris V)
+
+
Les tout petits à l’école ? Pour quoi faire ?
+
27 mars 2013 (11 h 30 - 13 h 30)
+
- +
  CONFERENCE 1
  +
  Bernard Golse, professeur de médecine, psychiatre, Hôpital Necker, Paris
  +
- +
  CONFERENCE 2
  +
  Edouard Gentaz, professeur, université de Genève
  +
+
+
Plus de maîtres que de classes : oui, mais comment ?
+
27 mars 2013 (14 h - 16 h)
+
- +
  CONFERENCE 3
  +
  Bruno Suchaut, IREDU
  +
- +
  CONFERENCE 4
  +
  Pascal Bressoux, directeur de laboratoire des Sciences de l’Education, Université Pierre Mendes France, Grenoble
  +
+
+
L’égalité filles-garçons, la société change, l’école aussi ?
+
27 mars 2013 (16 h 15 - 18 h)
+
- +
  CONFERENCE 5
  +
  Marie Duru-Bellat, professeur des universités, Sciences po., Paris
  +
+
+
Cycles, liaison, socle : passons aux actes !
+
28 mars 2013 (9 h 00 – 10 h 45)
+
- +
  CONFERENCE 7
  +
  Roger-François Gauthier, IGAENR
  +
- +
  CONFERENCE 8
  +
  Françoise Lantheaume, maitre de conférences, Université Lumière Lyon 2
  +
+
+
Que nous apprennent les élèves décrocheurs d’école ?
+
28 mars 2013 (11 h 00 – 13 h 00)
+
- +
  CONFERENCE 9
  +
  George Pau-Langevin, Ministre déléguée
  +
- +
  CONFERENCE 10
  +
  Maryse Esterlé, enseignante-chercheure maîtresse de conférences - Université d'Artois
  +
+
+
Peut-on vraiment apprendre avec les TICE ? Comment ?
+
28 mars 2013 (13 h 30 – 15 h 30)
+
- +
  CONFERENCE 11
  +
  David Istance, directeur du CERI-OCDE, les scénarios du futur proche pour l’Ecole
  +
- +
  CONFERENCE 12
  +
  Divina Frau- Meigs, professeure à l’Université de Paris III, en sciences de l'information et de la communication et en langues et littératures anglaises et anglo-saxonnes
  +
+

+", + + 'link' => 'http://cndpval.cndp.fr/innovation/accueil.html', + + 'islive' => true, + + 'flv_streamer' => 'rtmp://cdn.actistream.com/p0v1/', + 'flv_file' => 'myStream.sdp', + + 'keywords' => 'iri, nouveau monde industriel, philosophie, digital studies', + + 'rep' => 'eduinov-2013/'.basename(__DIR__), + + 'partenaires'=> "Ministère de l'Éducation Nationale", + + 'client_visual' => 'images/client_visual.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/head-logo.png', // 171 × 63 pixels + + 'slide_background' => 'images/slide_background.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels + + 'archive_title' => "Journées de l'Innovation : Conférences", + 'archive_description' => 'Salle II', + + // After the event + 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/conference/images/archive_img.jpg Binary file web/eduinov-2013/conference/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/conference/images/client_visual.jpg Binary file web/eduinov-2013/conference/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/conference/images/head-logo.png Binary file web/eduinov-2013/conference/images/head-logo.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/conference/images/slide_background.jpg Binary file web/eduinov-2013/conference/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/conference/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/eduinov-2013/conference/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/eduinov-2013/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,41 @@ + array( + 'eduinov-2013/conference', + 'eduinov-2013/table-ronde' + ), + 'hashtag' => '#eduinov', + + 'title' => "Journées de l'Innovation 2013", + + 'abstract' => "Journées de l'Innovation 2013
« Innover pour refonder »
les 27 et 28 Mars 2013
Unesco", + + 'description'=> "", + + 'link' => 'http://cndpval.cndp.fr/innovation/accueil.html', + + 'islive' => true, + + 'flv_streamer' => 'rtmp://cdn.actistream.com/p0v1/', + 'flv_file' => 'myStream.sdp', + + 'keywords' => '', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "Ministère de l'Éducation Nationale", + + 'client_visual' => 'images/client_visual.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/head-logo.png', // 171 × 63 pixels + + 'slide_background' => 'images/slide_background.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels + + 'archive_title' => "Journées de l'Innovation", + 'archive_description' => 'par le Ministère de l\'Éducation Nationale
à l\'Unesco les 27 et 28 mars 2013', + + // After the event + 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/images/archive_img.jpg Binary file web/eduinov-2013/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/images/client_visual.jpg Binary file web/eduinov-2013/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/images/head-logo.png Binary file web/eduinov-2013/images/head-logo.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/images/slide_background.jpg Binary file web/eduinov-2013/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/eduinov-2013/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/polemicaltimeline.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/eduinov-2013/polemicaltimeline.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,7 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/table-ronde/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/eduinov-2013/table-ronde/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,119 @@ + '#eduinov', + + 'title' => "Journées de l'Innovation 2013, Tables Rondes", + + 'abstract' => "Journées de l'Innovation 2013
« Innover pour refonder »
les 27 et 28 Mars 2013
Unesco", + + 'description'=> " +

Innover pour Refonder

Programme des Tables Rondes, salle IX

+
La liaison école-collège, le travail en réseau d’équipes : quels changements pour les pratiques et les organisations ?
+
27 mars 2013 (11 h 30 - 13 h 30)
+
- Patrick Lemoine, IEN Toulon 2, académie de Nice
- Joëlle Jean, directrice du service pédagogique, AEFE
- Luc Launay, DASEN, Maine et Loire, académie de Nantes
- Martine Cazes, principal du collège Darasse, Caussade, académie de Toulouse
- Pascale Toscani, maitre de conférences, IFUCOME, Université catholique d’Angers
- Animateur : Nicolas Feld, DGESCO
+
En une trentaine d’années, le cadre de référence de l’activité d’enseignement a progressivement basculé ; les pratiques pédagogiques sont de plus en plus dépendantes des dispositifs et organisations relevant d’un groupe collectif au niveau d’une école, d’un établissement, et à présent, d’un réseau d’unités éducatives.
+
Ces petits changements parfois lents sont importants pour tous : en élargissant son cadre de référence, l’équipe se donne les moyens de s’appuyer sur davantage de ressources, et des moyens plus nombreux pour varier ; les élèves peuvent y gagner en choix et en continuité dans leur parcours scolaire. Comment rendre ces liaisons entre les degrés d’enseignements plus effectives, plus riches, et plus nombreuses ?
+
+
A quelles conditions l’accueil des moins de trois ans devient une chance et une réussite pour les élèves ?
+
27 mars 2013 (14 h - 16 h)
+
- Michel Grandaty, professeur d’université, Université Toulouse 2 Le Mirail
- Isabelle Racoffier, présidente de l’AGEEM
- Nicole Geneix, professeur des écoles, présidente de l'Observatoire de l’enfance, direction de l’éducation de la ville d’Istres
- Jean-Louis Baglan, DASEN Rhône, académie de Lyon
- Edouard Gentaz, professeur, université de Genève
- Animatrice : Marie-Claire Mzali-Duprat, DGESCO
+
Accueillir les « tout petits » à l’Ecole maternelle n’est pas chose nouvelle ; l’enjeu est d’accueillir sans doute plus d’enfants selon les besoins repérés auprès des familles et certainement mieux au niveau de l’école. Ce pari a des effets pour les équipes d’enseignants et leurs partenaires : il interroge sur les organisations les plus adaptées, dans les temps scolaires et les espaces dédiés, comme dans les groupements variés à envisager. Il questionne tout autant les pratiques professionnelles portant sur la nature des activités à privilégier pour ces « nouveaux » publics.
+
+
Plus de maîtres que de classes : quels changements dans l’organisation et dans les pratiques ?
+
27 mars 2013 (16 h 15 - 18 h)
+
- Pascale Varay, Ecole Saint-Charles, Marseille, LEA-IFE, académie d’Aix-Marseille
- Mireille Pascaud, IEN La Châtre, académie d’Orléans-Tours
- Marie Toullec-Théry, maitre de conférences, CREN, Université de Nantes
- Sylvain Grandserre, directeur d’école, représentant de l’ICEM
- Guy Charlot. DASEN du Pas-de-Calais, académie de Lille
- Animatrice : Christine Vallin, rédactrice des Cahiers pédagogiques
+
Le dispositif « plus de maitres que de classes » prend appui sur des études partagées au niveau international sur les effets du travail enseignant organisé collectivement dans l’amélioration des acquis des élèves. Il ne s’agirait pas tant de faire baisser peu ou prou le nombre d’élèves par groupes que d’envisager des scénarios alternatifs à un maitre/une classe. Variété des situations d’apprentissage, plus grande sollicitation des élèves par un maitre plus proche, mais aussi développement professionnel des enseignants, par la co-animation, l’observation et l’analyse partagée ; ce sont autant de facteurs à disposition des équipes.
+
+
Le numérique : des outils, des usages… et après ?
+
28 mars 2013 (9 h 00 – 10 h 45)
+
- Vincent Puig, IRI, sur le concept de digital studies
- Michèle Drechsler, IEN conseillère TICE du recteur pour le premier degré, académie d’Orléans-Tours
- Jean-François Boulagnon, chef d’établissement, académie de Bordeaux
- Sébastien Hache, réseau sésamath
- Animatrice : Isabelle Quentin, chercheur
+
Après plusieurs années de montée en charge des équipements numériques dans les écoles et établissements scolaires, plusieurs rapports interrogent les pratiques et les usages, des élèves et des professionnels de l’éducation. Les conclusions, partagées au niveau international, sont mitigées sur les améliorations conséquentes en termes d’apprentissages et de résultats scolaires. Quelles sont les meilleures manières de s’y prendre ?
+
+
Filles-garçons, garçons-filles, comment construire l’égalité ?
+
28 mars 2013 (11 h 00 – 13 h 00)
+
- Jean-Louis Auduc, ancien directeur adjoint, IUFM Créteil, auteur de «Sauvons les garçons» (Descartes, 2009)
- Nicole Abar, responsable du sport de haut niveau et du sport professionnel, Direction régionale de la jeunesse, des sports et de la cohésion sociale de Midi-Pyrénées (DRJSCS)
- Sylvie Cromer, maitre de conférences, université de Lille
- Michel Quéré, recteur de l’académie de Rennes
- Animatrice : Anne Rebeyrol, DGESCO
+
L’école est tout autant victime des clichés véhiculés par la société et la culture ambiante qu’elle produit elle-même si ce n’est qu’elle reproduit certaines inégalités bien malgré elle, liées aux genres. Ce peuvent être des habitudes de travail, des supports non questionnés, des représentations mentales erronées ; filles et garçons à divers titres en font les frais. Comment alors faire une école plus équitable et qui donne des rôles, des choix et des réussites d’égale dignité pour les filles et pour les garçons ?
+
+
Dans quelle mesure les décrocheurs scolaires nous font réinventer une école plus juste et plus efficace pour tous ?
+
28 mars 2013 (13 h 30 – 15 h 30)
+
- Philippe Goeme, accompagnateur, coordonnateur du Pôle innovant lycéen
- Olivier Klein, maire de Clichy/Bois
- Béatrice Delandre, principale adjointe, Collège Albert Camus, académie de Rouen
- Christian Frin, proviseur, Unité Pédagogique Régionale du Grand Ouest académie de Rennes
- Gabriel Borger, doyen de l’inspection, directeur de la pédagogie, académie de Bordeaux
- Animateur : Nicolas Torres, DGESCO
+
Les décrocheurs ou perdus de vue sont des noms donnés à des élèves qui sortent temporairement ou définitivement du système scolaire, sans que celui-ci soit lui-même questionné dans ses propres organisations et pratiques de sélection. Les études encore récentes en France sur la question montrent combien il est devenu urgent que les professionnels s’en préoccupent : un système efficace est celui qui se remarque par l’attention aux plus faibles.
+

+", + + 'link' => 'http://cndpval.cndp.fr/innovation/accueil.html', + + 'islive' => true, + + 'flv_streamer' => 'rtmp://cdn.actistream.com/p1v1/', + 'flv_file' => 'myStream.sdp', + + 'keywords' => 'iri, nouveau monde industriel, philosophie, digital studies', + + 'rep' => 'eduinov-2013/'.basename(__DIR__), + + 'partenaires'=> "Ministère de l'Éducation Nationale", + + 'client_visual' => 'images/client_visual.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/head-logo.png', // 171 × 63 pixels + + 'slide_background' => 'images/slide_background.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels + + 'archive_title' => "Journées de l'Innovation : Tables Rondes", + 'archive_description' => 'Salle IX', + + // After the event + 'metadata' => "99d311d0-8d5e-11e1-aa20-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/table-ronde/images/archive_img.jpg Binary file web/eduinov-2013/table-ronde/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/table-ronde/images/client_visual.jpg Binary file web/eduinov-2013/table-ronde/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/table-ronde/images/head-logo.png Binary file web/eduinov-2013/table-ronde/images/head-logo.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/table-ronde/images/slide_background.jpg Binary file web/eduinov-2013/table-ronde/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/eduinov-2013/table-ronde/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/eduinov-2013/table-ronde/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/embedscript.php --- a/web/embedscript.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/embedscript.php Sun Apr 21 21:54:24 2013 +0200 @@ -75,8 +75,8 @@ '/player_embed.php', '/polemicaltimeline.php', '', - '', + "", 'Polemic Tweet', 650, - 500 + 600 ); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12-barcamp/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/enmi12-barcamp/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,45 @@ + '#enmi12', + + 'title' => "Dispositif(s) de couverture d’événementt : l’expérience des #ENMI12", + + 'abstract' => "Dispositif(s) de couverture d’événement :
l’expérience des #ENMI12
le 15/04/2013 à 10h00
Centre Pompidou, Salle Triangle", + + 'description'=> "

Atelier enmi12.org

le 15/04/2013 +
À Paris : De 10h00 à 17h00, au Centre Pompidou, salle Triangle - entrée gratuite sur inscription

En décembre dernier, l’IRI, Knowtex et le BTS multimédia du Lycée Jacques Prévert se sont associés pour imaginer un dispositif inédit de couverture de la conférence Les Entretiens du Nouveau Monde Industriel : enmi12.org

Après une préparation de 2 mois, une “newsroom” de 30 étudiants a été mise en place pour “augmenter” collectivement l'expérience de la conférence avec une dizaine d'outils (PolemicTweet, Sharypic, UniShared, Pearltrees, FreeMind...)

L’IRI organise le lundi 15 avril un atelier pour revenir sur ce dispositif dont l’aspect transmedia a laissé Louise Merzeau supposer qu’il présentait les clés de la translittératie anticipée par plusieurs penseurs des humanités numériques.

+ +

Inscription sur eventbrite

+ ", + + 'link' => 'http://enmi12.eventbrite.fr/', + + 'islive' => true, + + 'keywords' => 'editorialisation, iri, enmi, entretiens du nouveau monde industriel, barcamp', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "IRI + | Knowtex + | BTS multimédia du Lycée Jacques Prévert", + + 'client_visual' => 'images/large.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/logo-enmi.png', // 171 × 63 pixels + + 'slide_background' => 'images/slider.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/small.jpg', // 270 × 150 pixels + + 'archive_title' => "Modèles économiques de l’écriture numérique.", + + 'archive_description' => 'par l\'IRI
au Centre Pompidou le 15/04/2013 10:00', + + // After the event + 'metadata' => "f0a659f2-7ab8-11e2-88b4-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12-barcamp/images/large.jpg Binary file web/enmi12-barcamp/images/large.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12-barcamp/images/logo-enmi.png Binary file web/enmi12-barcamp/images/logo-enmi.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12-barcamp/images/slider.jpg Binary file web/enmi12-barcamp/images/slider.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12-barcamp/images/small.jpg Binary file web/enmi12-barcamp/images/small.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12-barcamp/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/enmi12-barcamp/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/carrefour-possibles/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/enmi12/carrefour-possibles/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,48 @@ + '#enmi12', + + 'title' => "Entretiens du Nouveau Monde Industriel 2012, Carrefour des Possibles", + + 'abstract' => "", + + 'description'=> "

Carrefour des Possibles

La question du savoir et de l’éducation est au cœur des grands enjeux nationaux et internationaux de cette rentrée. Pour leur 6ème édition, les Entretiens du nouveau monde industriel porteront sur le thème des technologies de la connaissance. Ce thème et celui de l’organologie des savoirs constituent les bases du projet Digital Studies conduit par l’IRI et ses partenaires.

Le but de ce colloque est d’appréhender la question des digital humanities à partir de la question plus large et plus radicale des digital studies conçues comme une rupture épistémologique généralisée – c’est à dire affectant toutes les formes de savoirs rationnels – , mais aussi comme une rupture anthropologique – dans la mesure où, à travers les technologies relationnelles, ce sont aussi les savoirs empiriques sous toutes leurs formes, tels qu’ils constituent la trame de toute existence humaine, qui sont altérés.

Pour ce qui concerne l’Iri, l’ENSCI-Les Ateliers, Cap Digital et les partenaires associés à cette édition, cette approche «organologique» d’essence théorique vise à fournir des méthodes pour des activités pratiques de conception, de prototypages, de réalisation et d’expérimentation des instruments de recherche contributive, de production collaborative et de diffusion des savoirs dans la recherche, dans les enseignements supérieur et secondaire, et dans les entreprises comme dans l’ensemble de la société. Une telle ambition pratique impose sans doute de repenser en profondeur les liens entre politique culturelle, politique éducative, politique scientifique, politique industrielle, politique des médias et citoyenneté.

Programme

Lundi 17 Décembre

18h30 : Carrefour des Possibles

+ ", + + 'link' => 'http://www.capdigital.com/evenements/enmi/', + + 'islive' => true, + + 'keywords' => 'iri, nouveau monde industriel, philosophie, digital studies', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "IRI + | Ensci + | Cap Digital + | Alcatel Lucent + | France Télévisions + | Institut Mines-Télécom", + + 'client_visual' => 'images/client_visual.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/logo-enmi.png', // 171 × 63 pixels + + 'slide_background' => 'images/slide_background.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels + + 'archive_title' => "Carrefour des Possibles", + 'archive_description' => '', + + // After the event + 'metadata' => "1e8e03f6-49ea-11e2-b4ad-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/carrefour-possibles/images/archive_img.jpg Binary file web/enmi12/carrefour-possibles/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/carrefour-possibles/images/logo-enmi.png Binary file web/enmi12/carrefour-possibles/images/logo-enmi.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/carrefour-possibles/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/enmi12/carrefour-possibles/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/config.php --- a/web/enmi12/config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/enmi12/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,5 +1,15 @@ array( + 'enmi12/session-1', + 'enmi12/session-2', + 'enmi12/session-3', + 'enmi12/carrefour-possibles', + 'enmi12/session-4', + 'enmi12/session-5', + 'enmi12/session-6', + 'enmi12/session-7', + ), 'hashtag' => '#enmi12', 'title' => "Entretiens du Nouveau Monde Industriel 2012", diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/index.php --- a/web/enmi12/index.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/enmi12/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,6 +1,6 @@ \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/polemicaltimeline.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/enmi12/polemicaltimeline.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,7 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/session-1/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/enmi12/session-1/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,49 @@ + '#enmi12', + + 'title' => "Entretiens du Nouveau Monde Industriel 2012, Session 1", + + 'abstract' => "", + + 'description'=> "

Le numérique comme écriture et la question des technologies intellectuelles

Lundi 17 Décembre

+
9h30 – 13h
+
Session 1 : Le numérique comme écriture et la question des technologies intellectuelles
+
Les questions que le numérique pose à la science ne sont pas entièrement nouvelles : elles prennent corps à partir d’un fonds que l’on peut faire remonter au moins à l’apparition de l’écriture dans le monde antique, c’est à dire aussi à la configuration du savoir académique – entendu ici au sens où il fait référence à l’académie de Platon. Ces questions, en mobilisant aujourd’hui aussi bien les historiens du savoir que les neurosciences, font apparaître que le devenir du cerveau semble être indissociable de celui des supports artificiels qui constituent les savoirs.
+
Intervenants : Bernard Stiegler (IRI), Maryanne Wolf (Tufts University), David Bates (University of Berkeley), Nathalie Bulle (Cnrs), Warren Sack (University of Santa Cruz)
+

Théories et pratiques de l’épistémologie dans les sciences de l’homme et de la société à l’époque du numérique

Lundi 17 Décembre

+
14h30 – 16h
+
Session 2 : Théories et pratiques de l’épistémologie dans les sciences de l’homme et de la société à l’époque du numérique
+
Issu de la technologie informatique, le numérique transforme aujourd’hui en profondeur aussi bien les pratiques que les objets des sciences de l’homme et de la société. C’est dans ce contexte qu’émergent des programmes et des départements d’humanités numériques (digital humanities) où la question d’une nouvelle épistémologie des instruments semble s’imposer, cependant que la publication des data et l’ouverture des savoirs, faisant apparaître des pratiques inédites de recherche contributive, rouvre à nouveaux frais le dossier du rapport entre le monde académique et son dehors.
+
Intervenants : Dominique Cardon (Orange Labs), Jean Lassègue (CREA-Polytechnique), Pierre Mounier (CLEO)
+

Software studies, digital humanities, digital studies

Lundi 17 Décembre

+
16h30 - 18h
+
Session 3 : Software studies, digital humanities, digital studies
+
De même que Foucault avait mis l’étude des traces et technologies de l’archive qui constituent toute épistémè au coeur de son projet d’archéologie des savoirs, les software studies, qui explorent la question de l’algorithme, et qui sont largement inspirées par les questions, les hypothèses et les pratiques du free software, se sont développées entre informatique théorique, pratiques artistiques et projet social. Pendant ce temps, le paradigme des digital humanities s’est imposé un peu partout dans le monde. Mais est-il possible de questionner le numérique dans les sciences de l’homme et de la société sans le faire aussi dans les sciences mathématiques, les sciences physiques, les sciences de la vie, etc. ? Quel est alors le statut des savoirs matérialisés et appareillés par le numérique, notamment par la modélisation et la 3D et dans tous les domaines de la vie au regard des sciences de la cognition ?
+
Intervenants : Matthew Fuller (Goldsmiths College), Bruno Bachimont (UTC), Hidetaka Ishida (Université de Tokyo)
+
18h – 18h30 : Questions et pause

Extended mind et tracéologie numérique

Mardi 18 décembre

+
9h – 10h30
+
Session 4 : Extended mind et tracéologie numérique
+
Il y a plus de vingt ans, les questions posées en sciences de la cognition par les instruments du savoir et leur extériorité par rapport au corps et à la conscience – aussi bien d’ailleurs que par rapport à l’inconscient– ont été posées notamment à travers les paradigmes de la cognition située et de l’esprit étendu (extended mind). Aujourd’hui, dans le contexte de la tracéologie généralisée induite par les capteurs, cookies, métadonnées, social web, etc., et au moment où les neurosciences commencent à s’intéresser aux formes anciennes et récentes d’extériorisation des savoirs par rapport au corps et donc au cerveau, s’impose la question de la trace sous toutes ses formes (vivantes, neuronales, techniques, institutionnelles, etc.), les processus d’extériorisation et d’intériorisation entre ces diverses instances devant être analysées en détail.
+
Intervenants : Ed Cohen (Rutgers University), Alain Mille (Liris/Cnrs), Yannick Prié (LINA, Université de Nantes)
+

Technologies industrielles de la connaissance et individuation collective

Mardi 18 décembre

+
11h15 – 13h15
+
Session 5 : Technologies industrielles de la connaissance et individuation collective
+
La numérisation généralisée affecte désormais massivement toutes les formes de savoirs, pratiques et théoriques, de la vie quotidienne aux mondes académiques. En pénétrant tous les milieux symboliques, elle installe l’industrialisation et la monétisation dans toutes les dimensions de la relation sociale en mettant en oeuvre des technologies de transindividuation qui modifient le devenir de la langue et plus généralement les processus d’individuation collective, cependant que le nouvel espace de publication que constitue le web forme pour les institutions de savoirs leur chose publique – leur res publica : leur «république du numérique».
+
Intervenants : Frédéric Kaplan (EPFL), Harry Halpin (IRI), Alain Giffard (Ministère de la Culture), Christian Fauré (Ars Industrialis)
+

Enjeux industriels

Mardi 18 décembre

+
14h30 - 16h30
+
Session 6 : Enjeux industriels
+
Industries culturelles, médias de masse, édition connaissent une très profonde révolution où tous les modèles antérieurs sont à plus ou moins brève échéance voués à disparaître. Cela affecte directement les télécommunications aussi bien que les équipementiers électroniques. Dans le monde audiovisuel, l’éditorialisation doit être repensée en profondeur, cependant que le métier même de diffuseur est appelé à régresser au profit d’une nouvelle forme d’activité éditoriale. Des activités comme la lecture et l’écriture, qui ne peuvent plus être conçues indépendamment des liseuses et des réseaux sociaux, nécessitent de nouveaux instruments de travail individuel et collectif où se généralisent les langages d’annotation – qui supposent de nouvelles normes industrielles. Dans cette économie relationnelle, la question de la valorisation des externalités positives, qui deviennent une fonction économique cruciale, nécessite de nouveaux critères en matière de fiscalité.
+
Intervenants : Bruno Patino (France Télévisions), Jean-Baptiste Labrune (Alcatel Bell Labs), Michel Calmejane (Colt Technologies), Frédéric Vacher (Dassault Systèmes)
+

Design, documentation, écriture et thérapeutique du pharmakon numérique

Mardi 18 décembre

+
16h45-18h45
+
Session 7 : Design, documentation, écriture et thérapeutique du pharmakon numérique
+
Les pratiques de la lecture et de l’écriture numérique sont désormais la réalité quotidienne aussi bien des documentalistes de l’enseignement secondaire que des écrivains, cependant que le monde artistique, en faisant de la digitalisation son matériau, investigue la nouvelle « pharmacologie » et ses « thérapeutiques ». L’esthétique peut ici contribuer aux digital studies en revisitant à partir des pratiques instrumentales des questions comme celles de l’attention, de la perception, de l’individuation à travers les oeuvres, de l’expression, cependant que l’expérience des designers et des techniciens de la documentation viennent au premier plan.
+
Intervenants : Yves Rinato (ENSCI), Cécile Portier (écrivain), Marcel O’Gorman (University of Waterloo), Jean-Louis Fréchin (ENSCI)
+
18h45 : Bilan des expérimentations contributives
19h : Clôture des Entretiens

+ ", + + 'link' => 'http://www.capdigital.com/evenements/enmi/', + + 'islive' => true, + + 'keywords' => 'iri, nouveau monde industriel, philosophie, digital studies', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "IRI + | Ensci + | Cap Digital + | Alcatel Lucent + | France Télévisions + | Institut Mines-Télécom", + + 'client_visual' => 'images/client_visual.jpg',// 480 × 320 pixels + + 'head_logo' => 'images/logo-enmi.png', // 171 × 63 pixels + + 'slide_background' => 'images/slide_background.jpg', // 606 × 282 pixels + + 'archive_img' => 'images/archive_img.jpg', // 270 × 150 pixels + + 'archive_title' => "Session 7 : Design, documentation, écriture et thérapeutique du pharmakon numérique", + 'archive_description' => 'Yves Rinato, Cécile Portier, Marcel O’Gorman, Jean-Louis Fréchin', + + // After the event + 'metadata' => "3e1effda-49eb-11e2-b4ad-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/session-7/images/archive_img.jpg Binary file web/enmi12/session-7/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/session-7/images/logo-enmi.png Binary file web/enmi12/session-7/images/logo-enmi.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/enmi12/session-7/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/enmi12/session-7/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/hanna-arendt/arendt-background.jpg Binary file web/hanna-arendt/arendt-background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/hanna-arendt/carton.png Binary file web/hanna-arendt/carton.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/hanna-arendt/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hanna-arendt/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,4 @@ + basename(__DIR__), +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/hanna-arendt/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hanna-arendt/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,91 @@ + basename(__DIR__)); + +include_once '../common.php'; + +/** + * Do we already have a valid Access Token or need to go get one? + */ + +if (!isset($_SESSION['TWITTER_ACCESS_TOKEN'])) { + + $_SESSION['TWITTER_REDIRECT_URL'] = URL_ROOT . basename(__DIR__) . '/' . basename(__FILE__); + // Permanent redirection + header("HTTP/1.1 301 Moved Permanently"); + header("Location: client.php?CONNECT=true&rep=" . basename(__DIR__)); + exit(); + +} +?> + + + + + + Avant-Première Hanna Arendt : Tweet Wall + + + + + + + + + + + + + + + + + + + +

+ + + +

+ +

+ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/hanna-arendt/paris.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hanna-arendt/paris.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,88 @@ + basename(__DIR__)); + +include_once '../common.php'; + +/** + * Do we already have a valid Access Token or need to go get one? + */ + +if (!isset($_SESSION['TWITTER_ACCESS_TOKEN']) ) { + + $_SESSION['TWITTER_REDIRECT_URL'] = URL_ROOT . basename(__DIR__) . '/' . basename(__FILE__); + // Permanent redirection + header("HTTP/1.1 301 Moved Permanently"); + header("Location: client.php?CONNECT=true&rep=".basename(__DIR__)); + exit(); + +} + +?> + + + + + + Avant-Première Hanna Arendt : Tweet Wall + + + + + + + + + + + + + + + + + + + +

+ +

+ + \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/hanna-arendt/script.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hanna-arendt/script.js Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,1223 @@ +var tracking_keywords = [ "#AVPHannaArendt" ]; + +function rejectUser(username) { + return (/^[A-Z][a-z]{2,8}[0-9]{4,6}$/.test(username)) +} + +if (typeof annotations == "undefined" || !annotations) { + var annotations = { + "default" : { + "colors" : { + "h" : 0, + "s" : 0 + } + }, + "positive" : { + "display_name" : "++ | accord", + "keywords" : [ /\+\+/ ], + "colors" : { + "h" : .3, + "s" : .65 + } + }, + "negative" : { + "display_name" : "-- | désaccord", + "keywords" : [ /\-\-/ ], + "colors" : { + "h" : 0, + "s" : .8 + } + }, + "reference" : { + "display_name" : "== | référence", + "keywords" : [ /\=\=/ ], + "colors" : { + "h" : .16, + "s" : .8 + } + }, + "question" : { + "display_name" : "?? | question", + "keywords" : [ /\?\?/ ], + "colors" : { + "h" : .6, + "s" : .8 + } + } + } +} + +if (typeof l10n == "undefined") { + l10n = { "rechercher" : "Rechercher" } +} + +if (typeof suggested_keywords == "undefined") { + suggested_keywords = [ ]; +} + +if (typeof max_pages == "undefined" || !max_pages) { + max_pages = 2; +} + +tracking_keywords = _(tracking_keywords).map(function(_w) { + return _w.toLowerCase(); +}); + +var twCx = { + tlPaper : null, + followLast : true, + position : "0", + date_levels : [ + 3600 * 1000, + 15 * 60 * 1000, + 5 * 60 * 1000, + 60 * 1000 + ], + timeLevel : 1, + deltaX : 40, + tlWidth : 150, + tlHeight : 480, + globalWords : {}, + suggestCount : _(suggested_keywords).map(function(_w) { + return { + "word" : _w, + "rgxp" : new RegExp(_w.replace(/(\W)/g, '\\$1'), "im"), + "freq" : 0, + "annotations" : {} + } + }), + refMouse : { x : 0, y : 0}, + refPosTl : { x : 0, y : 0}, + tlMouseMoved : false, + tlMouseClicked : false, + filtre : null, + tlBuffer : '', + relHover : [], + wheelDelta : 0, + scrollEnabled : false, + scrollExtent : 8000 - 480, + lastScrollPos : 0, + urlRegExp : /https?:\/\/[0-9a-zA-Z\.%\/-_]+/g, + wordRegExp : /[^ \.&;,'"!\?\d\+\[\]\\\…\-«»:\/]{3,}/g, + stopWords : [ + 'aussi', 'and', 'avec', 'aux', 'bien', 'car', 'cette', 'comme', 'dans', 'donc', 'des', 'elle', 'encore', 'est', + 'être', 'eux', 'faire', 'fait', 'http', 'ici', 'ils', 'les', 'leur', 'leurs', 'mais', 'mes', 'même', 'mon', 'notre', + 'non', 'nos', 'nous', 'ont', 'oui', 'par', 'pas', 'peu', 'peut', 'plus', 'pour', 'que', 'qui', 'ses' ,'son', 'sont', 'sur', + 'tes', 'très', 'the', 'ton', 'tous', 'tout', 'une', 'votre', 'vos', 'vous' + ] + } + +function getTweets(options) { + + function getTweetUrl(url) { + $.getJSON(url, function(data) { + options.tweets = options.tweets.concat(data); + options.currentPage++; + if (options.cbData) { + options.cbData(); + } + var _isLast = true; + if (data.results && data.results.length) { + var _oldestTweetId = data.results[data.results.length - 1].id_str, + _maxId = _oldestTweetId; + if (options.currentPage < options.pages) { + _isLast = false; + getTweetUrl(baseurl + firstparams + '&max_id=' + _maxId + lastparams); + } + } + + if (_isLast) { + options.tweets.sort(function(a,b) { + return a.id - b.id; + }); + if (options.cbEnd) { + options.cbEnd(); + } + } + }); + } + + options.tweets = []; + options.pages || (options.pages = 1); + options.rpp || (options.rpp = 100); + options.currentPage = 0; + var baseurl = "search_tweets.php", + firstparams = "?endpoint=favorites/list" + (typeof favUser === "string" ? ("&screen_name=" + encodeURIComponent(favUser)) : "") + + "&count=" + options.rpp + "&include_entities=true", + lastparams = (options.since_id ? "&since_id=" + options.since_id : '' ) + "&callback=?", + jsonurl = baseurl + firstparams + lastparams; + getTweetUrl(jsonurl); +} + +function getColor(annotation, lum) { + return Raphael.hsl2rgb(annotations[annotation].colors.h, annotations[annotation].colors.s, lum); +} + +function tweetPopup(url) { + var popW = 550, + popH = 350, + scrW = screen.width, + scrH = screen.height, + posX = Math.round((scrW/2)-(popW/2)), + posY = (scrH > popH ? Math.round((scrH/2)-(popH/2)) : 0); + window.open(url, + '', + 'left=' + posX + ',top=' + posY + ',width=' + popW + ',height=' + popH + ',personalbar=0,toolbar=0,scrollbars=1,resizable=1'); +} + +function arc(source, target) { + var x3 = .3 * target.y - .3 * source.y + .8 * source.x + .2 * target.x; + var y3 = .8 * source.y + .2 * target.y - .3 * target.x + .3 * source.x; + var x4 = .3 * target.y - .3 * source.y + .2 * source.x + .8 * target.x; + var y4 = .2 * source.y + .8 * target.y - .3 * target.x + .3 * source.x; + return "M" + source.x + " " + source.y + "C" + [x3, y3, x4, y4, target.x, target.y].join(" "); +} + +function addTweet(tweet) { + if (!tweet) { + console.log(tweet); + return; + } + + if (rejectUser(tweet.from_user)) { + return; + } + + function backRef(source_id, target_id, type) { + var target = tweetById(target_id); + if (target) { + var brobj = { + "referenced_by_id" : source_id, + "type" : type + } + if (target.backRefs) { + target.backRefs.push(brobj); + } else { + target.backRefs = [ brobj ] + } + } + } + + _(['id', 'from_user_id', 'in_reply_to_status_id']).each(function(_i) { + tweet[_i] = tweet[_i + '_str']; + delete tweet[_i + '_str']; + }); + + if (_(twCx.idIndex).indexOf(tweet.id) != -1) { + return; + } + + tweet.html_parts = [] + + if (tweet.entities && tweet.entities.user_mentions) { + for (var _i = 0; _i < tweet.entities.user_mentions.length; _i++) { + var _m = tweet.entities.user_mentions[_i]; + tweet.html_parts.push({ + "text" : "@" + _m.screen_name, + "start" : _m.indices[0], + "end" : _m.indices[1], + "link" :'' + }); + } + } + + if (tweet.entities && tweet.entities.hashtags) { + for (var _i = 0; _i < tweet.entities.hashtags.length; _i++) { + var _m = tweet.entities.hashtags[_i], + _h = "#" + _m.text; + tweet.html_parts.push({ + "text" : _h, + "start" : _m.indices[0], + "end" : _m.indices[1], + "link" :'' + }); + } + } + + if (tweet.entities && tweet.entities.urls) { + for (var _i = 0; _i < tweet.entities.urls.length; _i++) { + var _m = tweet.entities.urls[_i]; + tweet.html_parts.push({ + "text" : _m.display_url || _m.url, + "start" : _m.indices[0], + "end" : _m.indices[1], + "link" :'' + }); + } + } + tweet.date_value = Date.parse(tweet.created_at.replace(/(\+|-)/,'UTC$1')); + + var ann = []; + for (var j in annotations) { + if (j != "default") { + for (var k in annotations[j].keywords) { + if (tweet.text.search(annotations[j].keywords[k]) != -1) { + ann.push(j); + break; + } + } + } + } + tweet.annotations = ann; + + if (tweet.in_reply_to_status_id) { + backRef( tweet.id, tweet.in_reply_to_status_id, "reply" ); + } + + if (tweet.retweeted_status && tweet.retweeted_status.id_str) { + tweet.retweeted_status_id = tweet.retweeted_status.id_str; + backRef( tweet.id, tweet.retweeted_status_id, "retweet" ); + } + + + var tab = tweet.text.replace(twCx.urlRegExp,'').match(twCx.wordRegExp); + _(tab).each(function(w) { + var word = w.toLowerCase(); + if (_(twCx.stopWords).indexOf(word) == -1 && _(tracking_keywords).indexOf(word) == -1 && word[0] != '@') { + if (twCx.globalWords[word]) { + twCx.globalWords[word].freq++; + } else { + twCx.globalWords[word] = { + "freq" : 1, + "annotations" : {} + } + for (var j in annotations) { + if (j != 'default') { + twCx.globalWords[word].annotations[j] = 0; + } + } + } + for (var j in ann) { + if (typeof twCx.globalWords[word].annotations != "undefined") { + twCx.globalWords[word].annotations[ann[j]]++; + } + } + } + }); + + _(twCx.suggestCount).each(function(_k) { + if (tweet.text.search(_k.rgxp) != -1) { + _k.freq++; + _(ann).each(function(_a) { + _k.annotations[_a] = 1 + ( _k.annotations[_a] || 0 ) + }) + } + }); + + + var p = twCx.idIndex.length; + while (p && tweet.id < twCx.idIndex[p-1]) { + p--; + } + twCx.tweets.splice(p, 0, tweet); + twCx.idIndex.splice(p, 0, tweet.id); + + if (!twCx.timeline.length) { + twCx.timeline = [ populateDateStruct(0, twCx.date_levels[0] * parseInt(tweet.date_value / twCx.date_levels[0])) ] + } + while (tweet.date_value > twCx.timeline[twCx.timeline.length - 1].end) { + twCx.timeline.push( populateDateStruct(0, twCx.timeline[twCx.timeline.length - 1].end) ); + } + + insertIntoDateStruct(twCx.timeline, tweet); +} + +function getSliceContent(slice) { + if (slice.slices) { + var result = []; + for (var i in slice.slices) { + result = result.concat(getSliceContent(slice.slices[i])); + } + } else { + var result = slice.tweets; + } + return result; +} + +function flattenDateStruct(slices, target_level) { + var current_level = slices[0].level, + result = []; + if (current_level < target_level) { + if (slices[0].slices) { + for (var i in slices) { + result = result.concat(flattenDateStruct(slices[i].slices, target_level)); + } + } + } + else { + for (var i in slices) { + result.push({ + "start" : slices[i].start, + "end" : slices[i].end, + "tweets" : getSliceContent(slices[i]) + }); + } + } + return result; +} + +function trimFDS() { + var slices = flattenDateStruct(twCx.timeline, twCx.timeLevel); + if (!slices || !slices.length) { + return []; + } + while (slices[0].tweets.length == 0) { + slices.splice(0,1); + } + while (slices[slices.length - 1].tweets.length == 0) { + slices.pop(); + } + var centralTweet = ( twCx.centralTweet ? twCx.centralTweet : twCx.tweets[twCx.tweets.length - 1] ), + delta = 30 * twCx.date_levels[twCx.timeLevel], + centre = Math.min(slices[slices.length - 1].end - delta , Math.max(slices[0].start + delta, centralTweet.date_value)), + min = centre - delta, + max = centre + delta; + while (slices[0].start < min) { + slices.splice(0,1); + } + while (slices[slices.length - 1].end > max) { + slices.pop(); + } + return slices; +} + +function populateDateStruct(level, start) { + var end = start + twCx.date_levels[level], + struct = { + "level" : level, + "start" : start, + "end" : end + }; + if (level < twCx.date_levels.length - 1) { + struct.slices = []; + var newstart = start; + while (newstart < end) { + struct.slices.push(populateDateStruct(level + 1, newstart)); + newstart += twCx.date_levels[level + 1]; + } + } else { + struct.tweets = []; + } + return struct; +} + +function insertIntoDateStruct(slices, tweet) { + var creadate = tweet.date_value; + for (var i in slices) { + if (creadate < slices[i].end) { + if (slices[i].slices) { + insertIntoDateStruct(slices[i].slices, tweet); + } else { + slices[i].tweets.push(tweet.id); + } + break; + } + } +} + +function placeHolder(className) { + return '

'; +} + +function tweetById(tweetid) { + var pos = _(twCx.idIndex).indexOf(tweetid); + return (pos == -1) ? false : twCx.tweets[pos]; +} + +function selectTweet(tweetid) { + twCx.position = tweetid; + twCx.followLast = (twCx.position == twCx.idIndex[twCx.tweets.length - 1]); + updateDisplay(); +} + +function goToPos(nPos) { + twCx.position = twCx.currentIdIndex[Math.min( twCx.currentIdIndex.length - 1, Math.max(0, nPos ) )]; + twCx.followLast = (!twCx.filtre && nPos == twCx.tweets.length - 1); + updateDisplay(); +} + +function movePos(delta) { + goToPos( delta + _(twCx.currentIdIndex).indexOf(twCx.position) ); +} + +function tweetToHtml(tweet, className, elName) { + + function highlight(texte) { + return ( twCx.filtre ? texte.replace(twCx.filtre, '$1' ) : texte ); + } + + if (!tweet) { + return placeHolder(className); + } + var el = (elName ? elName : 'li'); + var html = '<' + + el + + ' draggable="true" class="tweet ' + + className + + '" id="tweet_' + + tweet.id + + '" data-title="Tweet by ' + + _(tweet.user.name).escape() + + '" data-description="' + + _(tweet.text).escape() + + '" data-uri="http://twitter.com/' + + tweet.user.screen_name + + '/status/' + + tweet.id + + '"'; + if (className != 'full') { + html += ' onclick="selectTweet(\'' + tweet.id + '\'); return false;"'; + } + html += ' onmouseover="rolloverTweet(\'' + tweet.id + "', " + ( className == 'icons' ) + ');"'; + if (twCx.followLast && className == 'full' && el == 'li') { + html += ' style="display: none"'; + } + html += '>'; + if (tweet.annotations.length) { + html += '

'; + for (var i in tweet.annotations) { + html += '

'; + } + html += '

'; + var a_user = ''; + html += '

'; + if (className == 'full') { + html += '

' + new Date(tweet.date_value).toTimeString().substr(0,8) + '

'; + } + html += '

'; + if (className != 'icons') { + lastend = 0; + var txt = ''; + tweet.html_parts.sort(function(a, b) { return a.start - b.start }); + _(tweet.html_parts).each(function(_e) { + txt += highlight( tweet.text.substring(lastend, _e.start) ) + _e.link + highlight( _e.text ) + ''; + lastend = _e.end; + }); + txt += highlight( tweet.text.substring(lastend) ); + html += '

' + a_user + highlight('@' + tweet.user.screen_name) + '' + ( className == 'full' ? ' (' + tweet.user.name + ')
' : ' : ') + txt + '

'; + if (className == 'full' && el == 'li') { + html += '

afficher tweet - '; + html += 'répondre · '; + html += 'retweeter · '; + html += 'favori

'; + } + } + html += '

'; + return html; +} + +function tlIdFromPos(x, y, outside) { + if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) { + return; + } + var ligne = Math.min( twCx.tlOnDisplay.length - 1, Math.max( 0, Math.floor(( twCx.tlHeight - y ) / twCx.scaleY) ) ), + colonne = Math.floor(( x - twCx.deltaX ) / twCx.scaleX ), + l = 0; + if (colonne >= twCx.tlOnDisplay[ligne].totalTweets || colonne < 0 ) { + if (outside) { + colonne = Math.min( twCx.tlOnDisplay[ligne].totalTweets - 1, Math.max( 0, colonne )); + } else { + return null; + } + } + for (var i in twCx.tlOnDisplay[ligne].displayData) { + var nl = l + twCx.tlOnDisplay[ligne].displayData[i].length; + if (colonne < nl) { + return { + "id" : twCx.tlOnDisplay[ligne].displayData[i][colonne - l], + "annotation" : i + } + } + l = nl; + } +} + +function tlPosTweet(tweet, annotation) { + if (!twCx.tweets) { + return; + } + var x, + y, + dt = tweet.date_value, + ann = ( annotation ? annotation : ( tweet.annotations.length ? tweet.annotations[0] : 'default' ) ); + for (var i = 0; i < twCx.tlOnDisplay.length; i++) { + if (twCx.tlOnDisplay[i].end > dt) { + y = twCx.tlHeight - (i + .5) * twCx.scaleY; + var l = 0; + for (var j in twCx.tlOnDisplay[i].displayData) { + if (j == ann) { + var p = _(twCx.tlOnDisplay[i].displayData[j]).indexOf(tweet.id); + if (p != -1) { + x = twCx.deltaX + twCx.scaleX * ( p + l + .5 ); + } + break; + } + l += twCx.tlOnDisplay[i].displayData[j].length; + } + break; + } + } + return ( x && y ? { "x" : x, "y" : y } : null); +} + +function rolloverTweet(tweetid, showPopup, annotation) { + var t = tweetById(tweetid); + if (!t) { + return; + } + var p = tlPosTweet(t, annotation); + if (!p) { + return; + } + var ptl = $("#timeline").offset(); + if (showPopup) { + $("#hovercontent").html(tweetToHtml(t, 'full', 'div')); + $("#hovertweet").css({ + "left" : parseInt(ptl.left + p.x) + "px", + "top" : parseInt(ptl.top + p.y), + "display" : "block"}); + } else { + $("#hovertweet").hide(); + } + for (var i in twCx.relHover) { + twCx.relHover[i].remove(); + } + twCx.relHover = drawTweetArcs(t, p, '#303030'); + twCx.relHover.push(drawTweetPos(p, '#ffffff')); +} + +function drawTweetPos(pos, color) { + var rel = twCx.tlPaper.rect(pos.x - .5 * twCx.scaleX, pos.y - .5 * twCx.scaleY, twCx.scaleX, twCx.scaleY); + rel.attr({ "stroke" : color, "fill" : color, "fill-opacity" : .25 }); + return rel; +} + +function drawTweetArcs(tweet, pos, color) { + + var res = []; + + function tweetAndArc(a, b, aorb) { + if (a && b) { + res.push(drawTweetPos(aorb ? a : b, color)); + var aa = twCx.tlPaper.path(arc(a,b)) + .attr({ "stroke" : color, "stroke-width" : 1.5, "stroke-opacity" : .8 }); + res.push(aa); + } + } + + if (tweet.retweeted_status_id) { + var t = tweetById(tweet.retweeted_status_id); + if (t) { + tweetAndArc(pos, tlPosTweet(t)); + } + } + + if (tweet.in_reply_to_status_id) { + var t = tweetById(tweet.in_reply_to_status_id); + if (t) { + tweetAndArc(pos, tlPosTweet(t)); + } + } + + if (tweet.backRefs) { + for (var i in tweet.backRefs) { + var t = tweetById(tweet.backRefs[i].referenced_by_id); + if (t) { + tweetAndArc(tlPosTweet(t), pos, true); + } + } + } + + return res; +} + +function mouseoverkw() { + var _jel = $(this), + _off = _jel.offset(); + _jel.css({ + color: "#0099ff" + }); + $("#hoverkw") + .css({ + "left" : _off.left + "px", + "top" : ( parseInt(_off.top) + ~~ (_jel.height() / 2) ) + "px", + "display" : "block" + }) + .attr("kw", _jel.text()); +} + +function mouseoutkw() { + $("#hoverkw").hide(); + $(this).css({ + color: "#000000" + }); +} + +function makeTagCloud(tab, div) { + var minfreq = _(tab).min( function(a) { return a.freq} ).freq, + maxfreq = Math.max(minfreq + .1, _(tab).max( function(a) { return a.freq} ).freq), + echfreq = 8 / Math.sqrt( maxfreq - minfreq ), + html = ''; + _(tab).each(function(_j) { + var maxann = 0, + ann = "default"; + for (var k in _j.annotations) { + if (_j.annotations[k] == maxann) { + ann = "default"; + } + if (_j.annotations[k] > maxann) { + ann = k; + maxann = _j.annotations[k]; + } + } + if (ann == "default") { + var coul = ''; + } else { + var c = getColor(ann, .6), + coul = "background: rgba(" + [ Math.floor(c.r), Math.floor(c.g), Math.floor(c.b), ( _j.annotations[ann] / _j.freq )].join(',') + ")"; + } + var fontsize = Math.floor( ( 12 + Math.sqrt( _j.freq - minfreq ) * echfreq ) ); + html += '' + _j.word + ' '; + }); + $(div).html(html); + $(div + " span") + .mouseover(mouseoverkw) + .mouseout(mouseoutkw) + .click(function() { + $("#hoverkw").toggle(); + }); +} + +function updateDisplay() { + if (!twCx.tweets) { + return; + } + if (twCx.filtre) { + var tweets = _(twCx.tweets).filter(function(tweet) { + var mention = '@' + tweet.user.screen_name; + return ( tweet.text.search(twCx.filtre) != -1 ) || ( mention.search(twCx.filtre) != -1 ); + }); + $("#inp_q").val(twCx.filtreTexte + ' (' + tweets.length + ' tweets)'); + if (tweets.length) { + var idIndex = _(tweets).map(function(tweet) { + return tweet.id; + }); + var p = _(idIndex).indexOf(twCx.position); + if (p == -1) { + for (p = idIndex.length - 1; p > 0 && idIndex[p] > twCx.position; p--) { + } + } + twCx.position = idIndex[p]; + twCx.currentIdIndex = idIndex; + } + + } else { + twCx.currentIdIndex = twCx.idIndex; + var tweets = twCx.tweets; + var p = _(twCx.idIndex).indexOf(twCx.position); + if (p == -1) { + p = (twCx.followLast ? twCx.idIndex.length - 1 : 0); + } + } + + + var l = tweets.length, + lines = 0, + ppy = 0, + html = '', + tweetsOnDisplay = []; + + function pushTweet(tp, className) { + + if (tp < l && tp >= 0) { + + html += tweetToHtml(tweets[tp], className); + + tweetsOnDisplay.push(tp); + + } else { + html += placeHolder(className); + } + } + + if (l) { + + twCx.lastScrollPos = Math.floor( twCx.scrollExtent * ( 1 - ( p / l ) ) ); + $("#scrollcont").scrollTop(twCx.lastScrollPos); + + if (l > p + 18) { + lines++; + ppy += 20; + for (var i = p + 31; i >= p + 18; i--) { + pushTweet(i, 'icons'); + } + } + if (l > p + 4) { + lines++; + ppy += 20; + for (var i = p + 17; i >= p + 4; i--) { + pushTweet(i, 'icons'); + } + } + for (var k = 3; k >= 1; k--) { + if (l > p + k) { + ppy += 47; + lines++; + pushTweet(p + k, 'half'); + } + } + pushTweet(p, 'full'); + var n = p - 1; + for (var i = 0; i < Math.min(6, Math.max(3, 6 - lines)); i++) { + if (n < 0) { + break; + } + pushTweet(n, 'half'); + n--; + } + for (var i = 0; i < 14 * Math.min(4, Math.max(2, 7 - lines)); i++) { + if (n < 0) { + break; + } + pushTweet(n, 'icons'); + n--; + } + if (html != twCx.tlBuffer) { + $("#tweetlist").html(html); + $(".tweet.full").fadeIn(); + twCx.tlBuffer = html; + } + + if (twCx.suggestCount.length) { + makeTagCloud(twCx.suggestCount, "#suggkw"); + } + + var tab = _(twCx.globalWords).chain() + .map(function(v, k) { + return { + "word": k, + "freq" : v.freq, + "annotations" : v.annotations + }; + }).filter(function(v) { + return v.freq > 3; + }).value(); + + if (tab.length) { + + tab = _(tab).sortBy( function(a) { return ( - a.freq ) }).slice(0,40); + makeTagCloud(tab,"#motscles"); + } else { + $("#motscles").html(''); + } + twCx.centralTweet = tweets[p]; + } else { + $("#tweetlist").html(''); + twCx.tlBuffer = ''; + $("#motscles").html(''); + } + + twCx.tlOnDisplay = trimFDS(); + if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) { + return; + } + twCx.scaleY = twCx.tlHeight / twCx.tlOnDisplay.length; + var maxTweets = 0, + startTl = 0, + endTl = twCx.tlOnDisplay.length - 1; + if (l) { + var startTw = tweets[tweetsOnDisplay[tweetsOnDisplay.length - 1]].date_value, + endTw = tweets[tweetsOnDisplay[0]].date_value; + } + for (var i = 0; i < twCx.tlOnDisplay.length; i++) { + if (l) { + if (startTw >= twCx.tlOnDisplay[i].start && startTw < twCx.tlOnDisplay[i].end) { + startTl = i; + } + if (endTw >= twCx.tlOnDisplay[i].start && endTw < twCx.tlOnDisplay[i].end) { + endTl = i; + } + } + var displayData = {}; + for (var j in annotations) { + displayData[j] = []; + } + for (var j in twCx.tlOnDisplay[i].tweets) { + var tweetid = twCx.tlOnDisplay[i].tweets[j], + tweet = tweetById(tweetid); + if (tweet) { + if (tweet.annotations.length) { + for (var k in tweet.annotations) { + displayData[tweet.annotations[k]].push(tweetid); + } + } else { + displayData['default'].push(tweetid); + } + } + } + var nbT = 0; + for (var j in displayData) { + nbT += displayData[j].length; + } + maxTweets = Math.max(maxTweets, nbT); + twCx.tlOnDisplay[i].displayData = displayData; + twCx.tlOnDisplay[i].totalTweets = nbT; + } + twCx.scaleX = ( twCx.tlWidth - twCx.deltaX ) / maxTweets; + twCx.tlPaper.clear(); + twCx.relHover = null; + + // Dessin de la correspondance liste-timeline + if (l) { + var startY = twCx.tlHeight - startTl * twCx.scaleY, + endY = twCx.tlHeight - ( endTl + 1 ) * twCx.scaleY, + path = "M0 " + twCx.tlHeight + "C" + .7*twCx.deltaX + " " + twCx.tlHeight + " " + .3*twCx.deltaX + " " + startY + " " + twCx.deltaX + " " + startY + "L" + twCx.tlWidth + " " + startY + "L" + twCx.tlWidth + " " + endY + "L" + twCx.deltaX + " " + endY + "C" + .3*twCx.deltaX + " " + endY + " " + .7*twCx.deltaX + " 0 0 0"; + twCx.tlPaper.path( path ).attr({ "stroke" : "none", "fill" : "#8080c0", "opacity" : .2 }); + } + // dessin de la date de début + + twCx.tlPaper.text(twCx.deltaX / 2, twCx.tlHeight - 7, new Date(twCx.tlOnDisplay[0].start).toTimeString().substr(0,5)) + .attr({ "text-anchor" : "middle", "font-size": "9px", "fill": "#cccccc" }); + + // dessin de la date de fin + + twCx.tlPaper.text(twCx.deltaX / 2, 7, new Date(twCx.tlOnDisplay[twCx.tlOnDisplay.length - 1].end).toTimeString().substr(0,5)) + .attr({ "text-anchor" : "middle", "font-size": "9px", "fill": "#cccccc" }); + + for (var i = 0; i < twCx.tlOnDisplay.length; i++) { + var n = 0, + posY = twCx.tlHeight - ( i + 1 ) * twCx.scaleY; + for (var j in twCx.tlOnDisplay[i].displayData) { + var ll = twCx.tlOnDisplay[i].displayData[j].length; + if (ll > 0) { + twCx.tlPaper.rect( twCx.deltaX + n * twCx.scaleX, posY, ll * twCx.scaleX, twCx.scaleY ) + .attr({"stroke" : "none", "fill" : getColor(j, .4).hex }); + n += ll; + } + } + + // Si on est à une demi-heure, on trace un axe secondaire + heure + + if (i < twCx.tlOnDisplay.length - 1 && !(twCx.tlOnDisplay[i].end % 1800000)) { + twCx.tlPaper.path("M0 "+posY+"L" + twCx.tlWidth +" "+posY).attr({"stroke":"#555"}); + twCx.tlPaper.text(twCx.deltaX / 2, posY, new Date(twCx.tlOnDisplay[i].end).toTimeString().substr(0,5)).attr({ "text-anchor" : "middle", "font-size": "9px", "fill": "#cccccc" }); + } + } + + // dessin du tweet courant + + if (l) { + + if (twCx.filtre) { + for (var i = 0; i < tweets.length; i++) { + if (i != p) { + var pos = tlPosTweet(tweets[i]); + if (pos) { + drawTweetPos(pos, "#ffccff"); + } + } + } + + } + + var posp = tlPosTweet(tweets[p]); + if (posp) { + + drawTweetPos(posp, "#ffff00"); + var yy = posp.y - .5 * twCx.scaleY, + ppy = $(".tweet.full").offset().top - $("#tweetlist").offset().top + path = "M0 " + ppy + "C" + ( .7 * twCx.deltaX ) + " " + ppy + " " + ( .2 * twCx.deltaX ) + " " + yy + " " + ( twCx.deltaX ) + " " + yy + "L" + ( posp.x - .5 * twCx.scaleX ) + " " + yy; + yy = posp.y + .5 * twCx.scaleY; + ppy += $(".tweet.full").height(); + path += "L" + ( posp.x - .5 * twCx.scaleX ) + " " + yy + "L" + twCx.deltaX + " " + yy + "C" + ( .2 * twCx.deltaX ) + " " + yy + " " + ( .7 * twCx.deltaX ) + " " + ppy + " 0 " + ppy; + twCx.tlPaper.path( path ).attr({"stroke":"#ffff00", "fill" : "#ffff00", "fill-opacity" : .15}); + + drawTweetArcs(tweets[p], posp, '#800080'); + } + } +} + +function filtrerAnnotation(annotation) { + if (annotations[annotation]) { + effectuerFiltrage(annotations[annotation].display_name, + new RegExp( "(" + _(annotations[annotation].keywords).map(function(a) { return a.source }).join("|") + ")", "gim" ) ); + } else { + effectuerFiltrage('', null) + } +} + +function filtrerTexte(valeur) { + effectuerFiltrage( valeur, valeur ? new RegExp("(" + valeur.replace(/(\W)/g, '\\$1') + ")" ,'gim') : null ); +} + +function effectuerFiltrage(filtreTexte, tabRegexp) { + $("#recherche_annot").slideUp(); + $("#inp_q").val(filtreTexte).attr("class","rechercheCourante"); + twCx.filtreTexte = filtreTexte; + twCx.filtre = tabRegexp; + twCx.followLast = !tabRegexp && (twCx.position == twCx.idIndex[twCx.idIndex.length - 1]); + updateDisplay(); +} + +function clicTl(evt) { + var o = $("#timeline").offset(); + if (twCx.tlMouseClicked && twCx.tlMouseMoved) { + var twid = tlIdFromPos(evt.pageX - o.left + twCx.refPosTl.x - twCx.refMouse.x, evt.pageY - o.top + twCx.refPosTl.y - twCx.refMouse.y, true); + if (twid) { + selectTweet(twid.id); + } + } else { + var twid = tlIdFromPos(evt.pageX - o.left, evt.pageY - o.top, twCx.tlMouseClicked); + if (twCx.tlMouseMoved && !twCx.tlMouseClicked) { + if (twid) { + rolloverTweet(twid.id, true, twid.annotation); + } else { + $("#hovertweet").hide(); + } + } + if (twCx.tlMouseClicked && !twCx.tlMouseMoved) { + if (twid) { + selectTweet(twid.id); + } + } + } +} + +function loadTweets(tweets, append) { + if (!append) { + twCx.timeline = []; + twCx.idIndex = []; + twCx.tweets = []; + } + for (var i in tweets) { + addTweet(tweets[i]); + } + if (twCx.followLast) { + twCx.position = twCx.idIndex[twCx.tweets.length - 1]; + } + updateDisplay(); +} + +function focusOutRecherche() { + $("#recherche_annot").slideUp(); + var inpq = $("#inp_q"), + val = inpq.val(); + if (val == '' || val == twCx.filtreTexte) { + if (twCx.filtre) { + inpq.attr("class", "rechercheCourante").val(twCx.filtreTexte); + } else { + inpq.attr("class", "greyed").val(l10n.rechercher); + } + } +} + +function chaineTimeZoom() { + var chaine = "", + t = twCx.date_levels[twCx.timeLevel], + h = 3600*1000, + m = 60*1000, + s = 1000, + heures = Math.floor(t/h); + if (heures) { chaine += heures + ' h. ' }; + t -= (heures * h); + var minutes = Math.floor(t/m); + if (minutes) { chaine += minutes + ' min. ' }; + t -= (minutes * m); + if (t) { chaine += Math.floor(t/s) + ' sec.' } + $("#time_scale").html(chaine); + $("#time_zoomout").attr("class",(twCx.timeLevel == 0 ? "inactive" : "")); + $("#time_zoomin").attr("class",(twCx.timeLevel == twCx.date_levels.length - 1 ? "inactive" : "")); +} + +$(document).ready(function() { + twCx.tlWidth = $("#timeline").width(); + twCx.tlHeight = $("#timeline").height(); + twCx.tlPaper = Raphael("timeline", twCx.tlWidth, twCx.tlHeight); + + connectTweets(); + + var html = ''; + for (var j in annotations) { + if (j != "default") { + html += '' + annotations[j].display_name + ' ' + } + } + $("#rech_list_annot").html(html); + + chaineTimeZoom(); + + $("#tweetlist").mousewheel(function(e, d) { + twCx.wheelDelta += d; + if (Math.abs(twCx.wheelDelta) >= 1) { + movePos( parseInt(twCx.wheelDelta) ); + twCx.wheelDelta = 0; + } + return false; + }); + $("#tweetlist").delegate(".tweet", "dragstart", function(e) { + var div = document.createElement('div'); + div.appendChild(this.cloneNode(true)); + try { + e.originalEvent.dataTransfer.setData("text/html",div.innerHTML); + } + catch(err) { + e.originalEvent.dataTransfer.setData("text",div.innerHTML); + } + }); + $("#timeline").mousewheel(function(e, d) { + twCx.wheelDelta += d; + if (Math.abs(twCx.wheelDelta) >= 1) { + if (twCx.wheelDelta > 0) { + tl = Math.min(twCx.date_levels.length - 1, twCx.timeLevel + 1); + } else { + tl = Math.max(0, twCx.timeLevel - 1); + } + if (tl != twCx.timeLevel) { + twCx.timeLevel = tl; + chaineTimeZoom(); + updateDisplay(); + } + twCx.wheelDelta = 0; + } + return false; + }); + $("#time_zoomin").click(function() { + if (twCx.timeLevel < twCx.date_levels.length - 1) { + twCx.timeLevel++; + chaineTimeZoom(); + updateDisplay(); + } + }); + $("#time_zoomout").click(function() { + if (twCx.timeLevel > 0) { + twCx.timeLevel--; + chaineTimeZoom(); + updateDisplay(); + } + }); + $("#timeline, #tweetlist").mouseout(function() { + twCx.tlMouseClicked = false; + twCx.tlMouseMoved = false; + $("#hovertweet").hide(); + }); + $("#timeline").mousemove(function(evt) { + twCx.tlMouseMoved = true; + clicTl(evt); + }).mousedown(function(evt) { + twCx.tlMouseClicked = true; + twCx.tlMouseMoved = false; + var o = $(this).offset(); + twCx.refMouse = { x : evt.pageX - o.left, y : evt.pageY - o.top }; + twCx.refPosTl = tlPosTweet(tweetById(twCx.position)) || twCx.refMouse; + }).mouseup(function(evt) { + clicTl(evt); + twCx.tlMouseClicked = false; + twCx.tlMouseMoved = false; + }); + $("#inp_q").focus(function() { + $("#recherche_annot").slideDown(); + $(this).val($(this).val().replace(/ $.+$$/, '')) + if ($(this).hasClass("greyed")) { + $(this).val(""); + } + $(this).attr("class",""); + }).focusout(function() { + focusOutRecherche(); + }); + $("#inp_reset").click(function() { + $("#inp_q").val(''); + if (twCx.filtre) { + twCx.filtre = null; + updateDisplay(); + } + twCx.filtreTexte = ''; + focusOutRecherche(); + return false; + }) + $("#recherche").submit(function(evt) { + evt.preventDefault(); + if (!$("#inp_q").hasClass("greyed")) { + var valeur = $("#inp_q").val(); + filtrerTexte(valeur); + } + return false; + }); + $("#hoverkw").mouseover(function() { + $(this).dequeue().show(); + }).mouseout(function() { + $(this).hide(); + }); + + $("#hkwsearch").click(function() { + var _hkw = $("#hoverkw"); + filtrerTexte(_hkw.attr("kw")); + _hkw.hide(); + return false; + }); + $("#hkwtweet").click(function() { + var _hkw = $("#hoverkw"); + add_grammar(_hkw.attr("kw")); + _hkw.hide(); + return false; + }); + $(".acctitre").click(function() { + $(this).next().slideToggle(); + return false; + }) + + if (!suggested_keywords.length) { + $("#suggkw").parent().hide(); + } + + setInterval(function() { + var sc = $("#scrollcont"); + if (sc.scrollTop() != twCx.lastScrollPos && twCx.tweets && twCx.currentIdIndex) { + var p = Math.floor( twCx.currentIdIndex.length * ( 1 - sc.scrollTop() / twCx.scrollExtent ) ); + goToPos(p); + } + }, 100) +}); + +function connectTweets() { + twCx.tlPaper.clear(); + var _sq = twCx.tlPaper.rect(0, twCx.tlHeight, twCx.tlWidth, 0) + .attr({ + "stroke" : "none", + "fill" : "#8080cc" + }); + var _lb = twCx.tlPaper.text(twCx.tlWidth / 2, twCx.tlHeight / 2, "0 tweet") + .attr({ + "font-size" : "20px", + "text-anchor" : "middle" + }); + + getTweets({ + "keyword" : tracking_keywords.join(" OR "), + "pages" : max_pages, + "rpp" : 100, + "cbData" : function() { + _lb.attr("text", (this.tweets.length - this.currentPage + 1) + " tweets"); + var _h = twCx.tlHeight * this.currentPage / this.pages; + _sq.animate({ + "y" : twCx.tlHeight - _h, + "height" : _h + }) + }, + "cbEnd" : function() { + loadTweets(this.tweets); + setInterval(function() { + getTweets({ + "keyword" : tracking_keywords.join(" OR "), + "pages" : 1, + /*"since_id" : twCx.idIndex[twCx.idIndex.length - 1],*/ + "rpp" : 100, + "cbEnd" : function() { + loadTweets(this.tweets, true); + } + }); + }, 60000) + } + }); +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/hanna-arendt/style.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hanna-arendt/style.css Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,50 @@ +body { + background: #222222; +} + + +#main { + position: absolute; background: url(arendt-background.jpg); + left: 50%; top: 50%; width: 1400px; height: 875px; + margin-top: -437px; margin-left: -700px; +} + +#visionplayer_1101 { + position: absolute; margin: 5px; width: 836px; height: 440px; left: 34px; top: 247px; +} + +#visionplayer_1101 img { + margin: 20px auto; +} + +#vizcontainer { + position: absolute; left: 915px; top: 247px; width: 452px; height: 507px; overflow: hidden; +} + +#tweetlist { + background: #222222; color: #cccccc; +} + +li.tweet { + background: none; +} + +.full p.tweet_text { + color: #ffffff; +} + +#inp_q, #recherche_annot { + background: #555555; color: #cccccc; +} + +li.tweet, li.placeholder { + border-color: #666666; +} + +li.full { + border-right: 10px solid #ff0 !important; +} + +li.tweet a { + color: #80ccfc; +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl.php --- a/web/lib/Zend/Acl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Acl.php 23358 2010-11-18 16:19:31Z ralph $ + * @version $Id: Acl.php 24771 2012-05-07 01:13:06Z adamlundrigan $ */ @@ -53,7 +53,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl @@ -140,7 +140,7 @@ * will have the least priority, and the last parent added will have the * highest priority. * - * @param Zend_Acl_Role_Interface $role + * @param Zend_Acl_Role_Interface|string $role * @param Zend_Acl_Role_Interface|string|array $parents * @uses Zend_Acl_Role_Registry::add() * @return Zend_Acl Provides a fluent interface @@ -655,7 +655,7 @@ } unset($rTarget); } - + // normalize privileges to array if (null === $privileges) { $privileges = array(); @@ -726,7 +726,7 @@ } continue; } - + if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) { @@ -750,7 +750,7 @@ * since null (all resources) was passed to this setRule() call, we need * clean up all the rules for the global allResources, as well as the indivually * set resources (per privilege as well) - */ + */ foreach (array_merge(array(null), $allResources) as $resource) { $rules =& $this->_getRules($resource, $role, true); if (null === $rules) { @@ -769,7 +769,7 @@ } continue; } - + if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) { unset($rules['allPrivileges']); } @@ -1218,6 +1218,11 @@ } /** + * Returns an array of registered roles. + * + * Note that this method does not return instances of registered roles, + * but only the role identifiers. + * * @return array of registered roles */ public function getRoles() @@ -1232,6 +1237,6 @@ { return array_keys($this->_resources); } - + } - + diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Assert/Interface.php --- a/web/lib/Zend/Acl/Assert/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Assert/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Acl_Assert_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Exception.php --- a/web/lib/Zend/Acl/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Resource.php --- a/web/lib/Zend/Acl/Resource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Resource.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Resource implements Zend_Acl_Resource_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Resource/Interface.php --- a/web/lib/Zend/Acl/Resource/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Resource/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Acl_Resource_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Role.php --- a/web/lib/Zend/Acl/Role.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Role.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Role.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Role.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Role implements Zend_Acl_Role_Interface @@ -44,7 +44,7 @@ /** * Sets the Role identifier * - * @param string $id + * @param string $roleId * @return void */ public function __construct($roleId) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Role/Interface.php --- a/web/lib/Zend/Acl/Role/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Role/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Acl_Role_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Role/Registry.php --- a/web/lib/Zend/Acl/Role/Registry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Role/Registry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Registry.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Role_Registry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Acl/Role/Registry/Exception.php --- a/web/lib/Zend/Acl/Role/Registry/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Acl/Role/Registry/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Adobe/Auth.php --- a/web/lib/Zend/Amf/Adobe/Auth.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Adobe/Auth.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Auth.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Auth.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Amf_Auth_Abstract */ @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Adobe/DbInspector.php --- a/web/lib/Zend/Amf/Adobe/DbInspector.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Adobe/DbInspector.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbInspector.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbInspector.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_DbInspector diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Adobe/Introspector.php --- a/web/lib/Zend/Amf/Adobe/Introspector.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Adobe/Introspector.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Introspector.php 23316 2010-11-10 16:37:40Z matthew $ + * @version $Id: Introspector.php 25024 2012-07-30 15:08:15Z rob $ */ /** @see Zend_Amf_Parse_TypeLoader */ @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_Introspector diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Auth/Abstract.php --- a/web/lib/Zend/Amf/Auth/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Auth/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Auth_Adapter_Interface */ @@ -27,7 +27,7 @@ * * @package Zend_Amf * @subpackage Auth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Constants.php --- a/web/lib/Zend/Amf/Constants.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Constants.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Constants.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Constants.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * deserialization to detect the AMF marker and encoding types. * * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Amf_Constants diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Exception.php --- a/web/lib/Zend/Amf/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ /** * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Amf0/Deserializer.php --- a/web/lib/Zend/Amf/Parse/Amf0/Deserializer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Amf0/Deserializer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 21209 2010-02-27 10:37:15Z yoshida@zend.co.jp $ + * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Constants */ @@ -33,7 +33,7 @@ * @todo Class could be implemented as Factory Class with each data type it's own class * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Amf0/Serializer.php --- a/web/lib/Zend/Amf/Parse/Amf0/Serializer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Amf0/Serializer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 21968 2010-04-22 03:53:34Z matthew $ + * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ */ /** Zend_Amf_Constants */ @@ -32,7 +32,7 @@ * @uses Zend_Amf_Parse_Serializer * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer @@ -63,8 +63,8 @@ */ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only - // variables should be passed by reference" + // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // variables should be passed by reference" if ((null === $data) && ($dataByVal !== false)) { $data = &$dataByVal; } @@ -127,7 +127,7 @@ case (is_bool($data)): $markerType = Zend_Amf_Constants::AMF0_BOOLEAN; break; - case (is_string($data) && (strlen($data) > 65536)): + case (is_string($data) && (($this->_mbStringFunctionsOverloaded ? mb_strlen($data, '8bit') : strlen($data)) > 65536)): $markerType = Zend_Amf_Constants::AMF0_LONGSTRING; break; case (is_string($data)): @@ -187,23 +187,23 @@ * Check if the given object is in the reference table, write the reference if it exists, * otherwise add the object to the reference table * - * @param mixed $object object reference to check for reference - * @param $markerType AMF type of the object to write - * @param mixed $objectByVal object to check for reference + * @param mixed $object object reference to check for reference + * @param string $markerType AMF type of the object to write + * @param mixed $objectByVal object to check for reference * @return Boolean true, if the reference was written, false otherwise */ - protected function writeObjectReference(&$object, $markerType, $objectByVal = false) + protected function writeObjectReference(&$object, $markerType, $objectByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // Workaround for PHP5 with E_STRICT enabled complaining about "Only // variables should be passed by reference" if ((null === $object) && ($objectByVal !== false)) { $object = &$objectByVal; } - if ($markerType == Zend_Amf_Constants::AMF0_OBJECT - || $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY - || $markerType == Zend_Amf_Constants::AMF0_ARRAY - || $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT + if ($markerType == Zend_Amf_Constants::AMF0_OBJECT + || $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY + || $markerType == Zend_Amf_Constants::AMF0_ARRAY + || $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT ) { $ref = array_search($object, $this->_referenceObjects, true); //handle object reference diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Amf3/Deserializer.php --- a/web/lib/Zend/Amf/Parse/Amf3/Deserializer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Amf3/Deserializer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 21968 2010-04-22 03:53:34Z matthew $ + * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Parse_Deserializer */ @@ -34,7 +34,7 @@ * @todo Class could be implemented as Factory Class with each data type it's own class. * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer @@ -225,7 +225,7 @@ $timestamp = floor($this->_stream->readDouble() / 1000); require_once 'Zend/Date.php'; - $dateTime = new Zend_Date((int) $timestamp); + $dateTime = new Zend_Date($timestamp); $this->_referenceObjects[] = $dateTime; return $dateTime; } @@ -385,6 +385,7 @@ } // Add properties back to the return object. + if (!is_array($properties)) $properties = array(); foreach($properties as $key=>$value) { if($key) { $returnObject->$key = $value; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Amf3/Serializer.php --- a/web/lib/Zend/Amf/Parse/Amf3/Serializer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Amf3/Serializer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 22101 2010-05-04 20:07:13Z matthew $ + * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ */ /** Zend_Amf_Constants */ @@ -35,7 +35,7 @@ * * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer @@ -45,7 +45,7 @@ * @var string */ protected $_strEmpty = ''; - + /** * An array of reference objects per amf body * @var array @@ -78,7 +78,7 @@ */ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // Workaround for PHP5 with E_STRICT enabled complaining about "Only // variables should be passed by reference" if ((null === $data) && ($dataByVal !== false)) { $data = &$dataByVal; @@ -215,7 +215,7 @@ * @return Zend_Amf_Parse_Amf3_Serializer */ protected function writeBinaryString(&$string){ - $ref = strlen($string) << 1 | 0x01; + $ref = ($this->_mbStringFunctionsOverloaded ? mb_strlen($string, '8bit') : strlen($string)) << 1 | 0x01; $this->writeInteger($ref); $this->_stream->writeBytes($string); @@ -230,15 +230,17 @@ */ public function writeString(&$string) { - $len = strlen($string); + $len = $this->_mbStringFunctionsOverloaded ? mb_strlen($string, '8bit') : strlen($string); if(!$len){ $this->writeInteger(0x01); return $this; } - $ref = array_search($string, $this->_referenceStrings, true); - if($ref === false){ - $this->_referenceStrings[] = $string; + $ref = array_key_exists($string, $this->_referenceStrings) + ? $this->_referenceStrings[$string] + : false; + if ($ref === false){ + $this->_referenceStrings[$string] = count($this->_referenceStrings); $this->writeBinaryString($string); } else { $ref <<= 1; @@ -380,13 +382,16 @@ */ protected function writeObjectReference(&$object, $objectByVal = false) { - // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // Workaround for PHP5 with E_STRICT enabled complaining about "Only // variables should be passed by reference" if ((null === $object) && ($objectByVal !== false)) { $object = &$objectByVal; } - $ref = array_search($object, $this->_referenceObjects,true); + $hash = spl_object_hash($object); + $ref = array_key_exists($hash, $this->_referenceObjects) + ? $this->_referenceObjects[$hash] + : false; // quickly handle object references if ($ref !== false){ @@ -394,7 +399,7 @@ $this->writeInteger($ref); return true; } - $this->_referenceObjects[] = $object; + $this->_referenceObjects[$hash] = count($this->_referenceObjects); return false; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Deserializer.php --- a/web/lib/Zend/Amf/Parse/Deserializer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Deserializer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @see http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/ * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Deserializer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/InputStream.php --- a/web/lib/Zend/Amf/Parse/InputStream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/InputStream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputStream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputStream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Util_BinaryStream */ @@ -31,7 +31,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/OutputStream.php --- a/web/lib/Zend/Amf/Parse/OutputStream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/OutputStream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OutputStream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OutputStream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Util_BinaryStream */ @@ -32,7 +32,7 @@ * @uses Zend_Amf_Util_BinaryStream * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Resource/MysqlResult.php --- a/web/lib/Zend/Amf/Parse/Resource/MysqlResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Resource/MysqlResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MysqlResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MysqlResult.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Resource_MysqlResult diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Resource/MysqliResult.php --- a/web/lib/Zend/Amf/Parse/Resource/MysqliResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Resource/MysqliResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MysqliResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MysqliResult.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Resource_MysqliResult diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Resource/Stream.php --- a/web/lib/Zend/Amf/Parse/Resource/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Resource/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Resource_Stream diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/Serializer.php --- a/web/lib/Zend/Amf/Parse/Serializer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/Serializer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 21968 2010-04-22 03:53:34Z matthew $ + * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Serializer @@ -38,6 +38,13 @@ protected $_stream; /** + * str* functions overloaded using mbstring.func_overload + * + * @var bool + */ + protected $mbStringFunctionsOverloaded; + + /** * Constructor * * @param Zend_Amf_Parse_OutputStream $stream @@ -46,6 +53,7 @@ public function __construct(Zend_Amf_Parse_OutputStream $stream) { $this->_stream = $stream; + $this->_mbStringFunctionsOverloaded = function_exists('mb_strlen') && (ini_get('mbstring.func_overload') !== '') && ((int)ini_get('mbstring.func_overload') & 2); } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Parse/TypeLoader.php --- a/web/lib/Zend/Amf/Parse/TypeLoader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Parse/TypeLoader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TypeLoader.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TypeLoader.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ * @todo PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Amf_Parse_TypeLoader diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Request.php --- a/web/lib/Zend/Amf/Request.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Request.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Request.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Amf_Parse_InputStream */ @@ -40,7 +40,7 @@ * * @todo Currently not checking if the object needs to be Type Mapped to a server object. * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Request diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Request/Http.php --- a/web/lib/Zend/Amf/Request/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Request/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Amf_Request */ @@ -32,7 +32,7 @@ * * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Request_Http extends Zend_Amf_Request diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Response.php --- a/web/lib/Zend/Amf/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 21968 2010-04-22 03:53:34Z matthew $ + * @version $Id: Response.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Amf_Constants */ @@ -32,7 +32,7 @@ * Handles converting the PHP object ready for response back into AMF * * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Response @@ -95,7 +95,7 @@ $stream->writeByte($header->mustRead); $stream->writeLong(Zend_Amf_Constants::UNKNOWN_CONTENT_LENGTH); if (is_object($header->data)) { - // Workaround for PHP5 with E_STRICT enabled complaining about + // Workaround for PHP5 with E_STRICT enabled complaining about // "Only variables should be passed by reference" $placeholder = null; $serializer->writeTypeMarker($placeholder, null, $header->data); @@ -115,7 +115,7 @@ $bodyData = $body->getData(); $markerType = ($this->_objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) ? null : Zend_Amf_Constants::AMF0_AMF3; if (is_object($bodyData)) { - // Workaround for PHP5 with E_STRICT enabled complaining about + // Workaround for PHP5 with E_STRICT enabled complaining about // "Only variables should be passed by reference" $placeholder = null; $serializer->writeTypeMarker($placeholder, $markerType, $bodyData); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Response/Http.php --- a/web/lib/Zend/Amf/Response/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Response/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 22096 2010-05-04 15:37:23Z wadearnold $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Response */ @@ -28,7 +28,7 @@ * * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Response_Http extends Zend_Amf_Response @@ -41,11 +41,33 @@ public function getResponse() { if (!headers_sent()) { - header('Cache-Control: no-cache, must-revalidate'); + if ($this->isIeOverSsl()) { + header('Cache-Control: cache, must-revalidate'); + header('Pragma: public'); + } else { + header('Cache-Control: no-cache, must-revalidate'); + header('Pragma: no-cache'); + } header('Expires: Thu, 19 Nov 1981 08:52:00 GMT'); - header('Pragma: no-cache'); header('Content-Type: application/x-amf'); } return parent::getResponse(); } + + protected function isIeOverSsl() + { + $ssl = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : false; + if (!$ssl || ($ssl == 'off')) { + // IIS reports "off", whereas other browsers simply don't populate + return false; + } + + $ua = $_SERVER['HTTP_USER_AGENT']; + if (!preg_match('/; MSIE \d+\.\d+;/', $ua)) { + // Not MicroSoft Internet Explorer + return false; + } + + return true; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Server.php --- a/web/lib/Zend/Amf/Server.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Server.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 23256 2010-10-26 12:51:54Z alexander $ + * @version $Id: Server.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Server_Interface */ @@ -52,7 +52,7 @@ * @todo Make the reflection methods cache and autoload. * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Server implements Zend_Server_Interface @@ -142,12 +142,18 @@ /** * Set authentication adapter * + * If the authentication adapter implements a "getAcl()" method, populate + * the ACL of this instance with it (if none exists already). + * * @param Zend_Amf_Auth_Abstract $auth * @return Zend_Amf_Server */ public function setAuth(Zend_Amf_Auth_Abstract $auth) { $this->_auth = $auth; + if ((null === $this->getAcl()) && method_exists($auth, 'getAcl')) { + $this->setAcl($auth->getAcl()); + } return $this; } /** @@ -317,6 +323,7 @@ throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage(), 0, $e); } // Add the new loaded class to the server. + require_once 'Zend/Amf/Server/Exception.php'; $this->setClass($className, $source); } @@ -334,6 +341,8 @@ $params = array_merge($params, $argv); } + $params = $this->_castParameters($info, $params); + if ($info instanceof Zend_Server_Reflection_Function) { $func = $info->getName(); $this->_checkAcl(null, $func); @@ -494,66 +503,60 @@ // set response encoding $response->setObjectEncoding($objectEncoding); - $responseBody = $request->getAmfBodies(); - - $handleAuth = false; - if ($this->_auth) { - $headers = $request->getAmfHeaders(); - if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) && - isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)) { - $handleAuth = true; + // Authenticate, if we have credential headers + $error = false; + $headers = $request->getAmfHeaders(); + if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) + && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid) + && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password) + ) { + try { + if ($this->_handleAuth( + $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid, + $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password + )) { + // use RequestPersistentHeader to clear credentials + $response->addAmfHeader( + new Zend_Amf_Value_MessageHeader( + Zend_Amf_Constants::PERSISTENT_HEADER, + false, + new Zend_Amf_Value_MessageHeader( + Zend_Amf_Constants::CREDENTIALS_HEADER, + false, null + ) + ) + ); + } + } catch (Exception $e) { + // Error during authentication; report it + $error = $this->_errorMessage( + $objectEncoding, + '', + $e->getMessage(), + $e->getTraceAsString(), + $e->getCode(), + $e->getLine() + ); + $responseType = Zend_AMF_Constants::STATUS_METHOD; } } // Iterate through each of the service calls in the AMF request - foreach($responseBody as $body) + foreach($request->getAmfBodies() as $body) { + if ($error) { + // Error during authentication; just report it and be done + $responseURI = $body->getResponseURI() . $responseType; + $newBody = new Zend_Amf_Value_MessageBody($responseURI, null, $error); + $response->addAmfBody($newBody); + continue; + } try { - if ($handleAuth) { - if ($this->_handleAuth( - $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid, - $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)) { - // use RequestPersistentHeader to clear credentials - $response->addAmfHeader( - new Zend_Amf_Value_MessageHeader( - Zend_Amf_Constants::PERSISTENT_HEADER, - false, - new Zend_Amf_Value_MessageHeader( - Zend_Amf_Constants::CREDENTIALS_HEADER, - false, null))); - $handleAuth = false; - } - } - - if ($objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) { - // AMF0 Object Encoding - $targetURI = $body->getTargetURI(); - $message = ''; - - // Split the target string into its values. - $source = substr($targetURI, 0, strrpos($targetURI, '.')); - - if ($source) { - // Break off method name from namespace into source - $method = substr(strrchr($targetURI, '.'), 1); - $return = $this->_dispatch($method, $body->getData(), $source); - } else { - // Just have a method name. - $return = $this->_dispatch($targetURI, $body->getData()); - } - } else { - // AMF3 read message type - $message = $body->getData(); - if ($message instanceof Zend_Amf_Value_Messaging_CommandMessage) { - // async call with command message - $return = $this->_loadCommandMessage($message); - } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) { - require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; - $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); - $return->body = $this->_dispatch($message->operation, $message->body, $message->source); - } else { - // Amf3 message sent with netConnection + switch ($objectEncoding) { + case Zend_Amf_Constants::AMF0_OBJECT_ENCODING: + // AMF0 Object Encoding $targetURI = $body->getTargetURI(); + $message = ''; // Split the target string into its values. $source = substr($targetURI, 0, strrpos($targetURI, '.')); @@ -566,7 +569,35 @@ // Just have a method name. $return = $this->_dispatch($targetURI, $body->getData()); } - } + break; + case Zend_Amf_Constants::AMF3_OBJECT_ENCODING: + default: + // AMF3 read message type + $message = $body->getData(); + if ($message instanceof Zend_Amf_Value_Messaging_CommandMessage) { + // async call with command message + $return = $this->_loadCommandMessage($message); + } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) { + require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; + $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); + $return->body = $this->_dispatch($message->operation, $message->body, $message->source); + } else { + // Amf3 message sent with netConnection + $targetURI = $body->getTargetURI(); + + // Split the target string into its values. + $source = substr($targetURI, 0, strrpos($targetURI, '.')); + + if ($source) { + // Break off method name from namespace into source + $method = substr(strrchr($targetURI, '.'), 1); + $return = $this->_dispatch($method, $body->getData(), $source); + } else { + // Just have a method name. + $return = $this->_dispatch($targetURI, $body->getData()); + } + } + break; } $responseType = Zend_AMF_Constants::RESULT_METHOD; } catch (Exception $e) { @@ -933,4 +964,85 @@ { return array_keys($this->_table); } + + /** + * Cast parameters + * + * Takes the provided parameters from the request, and attempts to cast them + * to objects, if the prototype defines any as explicit object types + * + * @param Reflection $reflectionMethod + * @param array $params + * @return array + */ + protected function _castParameters($reflectionMethod, array $params) + { + $prototypes = $reflectionMethod->getPrototypes(); + $nonObjectTypes = array( + 'null', + 'mixed', + 'void', + 'unknown', + 'bool', + 'boolean', + 'number', + 'int', + 'integer', + 'double', + 'float', + 'string', + 'array', + 'object', + 'stdclass', + ); + $types = array(); + foreach ($prototypes as $prototype) { + foreach ($prototype->getParameters() as $parameter) { + $type = $parameter->getType(); + if (in_array(strtolower($type), $nonObjectTypes)) { + continue; + } + $position = $parameter->getPosition(); + $types[$position] = $type; + } + } + + if (empty($types)) { + return $params; + } + + foreach ($params as $position => $value) { + if (!isset($types[$position])) { + // No specific type to cast to? done + continue; + } + + $type = $types[$position]; + + if (!class_exists($type)) { + // Not a class, apparently. done + continue; + } + + if ($value instanceof $type) { + // Already of the right type? done + continue; + } + + if (!is_array($value) && !is_object($value)) { + // Can't cast scalars to objects easily; done + continue; + } + + // Create instance, and loop through value to set + $object = new $type; + foreach ($value as $property => $defined) { + $object->{$property} = $defined; + } + + $params[$position] = $object; + } + + return $params; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Server/Exception.php --- a/web/lib/Zend/Amf/Server/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Server/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Exception */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Server_Exception extends Zend_Amf_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Util/BinaryStream.php --- a/web/lib/Zend/Amf/Util/BinaryStream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Util/BinaryStream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BinaryStream.php 22101 2010-05-04 20:07:13Z matthew $ + * @version $Id: BinaryStream.php 25241 2013-01-22 11:07:36Z frosch $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Util_BinaryStream @@ -51,6 +51,11 @@ protected $_needle; /** + * @var bool str* functions overloaded using mbstring.func_overload? + */ + protected $_mbStringFunctionsOverloaded; + + /** * Constructor * * Create a reference to a byte stream that is going to be parsed or created @@ -69,7 +74,8 @@ $this->_stream = $stream; $this->_needle = 0; - $this->_streamLength = strlen($stream); + $this->_mbStringFunctionsOverloaded = function_exists('mb_strlen') && (ini_get('mbstring.func_overload') !== '') && ((int)ini_get('mbstring.func_overload') & 2); + $this->_streamLength = $this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream); $this->_bigEndian = (pack('l', 1) === "\x00\x00\x00\x01"); } @@ -97,7 +103,7 @@ require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); } - $bytes = substr($this->_stream, $this->_needle, $length); + $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, $length, '8bit') : substr($this->_stream, $this->_needle, $length); $this->_needle+= $length; return $bytes; } @@ -120,12 +126,18 @@ * Reads a signed byte * * @return int Value is in the range of -128 to 127. + * @throws Zend_Amf_Exception */ public function readByte() { if (($this->_needle + 1) > $this->_streamLength) { require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); + throw new Zend_Amf_Exception( + 'Buffer underrun at needle position: ' + . $this->_needle + . ' while requesting length: ' + . $this->_streamLength + ); } return ord($this->_stream{$this->_needle++}); @@ -184,7 +196,7 @@ */ public function writeUtf($stream) { - $this->writeInt(strlen($stream)); + $this->writeInt($this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream)); $this->_stream.= $stream; return $this; } @@ -209,7 +221,7 @@ */ public function writeLongUtf($stream) { - $this->writeLong(strlen($stream)); + $this->writeLong($this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream)); $this->_stream.= $stream; } @@ -255,7 +267,7 @@ */ public function readDouble() { - $bytes = substr($this->_stream, $this->_needle, 8); + $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, 8, '8bit') : substr($this->_stream, $this->_needle, 8); $this->_needle+= 8; if (!$this->_bigEndian) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/ByteArray.php --- a/web/lib/Zend/Amf/Value/ByteArray.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/ByteArray.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ByteArray.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ByteArray.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_ByteArray diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/MessageBody.php --- a/web/lib/Zend/Amf/Value/MessageBody.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/MessageBody.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MessageBody.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MessageBody.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_MessageBody diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/MessageHeader.php --- a/web/lib/Zend/Amf/Value/MessageHeader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/MessageHeader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MessageHeader.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MessageHeader.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_MessageHeader diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/Messaging/AbstractMessage.php --- a/web/lib/Zend/Amf/Value/Messaging/AbstractMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/Messaging/AbstractMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AbstractMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AbstractMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AbstractMessage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/Messaging/AcknowledgeMessage.php --- a/web/lib/Zend/Amf/Value/Messaging/AcknowledgeMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/Messaging/AcknowledgeMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AcknowledgeMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AcknowledgeMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Value_Messaging_AsyncMessage */ @@ -32,7 +32,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/Messaging/ArrayCollection.php --- a/web/lib/Zend/Amf/Value/Messaging/ArrayCollection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/Messaging/ArrayCollection.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayCollection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ArrayCollection.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,9 +27,9 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Amf_Value_Messaging_ArrayCollection +class Zend_Amf_Value_Messaging_ArrayCollection extends ArrayObject { } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/Messaging/AsyncMessage.php --- a/web/lib/Zend/Amf/Value/Messaging/AsyncMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/Messaging/AsyncMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AsyncMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AsyncMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/Messaging/CommandMessage.php --- a/web/lib/Zend/Amf/Value/Messaging/CommandMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/Messaging/CommandMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommandMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommandMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/Messaging/ErrorMessage.php --- a/web/lib/Zend/Amf/Value/Messaging/ErrorMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/Messaging/ErrorMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ErrorMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ErrorMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */ @@ -30,7 +30,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/Messaging/RemotingMessage.php --- a/web/lib/Zend/Amf/Value/Messaging/RemotingMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/Messaging/RemotingMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemotingMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RemotingMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Amf_Value_Messaging_AbstractMessage */ @@ -31,7 +31,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Amf/Value/TraitsInfo.php --- a/web/lib/Zend/Amf/Value/TraitsInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Amf/Value/TraitsInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TraitsInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TraitsInfo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_TraitsInfo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application.php --- a/web/lib/Zend/Application.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Application.php 23163 2010-10-19 16:30:26Z matthew $ + * @version $Id: Application.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application @@ -376,9 +376,12 @@ protected function _loadConfig($file) { $environment = $this->getEnvironment(); - $suffix = strtolower(pathinfo($file, PATHINFO_EXTENSION)); + $suffix = pathinfo($file, PATHINFO_EXTENSION); + $suffix = ($suffix === 'dist') + ? pathinfo(basename($file, ".$suffix"), PATHINFO_EXTENSION) + : $suffix; - switch ($suffix) { + switch (strtolower($suffix)) { case 'ini': $config = new Zend_Config_Ini($file, $environment); break; @@ -392,6 +395,7 @@ break; case 'yaml': + case 'yml': $config = new Zend_Config_Yaml($file, $environment); break; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Bootstrap/Bootstrap.php --- a/web/lib/Zend/Application/Bootstrap/Bootstrap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Bootstrap/Bootstrap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bootstrap.php 20885 2010-02-03 19:33:59Z matthew $ + * @version $Id: Bootstrap.php 25073 2012-11-06 19:31:53Z rob $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Bootstrap_Bootstrap @@ -120,7 +120,7 @@ public function getResourceLoader() { if ((null === $this->_resourceLoader) - && (false !== ($namespace = $this->getAppNamespace())) + && (false != ($namespace = $this->getAppNamespace())) ) { $r = new ReflectionClass($this); $path = $r->getFileName(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Bootstrap/BootstrapAbstract.php --- a/web/lib/Zend/Application/Bootstrap/BootstrapAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Bootstrap/BootstrapAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BootstrapAbstract.php 23278 2010-10-30 12:50:21Z ramon $ + * @version $Id: BootstrapAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Bootstrap_BootstrapAbstract @@ -352,7 +352,9 @@ continue; } - if (class_exists($plugin)) { //@SEE ZF-7550 + if (class_exists($plugin) + && is_subclass_of($plugin, 'Zend_Application_Resource_Resource') + ) { //@SEE ZF-7550 $spec = (array) $spec; $spec['bootstrap'] = $this; $instance = new $plugin($spec); @@ -414,7 +416,8 @@ { if ($this->_pluginLoader === null) { $options = array( - 'Zend_Application_Resource' => 'Zend/Application/Resource' + 'Zend_Application_Resource' => 'Zend/Application/Resource', + 'ZendX_Application_Resource' => 'ZendX/Application/Resource' ); $this->_pluginLoader = new Zend_Loader_PluginLoader($options); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Bootstrap/Bootstrapper.php --- a/web/lib/Zend/Application/Bootstrap/Bootstrapper.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Bootstrap/Bootstrapper.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bootstrapper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Bootstrapper.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Application_Bootstrap_Bootstrapper diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Bootstrap/Exception.php --- a/web/lib/Zend/Application/Bootstrap/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Bootstrap/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Application * @uses Zend_Application_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Bootstrap_Exception extends Zend_Application_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Bootstrap/ResourceBootstrapper.php --- a/web/lib/Zend/Application/Bootstrap/ResourceBootstrapper.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Bootstrap/ResourceBootstrapper.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResourceBootstrapper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResourceBootstrapper.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Application_Bootstrap_ResourceBootstrapper diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Exception.php --- a/web/lib/Zend/Application/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -30,7 +30,7 @@ * @uses Zend_Exception * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Module/Autoloader.php --- a/web/lib/Zend/Application/Module/Autoloader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Module/Autoloader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Autoloader.php 20250 2010-01-12 22:15:20Z dasprid $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Autoloader.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Module/Bootstrap.php --- a/web/lib/Zend/Application/Module/Bootstrap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Module/Bootstrap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Bootstrap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Bootstrap.php 25024 2012-07-30 15:08:15Z rob $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Module_Bootstrap @@ -97,9 +97,9 @@ /** * Get default application namespace * - * Proxies to {@link getModuleName()}, and returns the current module + * Proxies to {@link getModuleName()}, and returns the current module * name - * + * * @return string */ public function getAppNamespace() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Cachemanager.php --- a/web/lib/Zend/Application/Resource/Cachemanager.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Cachemanager.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cachemanager.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Cachemanager.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Application/Resource/ResourceAbstract.php'; @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Cachemanager extends Zend_Application_Resource_ResourceAbstract @@ -57,7 +57,7 @@ { if (null === $this->_manager) { $this->_manager = new Zend_Cache_Manager; - + $options = $this->getOptions(); foreach ($options as $key => $value) { if ($this->_manager->hasCacheTemplate($key)) { @@ -67,7 +67,7 @@ } } } - + return $this->_manager; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Db.php --- a/web/lib/Zend/Application/Resource/Db.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Db.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 22544 2010-07-10 15:01:37Z freak $ + * @version $Id: Db.php 25123 2012-11-14 18:27:44Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbstract @@ -45,7 +45,7 @@ protected $_adapter = null; /** - * @var Zend_Db_Adapter_Interface + * @var Zend_Db_Adapter_Abstract */ protected $_db; @@ -66,7 +66,7 @@ /** * Set the adapter * - * @param $adapter string + * @param string $adapter * @return Zend_Application_Resource_Db */ public function setAdapter($adapter) @@ -88,7 +88,7 @@ /** * Set the adapter params * - * @param $adapter string + * @param string $adapter * @return Zend_Application_Resource_Db */ public function setParams(array $params) @@ -132,7 +132,7 @@ /** * Retrieve initialized DB connection * - * @return null|Zend_Db_Adapter_Interface + * @return null|Zend_Db_Adapter_Abstract */ public function getDbAdapter() { @@ -140,6 +140,12 @@ && (null !== ($adapter = $this->getAdapter())) ) { $this->_db = Zend_Db::factory($adapter, $this->getParams()); + + if ($this->_db instanceof Zend_Db_Adapter_Abstract + && $this->isDefaultTableAdapter() + ) { + Zend_Db_Table::setDefaultAdapter($this->_db); + } } return $this->_db; } @@ -152,16 +158,13 @@ public function init() { if (null !== ($db = $this->getDbAdapter())) { - if ($this->isDefaultTableAdapter()) { - Zend_Db_Table::setDefaultAdapter($db); - } return $db; } } /** * Set the default metadata cache - * + * * @param string|Zend_Cache_Core $cache * @return Zend_Application_Resource_Db */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Dojo.php --- a/web/lib/Zend/Application/Resource/Dojo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Dojo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dojo.php 21318 2010-03-04 13:20:01Z freak $ + * @version $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Dojo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Exception.php --- a/web/lib/Zend/Application/Resource/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 22609 2010-07-17 08:47:59Z torio $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Exception extends Zend_Application_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Frontcontroller.php --- a/web/lib/Zend/Application/Resource/Frontcontroller.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Frontcontroller.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Frontcontroller.php 23378 2010-11-18 21:48:27Z bittarman $ + * @version $Id: Frontcontroller.php 24798 2012-05-12 19:17:41Z adamlundrigan $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resource_ResourceAbstract @@ -101,9 +101,9 @@ case 'plugins': foreach ((array) $value as $pluginClass) { - $stackIndex = null; - if(is_array($pluginClass)) { - $pluginClass = array_change_key_case($pluginClass, CASE_LOWER); + $stackIndex = null; + if(is_array($pluginClass)) { + $pluginClass = array_change_key_case($pluginClass, CASE_LOWER); if(isset($pluginClass['class'])) { if(isset($pluginClass['stackindex'])) { @@ -135,6 +135,22 @@ } break; + case 'dispatcher': + if(!isset($value['class'])) { + require_once 'Zend/Application/Exception.php'; + throw new Zend_Application_Exception('You must specify both '); + } + if (!isset($value['params'])) { + $value['params'] = array(); + } + + $dispatchClass = $value['class']; + if(!class_exists($dispatchClass)) { + require_once 'Zend/Application/Exception.php'; + throw new Zend_Application_Exception('Dispatcher class not found!'); + } + $front->setDispatcher(new $dispatchClass((array)$value['params'])); + break; default: $front->setParam($key, $value); break; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Layout.php --- a/web/lib/Zend/Application/Resource/Layout.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Layout.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 20814 2010-02-01 20:13:08Z freak $ + * @version $Id: Layout.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Layout diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Locale.php --- a/web/lib/Zend/Application/Resource/Locale.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Locale.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Locale.php 20814 2010-02-01 20:13:08Z freak $ + * @version $Id: Locale.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Locale @@ -56,7 +56,6 @@ return $this->getLocale(); } - /** * Retrieve locale object * @@ -66,7 +65,8 @@ { if (null === $this->_locale) { $options = $this->getOptions(); - if(!isset($options['default'])) { + + if (!isset($options['default'])) { $this->_locale = new Zend_Locale(); } elseif(!isset($options['force']) || (bool) $options['force'] == false) @@ -86,4 +86,32 @@ return $this->_locale; } + + /** + * Set the cache + * + * @param string|Zend_Cache_Core $cache + * @return Zend_Application_Resource_Locale + */ + public function setCache($cache) + { + if (is_string($cache)) { + $bootstrap = $this->getBootstrap(); + if ($bootstrap instanceof Zend_Application_Bootstrap_ResourceBootstrapper + && $bootstrap->hasPluginResource('CacheManager') + ) { + $cacheManager = $bootstrap->bootstrap('CacheManager') + ->getResource('CacheManager'); + if (null !== $cacheManager && $cacheManager->hasCache($cache)) { + $cache = $cacheManager->getCache($cache); + } + } + } + + if ($cache instanceof Zend_Cache_Core) { + Zend_Locale::setCache($cache); + } + + return $this; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Log.php --- a/web/lib/Zend/Application/Resource/Log.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Log.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Log.php 20814 2010-02-01 20:13:08Z freak $ + * @version $Id: Log.php 24607 2012-01-16 16:45:49Z xerkus $ */ /** @@ -27,13 +27,13 @@ /** - * Resource for initializing the locale + * Resource for initializing logger * * @uses Zend_Application_Resource_ResourceAbstract * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Log @@ -56,8 +56,8 @@ /** * Attach logger - * - * @param Zend_Log $log + * + * @param Zend_Log $log * @return Zend_Application_Resource_Log */ public function setLog(Zend_Log $log) @@ -66,6 +66,11 @@ return $this; } + /** + * Retrieve logger object + * + * @return Zend_Log + */ public function getLog() { if (null === $this->_log) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Mail.php --- a/web/lib/Zend/Application/Resource/Mail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Mail.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 21015 2010-02-11 01:56:02Z freak $ + * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceAbstract @@ -46,7 +46,7 @@ public function init() { return $this->getMail(); } - + /** * * @return Zend_Mail_Transport_Abstract|null @@ -56,7 +56,7 @@ if (null === $this->_transport) { $options = $this->getOptions(); foreach($options as $key => $option) { - $options[strtolower($key)] = $option; + $options[strtolower($key)] = $option; } $this->setOptions($options); @@ -73,14 +73,14 @@ Zend_Mail::setDefaultTransport($this->_transport); } } - + $this->_setDefaults('from'); $this->_setDefaults('replyTo'); } return $this->_transport; } - + protected function _setDefaults($type) { $key = strtolower('default' . $type); $options = $this->getOptions(); @@ -99,13 +99,13 @@ } } } - + protected function _setupTransport($options) { - if(!isset($options['type'])) { - $options['type'] = 'sendmail'; - } - + if(!isset($options['type'])) { + $options['type'] = 'sendmail'; + } + $transportName = $options['type']; if(!Zend_Loader_Autoloader::autoload($transportName)) { @@ -122,9 +122,10 @@ } } } - + unset($options['type']); - + unset($options['register']); //@see ZF-11022 + switch($transportName) { case 'Zend_Mail_Transport_Smtp': if(!isset($options['host'])) { @@ -132,7 +133,7 @@ 'A host is necessary for smtp transport,' .' but none was given'); } - + $transport = new $transportName($options['host'], $options); break; case 'Zend_Mail_Transport_Sendmail': diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Modules.php --- a/web/lib/Zend/Application/Resource/Modules.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Modules.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Modules.php 20814 2010-02-01 20:13:08Z freak $ + * @version $Id: Modules.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Modules extends Zend_Application_Resource_ResourceAbstract @@ -62,6 +62,7 @@ */ public function init() { + $bootstraps = array(); $bootstrap = $this->getBootstrap(); $bootstrap->bootstrap('FrontController'); $front = $bootstrap->getResource('FrontController'); @@ -103,12 +104,28 @@ continue; } + $bootstraps[$module] = $bootstrapClass; + } + + return $this->_bootstraps = $this->bootstrapBootstraps($bootstraps); + } + + /* + * Bootstraps the bootstraps found. Allows for easy extension. + * @param array $bootstraps Array containing the bootstraps to instantiate + */ + protected function bootstrapBootstraps($bootstraps) + { + $bootstrap = $this->getBootstrap(); + $out = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS); + + foreach($bootstraps as $module => $bootstrapClass) { $moduleBootstrap = new $bootstrapClass($bootstrap); $moduleBootstrap->bootstrap(); - $this->_bootstraps[$module] = $moduleBootstrap; + $out[$module] = $moduleBootstrap; } - return $this->_bootstraps; + return $out; } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Multidb.php --- a/web/lib/Zend/Application/Resource/Multidb.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Multidb.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Multidb.php 22546 2010-07-10 15:18:12Z freak $ + * @version $Id: Multidb.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Application/Resource/ResourceAbstract.php'; @@ -51,7 +51,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Multidb extends Zend_Application_Resource_ResourceAbstract @@ -85,7 +85,7 @@ } foreach ($options as $id => $params) { - $adapter = $params['adapter']; + $adapter = $params['adapter']; $default = (int) ( isset($params['isDefaultTableAdapter']) && $params['isDefaultTableAdapter'] || isset($params['default']) && $params['default'] @@ -178,7 +178,7 @@ /** * Set the default metadata cache - * + * * @param string|Zend_Cache_Core $cache * @return Zend_Application_Resource_Multidb */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Navigation.php --- a/web/lib/Zend/Application/Resource/Navigation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Navigation.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Navigation.php 22882 2010-08-22 14:00:16Z freak $ + * @version $Id: Navigation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Dolf Schimmel * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -56,12 +56,13 @@ { if (!$this->_container) { $options = $this->getOptions(); - $pages = isset($options['pages']) ? $options['pages'] : array(); - $this->_container = new Zend_Navigation($pages); - + if(isset($options['defaultPageType'])) { Zend_Navigation_Page::setDefaultPageType($options['defaultPageType']); } + + $pages = isset($options['pages']) ? $options['pages'] : array(); + $this->_container = new Zend_Navigation($pages); } $this->store(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Resource.php --- a/web/lib/Zend/Application/Resource/Resource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Resource.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Application_Resource_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/ResourceAbstract.php --- a/web/lib/Zend/Application/Resource/ResourceAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/ResourceAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResourceAbstract.php 23384 2010-11-19 00:00:29Z ramon $ + * @version $Id: ResourceAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Application_Resource_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Router.php --- a/web/lib/Zend/Application/Resource/Router.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Router.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Router.php 20814 2010-02-01 20:13:08Z freak $ + * @version $Id: Router.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Router diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Session.php --- a/web/lib/Zend/Application/Resource/Session.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Session.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 20814 2010-02-01 20:13:08Z freak $ + * @version $Id: Session.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Session extends Zend_Application_Resource_ResourceAbstract @@ -50,7 +50,7 @@ * * @param array|string|Zend_Session_SaveHandler_Interface $saveHandler * @return Zend_Application_Resource_Session - * @throws Zend_Application_Resource_Exception When $saveHandler is no valid save handler + * @throws Zend_Application_Resource_Exception When $saveHandler is not a valid save handler */ public function setSaveHandler($saveHandler) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Translate.php --- a/web/lib/Zend/Application/Resource/Translate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Translate.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 22968 2010-09-18 19:50:02Z intiilapa $ + * @version $Id: Translate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Translate extends Zend_Application_Resource_ResourceAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/Useragent.php --- a/web/lib/Zend/Application/Resource/Useragent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/Useragent.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,72 +1,72 @@ -getUserAgent(); - - // Optionally seed the UserAgent view helper - $bootstrap = $this->getBootstrap(); - if ($bootstrap->hasResource('view') || $bootstrap->hasPluginResource('view')) { - $bootstrap->bootstrap('view'); - $view = $bootstrap->getResource('view'); - if (null !== $view) { - $view->userAgent($userAgent); - } - } - - return $userAgent; - } - - /** - * Get UserAgent instance - * - * @return Zend_Http_UserAgent - */ - public function getUserAgent() - { - if (null === $this->_userAgent) { - $options = $this->getOptions(); - $this->_userAgent = new Zend_Http_UserAgent($options); - } - - return $this->_userAgent; - } -} +getUserAgent(); + + // Optionally seed the UserAgent view helper + $bootstrap = $this->getBootstrap(); + if ($bootstrap->hasResource('view') || $bootstrap->hasPluginResource('view')) { + $bootstrap->bootstrap('view'); + $view = $bootstrap->getResource('view'); + if (null !== $view) { + $view->userAgent($userAgent); + } + } + + return $userAgent; + } + + /** + * Get UserAgent instance + * + * @return Zend_Http_UserAgent + */ + public function getUserAgent() + { + if (null === $this->_userAgent) { + $options = $this->getOptions(); + $this->_userAgent = new Zend_Http_UserAgent($options); + } + + return $this->_userAgent; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Application/Resource/View.php --- a/web/lib/Zend/Application/Resource/View.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Application/Resource/View.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 22965 2010-09-18 17:45:51Z intiilapa $ + * @version $Id: View.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_View extends Zend_Application_Resource_ResourceAbstract @@ -52,9 +52,8 @@ { $view = $this->getView(); - $viewRenderer = new Zend_Controller_Action_Helper_ViewRenderer(); + $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $viewRenderer->setView($view); - Zend_Controller_Action_HelperBroker::addHelper($viewRenderer); return $view; } @@ -78,6 +77,9 @@ if (isset($options['contentType'])) { $this->_view->headMeta()->appendHttpEquiv('Content-Type', $options['contentType']); } + if (isset($options['assign']) && is_array($options['assign'])) { + $this->_view->assign($options['assign']); + } } return $this->_view; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth.php --- a/web/lib/Zend/Auth.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Auth.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Auth.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/DbTable.php --- a/web/lib/Zend/Auth/Adapter/DbTable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/DbTable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 22613 2010-07-17 13:43:22Z dragonbe $ + * @version $Id: DbTable.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface @@ -114,12 +114,12 @@ * @var array */ protected $_resultRow = null; - + /** - * $_ambiguityIdentity - Flag to indicate same Identity can be used with + * $_ambiguityIdentity - Flag to indicate same Identity can be used with * different credentials. Default is FALSE and need to be set to true to * allow ambiguity usage. - * + * * @var boolean */ protected $_ambiguityIdentity = false; @@ -159,7 +159,7 @@ /** * _setDbAdapter() - set the database adapter to be used for quering * - * @param Zend_Db_Adapter_Abstract + * @param Zend_Db_Adapter_Abstract * @throws Zend_Auth_Adapter_Exception * @return Zend_Auth_Adapter_DbTable */ @@ -178,7 +178,7 @@ throw new Zend_Auth_Adapter_Exception('No database adapter present'); } } - + return $this; } @@ -265,12 +265,12 @@ $this->_credential = $credential; return $this; } - + /** * setAmbiguityIdentity() - sets a flag for usage of identical identities * with unique credentials. It accepts integers (0, 1) or boolean (true, * false) parameters. Default is false. - * + * * @param int|bool $flag * @return Zend_Auth_Adapter_DbTable */ @@ -284,9 +284,9 @@ return $this; } /** - * getAmbiguityIdentity() - returns TRUE for usage of multiple identical + * getAmbiguityIdentity() - returns TRUE for usage of multiple identical * identies with different credentials, FALSE if not used. - * + * * @return bool */ public function getAmbiguityIdentity() @@ -367,7 +367,7 @@ $this->_authenticateSetup(); $dbSelect = $this->_authenticateCreateSelect(); $resultIdentities = $this->_authenticateQuerySelect($dbSelect); - + if ( ($authResult = $this->_authenticateValidateResultSet($resultIdentities)) instanceof Zend_Auth_Result) { return $authResult; } @@ -382,7 +382,7 @@ } $resultIdentities = $validIdentities; } - + $authResult = $this->_authenticateValidateResult(array_shift($resultIdentities)); return $authResult; } @@ -477,7 +477,7 @@ $origDbFetchMode = $this->_zendDb->getFetchMode(); $this->_zendDb->setFetchMode(Zend_DB::FETCH_ASSOC); } - $resultIdentities = $this->_zendDb->fetchAll($dbSelect->__toString()); + $resultIdentities = $this->_zendDb->fetchAll($dbSelect); if (isset($origDbFetchMode)) { $this->_zendDb->setFetchMode($origDbFetchMode); unset($origDbFetchMode); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Digest.php --- a/web/lib/Zend/Auth/Adapter/Digest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Digest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Digest.php 23088 2010-10-11 19:53:24Z padraic $ + * @version $Id: Digest.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface @@ -227,7 +227,7 @@ $result['messages'][] = "Username '$this->_username' and realm '$this->_realm' combination not found"; return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']); } - + /** * Securely compare two strings for equality while avoided C level memcmp() * optimisations capable of leaking timing information useful to an attacker diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Exception.php --- a/web/lib/Zend/Auth/Adapter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Exception extends Zend_Auth_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Http.php --- a/web/lib/Zend/Auth/Adapter/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 23088 2010-10-11 19:53:24Z padraic $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @todo Support auth-int * @todo Track nonces, nonce-count, opaque for replay protection and stale support @@ -844,7 +844,7 @@ return $data; } - + /** * Securely compare two strings for equality while avoided C level memcmp() * optimisations capable of leaking timing information useful to an attacker diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Http/Resolver/Exception.php --- a/web/lib/Zend/Auth/Adapter/Http/Resolver/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Http/Resolver/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Http_Resolver_Exception extends Zend_Auth_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Http/Resolver/File.php --- a/web/lib/Zend/Auth/Adapter/Http/Resolver/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Http/Resolver/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Resolver_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Http/Resolver/Interface.php --- a/web/lib/Zend/Auth/Adapter/Http/Resolver/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Http/Resolver/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Auth_Adapter_Http_Resolver_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/InfoCard.php --- a/web/lib/Zend/Auth/Adapter/InfoCard.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/InfoCard.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InfoCard.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InfoCard.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_InfoCard implements Zend_Auth_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Interface.php --- a/web/lib/Zend/Auth/Adapter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Auth_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/Ldap.php --- a/web/lib/Zend/Auth/Adapter/Ldap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/Ldap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ldap.php 21319 2010-03-04 16:02:16Z sgehrig $ + * @version $Id: Ldap.php 24618 2012-02-03 08:32:06Z sgehrig $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface @@ -335,8 +335,8 @@ $messages[1] = ''; $messages[] = "$canonicalName authentication successful"; if ($requireRebind === true) { - // rebinding with authenticated user - $ldap->bind($dn, $password); + // rebinding with authenticated user + $ldap->bind($dn, $password); } return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $canonicalName, $messages); } else { @@ -371,7 +371,11 @@ } else { $line = $zle->getLine(); $messages[] = $zle->getFile() . "($line): " . $zle->getMessage(); - $messages[] = str_replace($password, '*****', $zle->getTraceAsString()); + $messages[] = preg_replace( + '/\b'.preg_quote(substr($password, 0, 15), '/').'\b/', + '*****', + $zle->getTraceAsString() + ); $messages[0] = 'An unexpected failure occurred'; } $messages[1] = $zle->getMessage(); @@ -488,7 +492,9 @@ $returnObject = new stdClass(); - $omitAttribs = array_map('strtolower', $omitAttribs); + $returnAttribs = array_map('strtolower', $returnAttribs); + $omitAttribs = array_map('strtolower', $omitAttribs); + $returnAttribs = array_diff($returnAttribs, $omitAttribs); $entry = $this->getLdap()->getEntry($this->_authenticatedDn, $returnAttribs, true); foreach ($entry as $attr => $value) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Adapter/OpenId.php --- a/web/lib/Zend/Auth/Adapter/OpenId.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Adapter/OpenId.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenId.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Adapter_OpenId implements Zend_Auth_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Exception.php --- a/web/lib/Zend/Auth/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Result.php --- a/web/lib/Zend/Auth/Result.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Result.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Storage/Exception.php --- a/web/lib/Zend/Auth/Storage/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Storage/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Storage_Exception extends Zend_Auth_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Storage/Interface.php --- a/web/lib/Zend/Auth/Storage/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Storage/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Auth_Storage_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Storage/NonPersistent.php --- a/web/lib/Zend/Auth/Storage/NonPersistent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Storage/NonPersistent.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NonPersistent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NonPersistent.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Storage_NonPersistent implements Zend_Auth_Storage_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Auth/Storage/Session.php --- a/web/lib/Zend/Auth/Storage/Session.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Auth/Storage/Session.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Session.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth_Storage_Session implements Zend_Auth_Storage_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode.php --- a/web/lib/Zend/Barcode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Barcode.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Barcode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode @@ -55,10 +55,10 @@ * @throws Zend_Barcode_Exception */ public static function factory( - $barcode, - $renderer = 'image', - $barcodeConfig = array(), - $rendererConfig = array(), + $barcode, + $renderer = 'image', + $barcodeConfig = array(), + $rendererConfig = array(), $automaticRenderError = true ) { /* @@ -313,9 +313,9 @@ * @param array | Zend_Config $rendererConfig */ public static function render( - $barcode, - $renderer, - $barcodeConfig = array(), + $barcode, + $renderer, + $barcodeConfig = array(), $rendererConfig = array() ) { self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->render(); @@ -331,9 +331,9 @@ * @return mixed */ public static function draw( - $barcode, - $renderer, - $barcodeConfig = array(), + $barcode, + $renderer, + $barcodeConfig = array(), $rendererConfig = array() ) { return self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->draw(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Exception.php --- a/web/lib/Zend/Barcode/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 22999 2010-09-23 19:43:14Z mikaelkael $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * Zend_Exception @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Code128.php --- a/web/lib/Zend/Barcode/Object/Code128.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Code128.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code128 extends Zend_Barcode_Object_ObjectAbstract @@ -48,9 +48,9 @@ protected $_withChecksum = true; /** - * @var array - */ - protected $_convertedText = array(); + * @var array + */ + protected $_convertedText = array(); protected $_codingMap = array( 0 => "11011001100", 1 => "11001101100", 2 => "11001100110", @@ -192,7 +192,7 @@ $characterLength = 11 * $this->_barThinWidth * $this->_factor; $convertedChars = count($this->_convertToBarcodeChars($this->getText())); if ($this->_withChecksum) { - $convertedChars++; + $convertedChars++; } $encodedData = $convertedChars * $characterLength; // ...except the STOP character (13) @@ -220,7 +220,7 @@ $convertedChars = $this->_convertToBarcodeChars($this->getText()); if ($this->_withChecksum) { - $convertedChars[] = $this->getChecksum($this->getText()); + $convertedChars[] = $this->getChecksum($this->getText()); } // STOP CHARACTER @@ -229,7 +229,7 @@ foreach ($convertedChars as $barcodeChar) { $barcodePattern = $this->_codingMap[$barcodeChar]; foreach (str_split($barcodePattern) as $c) { - $barcodeTable[] = array($c, 1, 0, 1); + $barcodeTable[] = array($c, $this->_barThinWidth, 0, 1); } } return $barcodeTable; @@ -238,24 +238,24 @@ /** * Checks if the next $length chars of $string starting at $pos are numeric. * Returns false if the end of the string is reached. - * @param $string String to search - * @param $pos Starting position - * @param $length Length to search + * @param string $string String to search + * @param int $pos Starting position + * @param int $length Length to search * @return bool */ protected static function _isDigit($string, $pos, $length = 2) { - if ($pos + $length > strlen($string)) { - return false; - } + if ($pos + $length > strlen($string)) { + return false; + } - for ($i = $pos; $i < $pos + $length; $i++) { - if (!is_numeric($string[$i])) { - return false; - } - } - return true; - } + for ($i = $pos; $i < $pos + $length; $i++) { + if (!is_numeric($string[$i])) { + return false; + } + } + return true; + } /** * Convert string to barcode string @@ -263,14 +263,14 @@ */ protected function _convertToBarcodeChars($string) { - $string = (string) $string; - if (!strlen($string)) { - return array(); - } + $string = (string) $string; + if (!strlen($string)) { + return array(); + } - if (isset($this->_convertedText[md5($string)])) { - return $this->_convertedText[md5($string)]; - } + if (isset($this->_convertedText[md5($string)])) { + return $this->_convertedText[md5($string)]; + } $currentCharset = null; $sum = 0; @@ -363,17 +363,17 @@ */ public function getChecksum($text) { - $tableOfChars = $this->_convertToBarcodeChars($text); + $tableOfChars = $this->_convertToBarcodeChars($text); - $sum = $tableOfChars[0]; - unset($tableOfChars[0]); + $sum = $tableOfChars[0]; + unset($tableOfChars[0]); - $k = 1; - foreach ($tableOfChars as $char) { - $sum += ($k++) * $char; - } + $k = 1; + foreach ($tableOfChars as $char) { + $sum += ($k++) * $char; + } - $checksum = $sum % 103; + $checksum = $sum % 103; return $checksum; } @@ -385,7 +385,7 @@ */ protected function _validateText($value, $options = array()) { - // @TODO: add code128 validator - return true; + // @TODO: add code128 validator + return true; } -} \ No newline at end of file +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Code25.php --- a/web/lib/Zend/Barcode/Object/Code25.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Code25.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Code25.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code25 extends Zend_Barcode_Object_ObjectAbstract @@ -97,7 +97,7 @@ $barcodeTable[] = array(1 , $this->_barThickWidth , 0 , 1); $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1); $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1); - $barcodeTable[] = array(0 , 1); + $barcodeTable[] = array(0 , $this->_barThinWidth); $text = str_split($this->getText()); foreach ($text as $char) { @@ -106,7 +106,7 @@ /* visible, width, top, length */ $width = $c ? $this->_barThickWidth : $this->_barThinWidth; $barcodeTable[] = array(1 , $width , 0 , 1); - $barcodeTable[] = array(0 , 1); + $barcodeTable[] = array(0 , $this->_barThinWidth); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Code25interleaved.php --- a/web/lib/Zend/Barcode/Object/Code25interleaved.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Code25interleaved.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25interleaved.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Code25interleaved.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Barcode_Object_Code25 */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code25interleaved extends Zend_Barcode_Object_Code25 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Code39.php --- a/web/lib/Zend/Barcode/Object/Code39.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Code39.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39.php 23398 2010-11-19 17:17:05Z mikaelkael $ + * @version $Id: Code39.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Code39 extends Zend_Barcode_Object_ObjectAbstract @@ -163,7 +163,7 @@ $barcodeTable[] = array((int) $visible, $width, 0, 1); $visible = ! $visible; } - $barcodeTable[] = array(0 , 1); + $barcodeTable[] = array(0 , $this->_barThinWidth); } return $barcodeTable; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Ean13.php --- a/web/lib/Zend/Barcode/Object/Ean13.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Ean13.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean13.php 22999 2010-09-23 19:43:14Z mikaelkael $ + * @version $Id: Ean13.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean13 extends Zend_Barcode_Object_ObjectAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Ean2.php --- a/web/lib/Zend/Barcode/Object/Ean2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Ean2.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean2.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ean2.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean2 extends Zend_Barcode_Object_Ean5 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Ean5.php --- a/web/lib/Zend/Barcode/Object/Ean5.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Ean5.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean5.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ean5.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean5 extends Zend_Barcode_Object_Ean13 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Ean8.php --- a/web/lib/Zend/Barcode/Object/Ean8.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Ean8.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean8.php 21667 2010-03-28 17:45:14Z mikaelkael $ + * @version $Id: Ean8.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Ean8 extends Zend_Barcode_Object_Ean13 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Error.php --- a/web/lib/Zend/Barcode/Object/Error.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Error.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Error.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Barcode_Object_ObjectAbstract */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Error extends Zend_Barcode_Object_ObjectAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Exception.php --- a/web/lib/Zend/Barcode/Object/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Barcode_Exception */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Exception extends Zend_Barcode_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Identcode.php --- a/web/lib/Zend/Barcode/Object/Identcode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Identcode.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identcode.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Identcode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Identcode extends Zend_Barcode_Object_Code25interleaved diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Itf14.php --- a/web/lib/Zend/Barcode/Object/Itf14.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Itf14.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Itf14.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Itf14.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Barcode_Object_Code25interleaved */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Itf14 extends Zend_Barcode_Object_Code25interleaved diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Leitcode.php --- a/web/lib/Zend/Barcode/Object/Leitcode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Leitcode.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Leitcode.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Leitcode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Leitcode extends Zend_Barcode_Object_Identcode diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/ObjectAbstract.php --- a/web/lib/Zend/Barcode/Object/ObjectAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/ObjectAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ObjectAbstract.php 23400 2010-11-19 17:18:31Z mikaelkael $ + * @version $Id: ObjectAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Barcode_Object_ObjectAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Planet.php --- a/web/lib/Zend/Barcode/Object/Planet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Planet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Planet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Planet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Planet extends Zend_Barcode_Object_Postnet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Postnet.php --- a/web/lib/Zend/Barcode/Object/Postnet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Postnet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Postnet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Postnet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Postnet extends Zend_Barcode_Object_ObjectAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Royalmail.php --- a/web/lib/Zend/Barcode/Object/Royalmail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Royalmail.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Royalmail.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Royalmail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Royalmail extends Zend_Barcode_Object_ObjectAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Upca.php --- a/web/lib/Zend/Barcode/Object/Upca.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Upca.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upca.php 21667 2010-03-28 17:45:14Z mikaelkael $ + * @version $Id: Upca.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Upca extends Zend_Barcode_Object_Ean13 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Object/Upce.php --- a/web/lib/Zend/Barcode/Object/Upce.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Object/Upce.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upce.php 21667 2010-03-28 17:45:14Z mikaelkael $ + * @version $Id: Upce.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Object_Upce extends Zend_Barcode_Object_Ean13 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Renderer/Exception.php --- a/web/lib/Zend/Barcode/Renderer/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Renderer/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Barcode_Exception */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Exception extends Zend_Barcode_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Renderer/Image.php --- a/web/lib/Zend/Barcode/Renderer/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Renderer/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 22999 2010-09-23 19:43:14Z mikaelkael $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Barcode_Renderer_RendererAbstract*/ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Renderer/Pdf.php --- a/web/lib/Zend/Barcode/Renderer/Pdf.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Renderer/Pdf.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdf.php 22418 2010-06-11 16:27:22Z mikaelkael $ + * @version $Id: Pdf.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Barcode_Renderer_RendererAbstract */ @@ -37,7 +37,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Pdf extends Zend_Barcode_Renderer_RendererAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Renderer/RendererAbstract.php --- a/web/lib/Zend/Barcode/Renderer/RendererAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Renderer/RendererAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererAbstract.php 22999 2010-09-23 19:43:14Z mikaelkael $ + * @version $Id: RendererAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Barcode_Renderer_RendererAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Barcode/Renderer/Svg.php --- a/web/lib/Zend/Barcode/Renderer/Svg.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Barcode/Renderer/Svg.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20366 2010-01-18 03:56:52Z ralph $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache.php --- a/web/lib/Zend/Cache.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 23154 2010-10-18 17:41:06Z mabe $ + * @version $Id: Cache.php 24656 2012-02-26 06:02:53Z adamlundrigan $ */ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cache @@ -41,14 +41,14 @@ * @var array */ public static $standardBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', - 'Xcache', 'TwoLevels', 'ZendServer_Disk', 'ZendServer_ShMem'); + 'Xcache', 'TwoLevels', 'WinCache', 'ZendServer_Disk', 'ZendServer_ShMem'); /** * Standard backends which implement the ExtendedInterface * * @var array */ - public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Libmemcached', 'Sqlite'); + public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Libmemcached', 'Sqlite', 'WinCache'); /** * Only for backward compatibility (may be removed in next major release) @@ -64,7 +64,7 @@ * @var array * @deprecated */ - public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', 'Xcache', 'TwoLevels'); + public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', 'Xcache', 'WinCache', 'TwoLevels'); /** * Consts for clean() method @@ -133,7 +133,7 @@ require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; } else { // we use a custom backend - if (!preg_match('~^[\w]+$~D', $backend)) { + if (!preg_match('~^[\w\\\\]+$~D', $backend)) { Zend_Cache::throwException("Invalid backend name [$backend]"); } if (!$customBackendNaming) { @@ -175,7 +175,7 @@ require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php'; } else { // we use a custom frontend - if (!preg_match('~^[\w]+$~D', $frontend)) { + if (!preg_match('~^[\w\\\\]+$~D', $frontend)) { Zend_Cache::throwException("Invalid frontend name [$frontend]"); } if (!$customFrontendNaming) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend.php --- a/web/lib/Zend/Cache/Backend.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Backend.php 20880 2010-02-03 18:18:32Z matthew $ + * @version $Id: Backend.php 24989 2012-06-21 07:24:13Z mabe $ */ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend @@ -112,6 +112,28 @@ } /** + * Returns an option + * + * @param string $name Optional, the options name to return + * @throws Zend_Cache_Exceptions + * @return mixed + */ + public function getOption($name) + { + $name = strtolower($name); + + if (array_key_exists($name, $this->_options)) { + return $this->_options[$name]; + } + + if (array_key_exists($name, $this->_directives)) { + return $this->_directives[$name]; + } + + Zend_Cache::throwException("Incorrect option name : {$name}"); + } + + /** * Get the life time * * if $specificLifetime is not false, the given specific life time is used @@ -154,7 +176,7 @@ $tmpdir = array(); foreach (array($_ENV, $_SERVER) as $tab) { foreach (array('TMPDIR', 'TEMP', 'TMP', 'windir', 'SystemRoot') as $key) { - if (isset($tab[$key])) { + if (isset($tab[$key]) && is_string($tab[$key])) { if (($key == 'windir') or ($key == 'SystemRoot')) { $dir = realpath($tab[$key] . '\\temp'); } else { @@ -200,7 +222,7 @@ /** * Verify if the given temporary directory is readable and writable * - * @param $dir temporary directory + * @param string $dir temporary directory * @return boolean true if the directory is ok */ protected function _isGoodTmpDir($dir) @@ -237,7 +259,9 @@ // Create a default logger to the standard output stream require_once 'Zend/Log.php'; require_once 'Zend/Log/Writer/Stream.php'; + require_once 'Zend/Log/Filter/Priority.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); + $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_directives['logger'] = $logger; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Apc.php --- a/web/lib/Zend/Cache/Backend/Apc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Apc.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Apc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Apc.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/BlackHole.php --- a/web/lib/Zend/Cache/Backend/BlackHole.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/BlackHole.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlackHole.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: BlackHole.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,11 +33,11 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cache_Backend_BlackHole - extends Zend_Cache_Backend +class Zend_Cache_Backend_BlackHole + extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface { /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/ExtendedInterface.php --- a/web/lib/Zend/Cache/Backend/ExtendedInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/ExtendedInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExtendedInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ExtendedInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/File.php --- a/web/lib/Zend/Cache/Backend/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 21636 2010-03-24 17:10:23Z mabe $ + * @version $Id: File.php 24844 2012-05-31 19:01:36Z rob $ */ /** @@ -34,7 +34,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -71,7 +71,11 @@ * for you. Maybe, 1 or 2 is a good start. * * =====> (int) hashed_directory_umask : - * - Umask for hashed directory structure + * - deprecated + * - Permissions for hashed directory structure + * + * =====> (int) hashed_directory_perm : + * - Permissions for hashed directory structure * * =====> (string) file_name_prefix : * - prefix for cache files @@ -79,7 +83,11 @@ * (like /tmp) can cause disasters when cleaning the cache * * =====> (int) cache_file_umask : - * - Umask for cache files + * - deprecated + * - Permissions for cache files + * + * =====> (int) cache_file_perm : + * - Permissions for cache files * * =====> (int) metatadatas_array_max_size : * - max size for the metadatas array (don't change this value unless you @@ -93,9 +101,9 @@ 'read_control' => true, 'read_control_type' => 'crc32', 'hashed_directory_level' => 0, - 'hashed_directory_umask' => 0700, + 'hashed_directory_perm' => 0700, 'file_name_prefix' => 'zend_cache', - 'cache_file_umask' => 0600, + 'cache_file_perm' => 0600, 'metadatas_array_max_size' => 100 ); @@ -130,13 +138,29 @@ if ($this->_options['metadatas_array_max_size'] < 10) { Zend_Cache::throwException('Invalid metadatas_array_max_size, must be > 10'); } - if (isset($options['hashed_directory_umask']) && is_string($options['hashed_directory_umask'])) { + + if (isset($options['hashed_directory_umask'])) { + // See #ZF-12047 + trigger_error("'hashed_directory_umask' is deprecated -> please use 'hashed_directory_perm' instead", E_USER_NOTICE); + if (!isset($options['hashed_directory_perm'])) { + $options['hashed_directory_perm'] = $options['hashed_directory_umask']; + } + } + if (isset($options['hashed_directory_perm']) && is_string($options['hashed_directory_perm'])) { // See #ZF-4422 - $this->_options['hashed_directory_umask'] = octdec($this->_options['hashed_directory_umask']); + $this->_options['hashed_directory_perm'] = octdec($this->_options['hashed_directory_perm']); } - if (isset($options['cache_file_umask']) && is_string($options['cache_file_umask'])) { + + if (isset($options['cache_file_umask'])) { + // See #ZF-12047 + trigger_error("'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead", E_USER_NOTICE); + if (!isset($options['cache_file_perm'])) { + $options['cache_file_perm'] = $options['cache_file_umask']; + } + } + if (isset($options['cache_file_perm']) && is_string($options['cache_file_perm'])) { // See #ZF-4422 - $this->_options['cache_file_umask'] = octdec($this->_options['cache_file_umask']); + $this->_options['cache_file_perm'] = octdec($this->_options['cache_file_perm']); } } @@ -151,10 +175,10 @@ public function setCacheDir($value, $trailingSeparator = true) { if (!is_dir($value)) { - Zend_Cache::throwException('cache_dir must be a directory'); + Zend_Cache::throwException(sprintf('cache_dir "%s" must be a directory', $value)); } if (!is_writable($value)) { - Zend_Cache::throwException('cache_dir is not writable'); + Zend_Cache::throwException(sprintf('cache_dir "%s" is not writable', $value)); } if ($trailingSeparator) { // add a trailing DIRECTORY_SEPARATOR if necessary @@ -268,14 +292,15 @@ * Clean some cache records * * Available modes are : - * 'all' (default) => remove all cache entries ($tags is not used) - * 'old' => remove too old cache entries ($tags is not used) - * 'matchingTag' => remove cache entries matching all given tags - * ($tags can be an array of strings or a single string) - * 'notMatchingTag' => remove cache entries not matching one of the given tags - * ($tags can be an array of strings or a single string) - * 'matchingAnyTag' => remove cache entries matching any given tags - * ($tags can be an array of strings or a single string) + * + * Zend_Cache::CLEANING_MODE_ALL (default) => remove all cache entries ($tags is not used) + * Zend_Cache::CLEANING_MODE_OLD => remove too old cache entries ($tags is not used) + * Zend_Cache::CLEANING_MODE_MATCHING_TAG => remove cache entries matching all given tags + * ($tags can be an array of strings or a single string) + * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags} + * ($tags can be an array of strings or a single string) + * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags + * ($tags can be an array of strings or a single string) * * @param string $mode clean mode * @param tags array $tags array of tags @@ -722,8 +747,8 @@ if ((is_dir($file)) and ($this->_options['hashed_directory_level']>0)) { // Recursive call $result = $this->_clean($file . DIRECTORY_SEPARATOR, $mode, $tags) && $result; - if ($mode=='all') { - // if mode=='all', we try to drop the structure too + if ($mode == Zend_Cache::CLEANING_MODE_ALL) { + // we try to drop the structure too @rmdir($file); } } @@ -918,8 +943,8 @@ $partsArray = $this->_path($id, true); foreach ($partsArray as $part) { if (!is_dir($part)) { - @mkdir($part, $this->_options['hashed_directory_umask']); - @chmod($part, $this->_options['hashed_directory_umask']); // see #ZF-320 (this line is required in some configurations) + @mkdir($part, $this->_options['hashed_directory_perm']); + @chmod($part, $this->_options['hashed_directory_perm']); // see #ZF-320 (this line is required in some configurations) } } return true; @@ -987,7 +1012,7 @@ } @fclose($f); } - @chmod($file, $this->_options['cache_file_umask']); + @chmod($file, $this->_options['cache_file_perm']); return $result; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Interface.php --- a/web/lib/Zend/Cache/Backend/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cache_Backend_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Libmemcached.php --- a/web/lib/Zend/Cache/Backend/Libmemcached.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Libmemcached.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Libmemcached.php 23220 2010-10-22 10:24:14Z mabe $ + * @version $Id: Libmemcached.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Memcached.php --- a/web/lib/Zend/Cache/Backend/Memcached.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Memcached.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memcached.php 22207 2010-05-20 16:47:16Z mabe $ + * @version $Id: Memcached.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Sqlite.php --- a/web/lib/Zend/Cache/Backend/Sqlite.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Sqlite.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlite.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sqlite.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Sqlite extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -530,7 +530,6 @@ $rand = rand(1, $this->_options['automatic_vacuum_factor']); if ($rand == 1) { $this->_query('VACUUM'); - @sqlite_close($this->_getConnection()); } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Static.php --- a/web/lib/Zend/Cache/Backend/Static.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Static.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Static.php 22950 2010-09-16 19:33:00Z mabe $ + * @version $Id: Static.php 24989 2012-06-21 07:24:13Z mabe $ */ /** @@ -33,7 +33,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Static @@ -99,17 +99,13 @@ */ public function getOption($name) { + $name = strtolower($name); + if ($name == 'tag_cache') { return $this->getInnerCache(); - } else { - if (in_array($name, $this->_options)) { - return $this->_options[$name]; - } - if ($name == 'lifetime') { - return parent::getLifetime(); - } - return null; } + + return parent::getOption($name); } /** @@ -123,7 +119,7 @@ */ public function load($id, $doNotTestCacheValidity = false) { - if (empty($id)) { + if (($id = (string)$id) === '') { $id = $this->_detectId(); } else { $id = $this->_decodeId($id); @@ -136,7 +132,7 @@ } $fileName = basename($id); - if (empty($fileName)) { + if ($fileName === '') { $fileName = $this->_options['index_filename']; } $pathName = $this->_options['public_dir'] . dirname($id); @@ -163,7 +159,7 @@ } $fileName = basename($id); - if (empty($fileName)) { + if ($fileName === '') { $fileName = $this->_options['index_filename']; } if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) { @@ -211,14 +207,14 @@ } clearstatcache(); - if ($id === null || strlen($id) == 0) { + if (($id = (string)$id) === '') { $id = $this->_detectId(); } else { $id = $this->_decodeId($id); } $fileName = basename($id); - if (empty($fileName)) { + if ($fileName === '') { $fileName = $this->_options['index_filename']; } @@ -308,7 +304,7 @@ } else { $extension = $this->_options['file_extension']; } - if (empty($fileName)) { + if ($fileName === '') { $fileName = $this->_options['index_filename']; } $pathName = $this->_options['public_dir'] . dirname($id); @@ -333,7 +329,7 @@ Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path'); } $fileName = basename($id); - if (empty($fileName)) { + if ($fileName === '') { $fileName = $this->_options['index_filename']; } $pathName = $this->_options['public_dir'] . dirname($id); @@ -343,14 +339,16 @@ if (!is_writable($directory)) { return false; } - foreach (new DirectoryIterator($directory) as $file) { - if (true === $file->isFile()) { - if (false === unlink($file->getPathName())) { - return false; + if (is_dir($directory)) { + foreach (new DirectoryIterator($directory) as $file) { + if (true === $file->isFile()) { + if (false === unlink($file->getPathName())) { + return false; + } } } } - rmdir(dirname($path)); + rmdir($directory); } if (file_exists($file)) { if (!is_writable($file)) { @@ -538,7 +536,7 @@ * Detect an octal string and return its octal value for file permission ops * otherwise return the non-string (assumed octal or decimal int already) * - * @param $val The potential octal in need of conversion + * @param string $val The potential octal in need of conversion * @return int */ protected function _octdec($val) @@ -551,9 +549,12 @@ /** * Decode a request URI from the provided ID + * + * @param string $id + * @return string */ protected function _decodeId($id) { - return pack('H*', $id);; + return pack('H*', $id); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Test.php --- a/web/lib/Zend/Cache/Backend/Test.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Test.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Test.php 23051 2010-10-07 17:01:21Z mabe $ + * @version $Id: Test.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -164,7 +164,7 @@ public function save($data, $id, $tags = array(), $specificLifetime = false) { $this->_addLog('save', array($data, $id, $tags)); - if ($id=='false') { + if (substr($id,-5)=='false') { return false; } return true; @@ -182,7 +182,7 @@ public function remove($id) { $this->_addLog('remove', array($id)); - if ($id=='false') { + if (substr($id,-5)=='false') { return false; } return true; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/TwoLevels.php --- a/web/lib/Zend/Cache/Backend/TwoLevels.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/TwoLevels.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TwoLevels.php 22736 2010-07-30 16:25:54Z andyfowler $ + * @version $Id: TwoLevels.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -383,7 +383,6 @@ return $this->_slowBackend->getIdsMatchingAnyTags($tags); } - /** * Return the filling percentage of the backend storage * @@ -481,18 +480,19 @@ */ private function _getFastLifetime($lifetime, $priority, $maxLifetime = null) { - if ($lifetime === null) { - // if lifetime is null, we have an infinite lifetime + if ($lifetime <= 0) { + // if no lifetime, we have an infinite lifetime // we need to use arbitrary lifetimes $fastLifetime = (int) (2592000 / (11 - $priority)); } else { - $fastLifetime = (int) ($lifetime / (11 - $priority)); + // prevent computed infinite lifetime (0) by ceil + $fastLifetime = (int) ceil($lifetime / (11 - $priority)); } - if (($maxLifetime !== null) && ($maxLifetime >= 0)) { - if ($fastLifetime > $maxLifetime) { - return $maxLifetime; - } + + if ($maxLifetime >= 0 && $fastLifetime > $maxLifetime) { + return $maxLifetime; } + return $fastLifetime; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/WinCache.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cache/Backend/WinCache.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,349 @@ + infinite lifetime) + * @return boolean true if no problem + */ + public function save($data, $id, $tags = array(), $specificLifetime = false) + { + $lifetime = $this->getLifetime($specificLifetime); + $result = wincache_ucache_set($id, array($data, time(), $lifetime), $lifetime); + if (count($tags) > 0) { + $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); + } + return $result; + } + + /** + * Remove a cache record + * + * @param string $id cache id + * @return boolean true if no problem + */ + public function remove($id) + { + return wincache_ucache_delete($id); + } + + /** + * Clean some cache records + * + * Available modes are : + * 'all' (default) => remove all cache entries ($tags is not used) + * 'old' => unsupported + * 'matchingTag' => unsupported + * 'notMatchingTag' => unsupported + * 'matchingAnyTag' => unsupported + * + * @param string $mode clean mode + * @param array $tags array of tags + * @throws Zend_Cache_Exception + * @return boolean true if no problem + */ + public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array()) + { + switch ($mode) { + case Zend_Cache::CLEANING_MODE_ALL: + return wincache_ucache_clear(); + break; + case Zend_Cache::CLEANING_MODE_OLD: + $this->_log("Zend_Cache_Backend_WinCache::clean() : CLEANING_MODE_OLD is unsupported by the WinCache backend"); + break; + case Zend_Cache::CLEANING_MODE_MATCHING_TAG: + case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG: + case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG: + $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_WINCACHE_BACKEND); + break; + default: + Zend_Cache::throwException('Invalid mode for clean() method'); + break; + } + } + + /** + * Return true if the automatic cleaning is available for the backend + * + * DEPRECATED : use getCapabilities() instead + * + * @deprecated + * @return boolean + */ + public function isAutomaticCleaningAvailable() + { + return false; + } + + /** + * Return the filling percentage of the backend storage + * + * @throws Zend_Cache_Exception + * @return int integer between 0 and 100 + */ + public function getFillingPercentage() + { + $mem = wincache_ucache_meminfo(); + $memSize = $mem['memory_total']; + $memUsed = $memSize - $mem['memory_free']; + if ($memSize == 0) { + Zend_Cache::throwException('can\'t get WinCache memory size'); + } + if ($memUsed > $memSize) { + return 100; + } + return ((int) (100. * ($memUsed / $memSize))); + } + + /** + * Return an array of stored tags + * + * @return array array of stored tags (string) + */ + public function getTags() + { + $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); + return array(); + } + + /** + * Return an array of stored cache ids which match given tags + * + * In case of multiple tags, a logical AND is made between tags + * + * @param array $tags array of tags + * @return array array of matching cache ids (string) + */ + public function getIdsMatchingTags($tags = array()) + { + $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); + return array(); + } + + /** + * Return an array of stored cache ids which don't match given tags + * + * In case of multiple tags, a logical OR is made between tags + * + * @param array $tags array of tags + * @return array array of not matching cache ids (string) + */ + public function getIdsNotMatchingTags($tags = array()) + { + $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); + return array(); + } + + /** + * Return an array of stored cache ids which match any given tags + * + * In case of multiple tags, a logical AND is made between tags + * + * @param array $tags array of tags + * @return array array of any matching cache ids (string) + */ + public function getIdsMatchingAnyTags($tags = array()) + { + $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND); + return array(); + } + + /** + * Return an array of stored cache ids + * + * @return array array of stored cache ids (string) + */ + public function getIds() + { + $res = array(); + $array = wincache_ucache_info(); + $records = $array['ucache_entries']; + foreach ($records as $record) { + $res[] = $record['key_name']; + } + return $res; + } + + /** + * Return an array of metadatas for the given cache id + * + * The array must include these keys : + * - expire : the expire timestamp + * - tags : a string array of tags + * - mtime : timestamp of last modification time + * + * @param string $id cache id + * @return array array of metadatas (false if the cache id is not found) + */ + public function getMetadatas($id) + { + $tmp = wincache_ucache_get($id); + if (is_array($tmp)) { + $data = $tmp[0]; + $mtime = $tmp[1]; + if (!isset($tmp[2])) { + return false; + } + $lifetime = $tmp[2]; + return array( + 'expire' => $mtime + $lifetime, + 'tags' => array(), + 'mtime' => $mtime + ); + } + return false; + } + + /** + * Give (if possible) an extra lifetime to the given cache id + * + * @param string $id cache id + * @param int $extraLifetime + * @return boolean true if ok + */ + public function touch($id, $extraLifetime) + { + $tmp = wincache_ucache_get($id); + if (is_array($tmp)) { + $data = $tmp[0]; + $mtime = $tmp[1]; + if (!isset($tmp[2])) { + return false; + } + $lifetime = $tmp[2]; + $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime; + if ($newLifetime <=0) { + return false; + } + return wincache_ucache_set($id, array($data, time(), $newLifetime), $newLifetime); + } + return false; + } + + /** + * Return an associative array of capabilities (booleans) of the backend + * + * The array must include these keys : + * - automatic_cleaning (is automating cleaning necessary) + * - tags (are tags supported) + * - expired_read (is it possible to read expired cache records + * (for doNotTestCacheValidity option for example)) + * - priority does the backend deal with priority when saving + * - infinite_lifetime (is infinite lifetime can work with this backend) + * - get_list (is it possible to get the list of cache ids and the complete list of tags) + * + * @return array associative of with capabilities + */ + public function getCapabilities() + { + return array( + 'automatic_cleaning' => false, + 'tags' => false, + 'expired_read' => false, + 'priority' => false, + 'infinite_lifetime' => false, + 'get_list' => true + ); + } + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/Xcache.php --- a/web/lib/Zend/Cache/Backend/Xcache.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/Xcache.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xcache.php 23345 2010-11-15 16:31:14Z mabe $ + * @version $Id: Xcache.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_Xcache extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/ZendPlatform.php --- a/web/lib/Zend/Cache/Backend/ZendPlatform.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/ZendPlatform.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendPlatform.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ZendPlatform.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_ZendPlatform extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/ZendServer.php --- a/web/lib/Zend/Cache/Backend/ZendServer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/ZendServer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendServer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ZendServer.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cache_Backend_ZendServer extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/ZendServer/Disk.php --- a/web/lib/Zend/Cache/Backend/ZendServer/Disk.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/ZendServer/Disk.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Disk.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Disk.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_ZendServer_Disk extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Backend/ZendServer/ShMem.php --- a/web/lib/Zend/Cache/Backend/ZendServer/ShMem.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Backend/ZendServer/ShMem.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ShMem.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ShMem.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Backend_ZendServer_ShMem extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Core.php --- a/web/lib/Zend/Cache/Core.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Core.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Core.php 22651 2010-07-21 04:19:44Z ramon $ + * @version $Id: Core.php 24989 2012-06-21 07:24:13Z mabe $ */ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Core @@ -211,7 +211,7 @@ public function setOption($name, $value) { if (!is_string($name)) { - Zend_Cache::throwException("Incorrect option name : $name"); + Zend_Cache::throwException("Incorrect option name!"); } $name = strtolower($name); if (array_key_exists($name, $this->_options)) { @@ -235,17 +235,18 @@ */ public function getOption($name) { - if (is_string($name)) { - $name = strtolower($name); - if (array_key_exists($name, $this->_options)) { - // This is a Core option - return $this->_options[$name]; - } - if (array_key_exists($name, $this->_specificOptions)) { - // This a specic option of this frontend - return $this->_specificOptions[$name]; - } + $name = strtolower($name); + + if (array_key_exists($name, $this->_options)) { + // This is a Core option + return $this->_options[$name]; } + + if (array_key_exists($name, $this->_specificOptions)) { + // This a specic option of this frontend + return $this->_specificOptions[$name]; + } + Zend_Cache::throwException("Incorrect option name : $name"); } @@ -300,6 +301,8 @@ $id = $this->_id($id); // cache id may need prefix $this->_lastId = $id; self::_validateIdOrTag($id); + + $this->_log("Zend_Cache_Core: load item '{$id}'", 7); $data = $this->_backend->load($id, $doNotTestCacheValidity); if ($data===false) { // no cache available @@ -326,6 +329,8 @@ $id = $this->_id($id); // cache id may need prefix self::_validateIdOrTag($id); $this->_lastId = $id; + + $this->_log("Zend_Cache_Core: test item '{$id}'", 7); return $this->_backend->test($id); } @@ -360,27 +365,22 @@ Zend_Cache::throwException("Datas must be string or set automatic_serialization = true"); } } + // automatic cleaning if ($this->_options['automatic_cleaning_factor'] > 0) { $rand = rand(1, $this->_options['automatic_cleaning_factor']); if ($rand==1) { - if ($this->_extendedBackend) { - // New way - if ($this->_backendCapabilities['automatic_cleaning']) { - $this->clean(Zend_Cache::CLEANING_MODE_OLD); - } else { - $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend'); - } + // new way || deprecated way + if ($this->_extendedBackend || method_exists($this->_backend, 'isAutomaticCleaningAvailable')) { + $this->_log("Zend_Cache_Core::save(): automatic cleaning running", 7); + $this->clean(Zend_Cache::CLEANING_MODE_OLD); } else { - // Deprecated way (will be removed in next major version) - if (method_exists($this->_backend, 'isAutomaticCleaningAvailable') && ($this->_backend->isAutomaticCleaningAvailable())) { - $this->clean(Zend_Cache::CLEANING_MODE_OLD); - } else { - $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend'); - } + $this->_log("Zend_Cache_Core::save(): automatic cleaning is not available/necessary with current backend", 4); } } } + + $this->_log("Zend_Cache_Core: save item '{$id}'", 7); if ($this->_options['ignore_user_abort']) { $abort = ignore_user_abort(true); } @@ -392,22 +392,23 @@ if ($this->_options['ignore_user_abort']) { ignore_user_abort($abort); } + if (!$result) { // maybe the cache is corrupted, so we remove it ! - if ($this->_options['logging']) { - $this->_log("Zend_Cache_Core::save() : impossible to save cache (id=$id)"); - } - $this->remove($id); + $this->_log("Zend_Cache_Core::save(): failed to save item '{$id}' -> removing it", 4); + $this->_backend->remove($id); return false; } + if ($this->_options['write_control']) { $data2 = $this->_backend->load($id, true); if ($data!=$data2) { - $this->_log('Zend_Cache_Core::save() / write_control : written and read data do not match'); + $this->_log("Zend_Cache_Core::save(): write control of item '{$id}' failed -> removing it", 4); $this->_backend->remove($id); return false; } } + return true; } @@ -424,6 +425,8 @@ } $id = $this->_id($id); // cache id may need prefix self::_validateIdOrTag($id); + + $this->_log("Zend_Cache_Core: remove item '{$id}'", 7); return $this->_backend->remove($id); } @@ -458,6 +461,7 @@ Zend_Cache::throwException('Invalid cleaning mode'); } self::_validateTagsArray($tags); + return $this->_backend->clean($mode, $tags); } @@ -649,6 +653,8 @@ Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } $id = $this->_id($id); // cache id may need prefix + + $this->_log("Zend_Cache_Core: touch item '{$id}'", 7); return $this->_backend->touch($id, $extraLifetime); } @@ -713,9 +719,11 @@ } // Create a default logger to the standard output stream + require_once 'Zend/Log.php'; require_once 'Zend/Log/Writer/Stream.php'; - require_once 'Zend/Log.php'; + require_once 'Zend/Log/Filter/Priority.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); + $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_options['logger'] = $logger; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Exception.php --- a/web/lib/Zend/Cache/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Exception extends Zend_Exception {} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Frontend/Capture.php --- a/web/lib/Zend/Cache/Frontend/Capture.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Frontend/Capture.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Capture.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Capture.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Capture extends Zend_Cache_Core @@ -46,7 +46,7 @@ * @var array */ protected $_tags = array(); - + protected $_extension = null; /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Frontend/Class.php --- a/web/lib/Zend/Cache/Frontend/Class.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Frontend/Class.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 23051 2010-10-07 17:01:21Z mabe $ + * @version $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Class extends Zend_Cache_Core @@ -200,13 +200,19 @@ */ public function __call($name, $parameters) { + $callback = array($this->_cachedEntity, $name); + + if (!is_callable($callback, false)) { + Zend_Cache::throwException('Invalid callback'); + } + $cacheBool1 = $this->_specificOptions['cache_by_default']; $cacheBool2 = in_array($name, $this->_specificOptions['cached_methods']); $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_methods']); $cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3)); if (!$cache) { // We do not have not cache - return call_user_func_array(array($this->_cachedEntity, $name), $parameters); + return call_user_func_array($callback, $parameters); } $id = $this->_makeId($name, $parameters); @@ -220,7 +226,7 @@ ob_implicit_flush(false); try { - $return = call_user_func_array(array($this->_cachedEntity, $name), $parameters); + $return = call_user_func_array($callback, $parameters); $output = ob_get_clean(); $data = array($output, $return); $this->save($data, $id, $this->_tags, $this->_specificLifetime, $this->_priority); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Frontend/File.php --- a/web/lib/Zend/Cache/Frontend/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Frontend/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 23330 2010-11-14 20:08:09Z mabe $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_File extends Zend_Cache_Core @@ -110,7 +110,11 @@ clearstatcache(); $i = 0; foreach ($masterFiles as $masterFile) { - $mtime = @filemtime($masterFile); + if (file_exists($masterFile)) { + $mtime = filemtime($masterFile); + } else { + $mtime = false; + } if (!$this->_specificOptions['ignore_missing_master_files'] && !$mtime) { Zend_Cache::throwException('Unable to read master_file : ' . $masterFile); @@ -119,7 +123,7 @@ $this->_masterFile_mtimes[$i] = $mtime; $this->_specificOptions['master_files'][$i] = $masterFile; if ($i === 0) { // to keep a compatibility - $this->_specificOptions['master_files'] = $masterFile; + $this->_specificOptions['master_file'] = $masterFile; } $i++; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Frontend/Function.php --- a/web/lib/Zend/Cache/Frontend/Function.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Frontend/Function.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Function.php 22648 2010-07-20 14:43:27Z mabe $ + * @version $Id: Function.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Function extends Zend_Cache_Core @@ -104,8 +104,7 @@ ob_start(); ob_implicit_flush(false); $return = call_user_func_array($callback, $parameters); - $output = ob_get_contents(); - ob_end_clean(); + $output = ob_get_clean(); $data = array($output, $return); $this->save($data, $id, $tags, $specificLifetime, $priority); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Frontend/Output.php --- a/web/lib/Zend/Cache/Frontend/Output.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Frontend/Output.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Output.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Output.php 24800 2012-05-13 11:59:32Z mabe $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Output extends Zend_Cache_Core @@ -55,7 +55,7 @@ * * @param string $id Cache id * @param boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested - * @param boolean $echoData If set to true, datas are sent to the browser if the cache is hit (simpy returned else) + * @param boolean $echoData If set to true, datas are sent to the browser if the cache is hit (simply returned else) * @return mixed True if the cache is hit (false else) with $echoData=true (default) ; string else (datas) */ public function start($id, $doNotTestCacheValidity = false, $echoData = true) @@ -88,8 +88,7 @@ public function end($tags = array(), $specificLifetime = false, $forcedDatas = null, $echoData = true, $priority = 8) { if ($forcedDatas === null) { - $data = ob_get_contents(); - ob_end_clean(); + $data = ob_get_clean(); } else { $data =& $forcedDatas; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Frontend/Page.php --- a/web/lib/Zend/Cache/Frontend/Page.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Frontend/Page.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Page.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Page.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Page extends Zend_Cache_Core @@ -243,9 +243,11 @@ { $this->_cancel = false; $lastMatchingRegexp = null; - foreach ($this->_specificOptions['regexps'] as $regexp => $conf) { - if (preg_match("`$regexp`", $_SERVER['REQUEST_URI'])) { - $lastMatchingRegexp = $regexp; + if (isset($_SERVER['REQUEST_URI'])) { + foreach ($this->_specificOptions['regexps'] as $regexp => $conf) { + if (preg_match("`$regexp`", $_SERVER['REQUEST_URI'])) { + $lastMatchingRegexp = $regexp; + } } } $this->_activeOptions = $this->_specificOptions['default_options']; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cache/Manager.php --- a/web/lib/Zend/Cache/Manager.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cache/Manager.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manager.php 22727 2010-07-30 12:36:00Z mabe $ + * @version $Id: Manager.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Cache_Exception */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Manager diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/Adapter.php --- a/web/lib/Zend/Captcha/Adapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/Adapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Adapter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Adapter.php 24593 2012-01-05 20:35:02Z matthew $ */ interface Zend_Captcha_Adapter extends Zend_Validate_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/Base.php --- a/web/lib/Zend/Captcha/Base.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/Base.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,9 +33,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_Captcha_Adapter { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/Dumb.php --- a/web/lib/Zend/Captcha/Dumb.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/Dumb.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,13 +30,36 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dumb.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dumb.php 24747 2012-05-05 00:21:56Z adamlundrigan $ */ class Zend_Captcha_Dumb extends Zend_Captcha_Word { /** + * CAPTCHA label + * @type string + */ + protected $_label = 'Please type this word backwards'; + + /** + * Set the label for the CAPTCHA + * @param string $label + */ + public function setLabel($label) + { + $this->_label = $label; + } + + /** + * Retrieve the label for the CAPTCHA + * @return string + */ + public function getLabel() + { + return $this->_label; + } + /** * Render the captcha * * @param Zend_View_Interface $view @@ -45,7 +68,7 @@ */ public function render(Zend_View_Interface $view = null, $element = null) { - return 'Please type this word backwards: ' + return $this->getLabel() . ': ' . strrev($this->getWord()) . ''; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/Exception.php --- a/web/lib/Zend/Captcha/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Captcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Captcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Captcha_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/Figlet.php --- a/web/lib/Zend/Captcha/Figlet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/Figlet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,9 +33,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Figlet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Figlet.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Captcha_Figlet extends Zend_Captcha_Word { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/Image.php --- a/web/lib/Zend/Captcha/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 22589 2010-07-16 20:51:51Z mikaelkael $ + * @version $Id: Image.php 24821 2012-05-29 14:54:50Z adamlundrigan $ */ /** @see Zend_Captcha_Word */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Captcha_Image extends Zend_Captcha_Word @@ -580,7 +580,7 @@ $suffixLength = strlen($this->_suffix); foreach (new DirectoryIterator($imgdir) as $file) { if (!$file->isDot() && !$file->isDir()) { - if ($file->getMTime() < $expire) { + if (file_exists($file->getPathname()) && $file->getMTime() < $expire) { // only deletes files ending with $this->_suffix if (substr($file->getFilename(), -($suffixLength)) == $this->_suffix) { unlink($file->getPathname()); @@ -599,7 +599,11 @@ */ public function render(Zend_View_Interface $view = null, $element = null) { + $endTag = ' />'; + if (($view instanceof Zend_View_Abstract) && !$view->doctype()->isXhtml()) { + $endTag = '>'; + } return ''; + . '" src="' . $this->getImgUrl() . $this->getId() . $this->getSuffix() . '"' . $endTag; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/ReCaptcha.php --- a/web/lib/Zend/Captcha/ReCaptcha.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/ReCaptcha.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReCaptcha.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ReCaptcha.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Captcha_ReCaptcha extends Zend_Captcha_Base { @@ -261,6 +261,20 @@ */ public function render(Zend_View_Interface $view = null, $element = null) { - return $this->getService()->getHTML(); + $name = null; + if ($element instanceof Zend_Form_Element) { + $name = $element->getBelongsTo(); + } + return $this->getService()->getHTML($name); + } + + /** + * Get captcha decorator + * + * @return string + */ + public function getDecorator() + { + return "Captcha_ReCaptcha"; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Captcha/Word.php --- a/web/lib/Zend/Captcha/Word.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Captcha/Word.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Word.php 21793 2010-04-08 00:51:31Z stas $ + * @version $Id: Word.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Captcha_Word extends Zend_Captcha_Base { @@ -93,10 +93,10 @@ * @var integer */ protected $_timeout = 300; - + /** * Should generate() keep session or create a new one? - * + * * @var boolean */ protected $_keepSession = false; @@ -131,7 +131,7 @@ * * @return string */ - public function getSessionClass() + public function getSessionClass() { return $this->_sessionClass; } @@ -217,21 +217,21 @@ return $this->_timeout; } - /** - * Sets if session should be preserved on generate() - * - * @param $keepSession Should session be kept on generate()? - * @return Zend_Captcha_Word - */ - public function setKeepSession($keepSession) - { - $this->_keepSession = $keepSession; - return $this; - } + /** + * Sets if session should be preserved on generate() + * + * @param bool $keepSession Should session be kept on generate()? + * @return Zend_Captcha_Word + */ + public function setKeepSession($keepSession) + { + $this->_keepSession = $keepSession; + return $this; + } /** * Numbers should be included in the pattern? - * + * * @return bool */ public function getUseNumbers() @@ -239,10 +239,10 @@ return $this->_useNumbers; } - /** - * Set if numbers should be included in the pattern - * - * @param $_useNumbers numbers should be included in the pattern? + /** + * Set if numbers should be included in the pattern + * + * @param bool $_useNumbers numbers should be included in the pattern? * @return Zend_Captcha_Word */ public function setUseNumbers($_useNumbers) @@ -250,8 +250,8 @@ $this->_useNumbers = $_useNumbers; return $this; } - - /** + + /** * Get session object * * @return Zend_Session_Namespace @@ -348,7 +348,7 @@ public function generate() { if(!$this->_keepSession) { - $this->_session = null; + $this->_session = null; } $id = $this->_generateRandomId(); $this->_setId($id); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/AbstractFactory.php --- a/web/lib/Zend/Cloud/AbstractFactory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/AbstractFactory.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,29 +23,29 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_AbstractFactory { /** * Constructor - * + * * @return void */ private function __construct() { // private ctor - should not be used } - + /** * Get an individual adapter instance - * - * @param string $adapterOption - * @param array|Zend_Config $options + * + * @param string $adapterOption + * @param array|Zend_Config $options * @return null|Zend_Cloud_DocumentService_Adapter|Zend_Cloud_QueueService_Adapter|Zend_Cloud_StorageService_Adapter */ - protected static function _getAdapter($adapterOption, $options) + protected static function _getAdapter($adapterOption, $options) { if ($options instanceof Zend_Config) { $options = $options->toArray(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Adapter.php --- a/web/lib/Zend/Cloud/DocumentService/Adapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Adapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cloud_DocumentService_Adapter @@ -67,9 +67,9 @@ /** * List all documents in a collection - * - * @param string $collectionName - * @param null|array $options + * + * @param string $collectionName + * @param null|array $options * @return Zend_Cloud_DocumentService_DocumentSet */ public function listDocuments($collectionName, array $options = null); @@ -87,7 +87,7 @@ /** * Replace document * The new document replaces the existing document with the same ID. - * + * * @param string $collectionName Collection name * @param Zend_Cloud_DocumentService_Document $document * @param array $options @@ -96,8 +96,8 @@ /** * Update document - * The fields of the existing documents will be updated. - * Fields not specified in the set will be left as-is. + * The fields of the existing documents will be updated. + * Fields not specified in the set will be left as-is. * * @param string $collectionName * @param mixed|Zend_Cloud_DocumentService_Document $documentID Document ID, adapter-dependent, or document containing updates @@ -106,7 +106,7 @@ * @return boolean */ public function updateDocument($collectionName, $documentID, $fieldset = null, $options = null); - + /** * Delete document * @@ -119,16 +119,16 @@ /** * Fetch single document by ID - * + * * Will return false if the document does not exist - * + * * @param string $collectionName Collection name * @param mixed $documentID Document ID, adapter-dependent * @param array $options * @return Zend_Cloud_DocumentService_Document */ public function fetchDocument($collectionName, $documentID, $options = null); - + /** * Query for documents stored in the document service. If a string is passed in * $query, the query string will be passed directly to the service. @@ -139,15 +139,15 @@ * @return array Array of field sets */ public function query($collectionName, $query, $options = null); - + /** * Create query statement - * + * * @param string $fields * @return Zend_Cloud_DocumentService_Query */ public function select($fields = null); - + /** * Get the concrete service client */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php --- a/web/lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,10 +33,10 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -abstract class Zend_Cloud_DocumentService_Adapter_AbstractAdapter +abstract class Zend_Cloud_DocumentService_Adapter_AbstractAdapter implements Zend_Cloud_DocumentService_Adapter { const DOCUMENT_CLASS = 'document_class'; @@ -57,15 +57,15 @@ /** * Class to utilize for new query objects - * + * * @var string */ protected $_queryClass = 'Zend_Cloud_DocumentService_Query'; /** * Set the class for document objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_DocumentService_Adapter_AbstractAdapter */ public function setDocumentClass($class) @@ -76,7 +76,7 @@ /** * Get the class for document objects - * + * * @return string */ public function getDocumentClass() @@ -86,8 +86,8 @@ /** * Set the class for document set objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_DocumentService_Adapter_AbstractAdapter */ public function setDocumentSetClass($class) @@ -98,7 +98,7 @@ /** * Get the class for document set objects - * + * * @return string */ public function getDocumentSetClass() @@ -108,8 +108,8 @@ /** * Set the query class for query objects - * - * @param string $class + * + * @param string $class * @return Zend_Cloud_DocumentService_Adapter_AbstractAdapter */ public function setQueryClass($class) @@ -120,7 +120,7 @@ /** * Get the class for query objects - * + * * @return string */ public function getQueryClass() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php --- a/web/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,468 +1,468 @@ -toArray(); - } - - if (!is_array($options)) { - throw new Zend_Cloud_DocumentService_Exception('Invalid options provided to constructor'); - } - - $this->_simpleDb = new Zend_Service_Amazon_SimpleDb( - $options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY] - ); - - if (isset($options[self::HTTP_ADAPTER])) { - $this->_sqs->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } - - if (isset($options[self::DOCUMENT_CLASS])) { - $this->setDocumentClass($options[self::DOCUMENT_CLASS]); - } - - if (isset($options[self::DOCUMENTSET_CLASS])) { - $this->setDocumentSetClass($options[self::DOCUMENTSET_CLASS]); - } - - if (isset($options[self::QUERY_CLASS])) { - $this->setQueryClass($options[self::QUERY_CLASS]); - } - } - - /** - * Create collection. - * - * @param string $name - * @param array $options - * @return void - */ - public function createCollection($name, $options = null) - { - try { - $this->_simpleDb->createDomain($name); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on domain creation: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Delete collection. - * - * @param string $name - * @param array $options - * @return void - */ - public function deleteCollection($name, $options = null) - { - try { - $this->_simpleDb->deleteDomain($name); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on collection deletion: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * List collections. - * - * @param array $options - * @return array - */ - public function listCollections($options = null) - { - try { - // TODO package this in Pages - $domains = $this->_simpleDb->listDomains()->getData(); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on collection deletion: '.$e->getMessage(), $e->getCode(), $e); - } - - return $domains; - } - - /** - * List documents - * - * Returns a key/value array of document names to document objects. - * - * @param string $collectionName Name of collection for which to list documents - * @param array|null $options - * @return Zend_Cloud_DocumentService_DocumentSet - */ - public function listDocuments($collectionName, array $options = null) - { - $query = $this->select('*')->from($collectionName); - $items = $this->query($collectionName, $query, $options); - return $items; - } - - /** - * Insert document - * - * @param string $collectionName Collection into which to insert document - * @param array|Zend_Cloud_DocumentService_Document $document - * @param array $options - * @return void - */ - public function insertDocument($collectionName, $document, $options = null) - { - if (is_array($document)) { - $document = $this->_getDocumentFromArray($document); - } - - if (!$document instanceof Zend_Cloud_DocumentService_Document) { - throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); - } - - try { - $this->_simpleDb->putAttributes( - $collectionName, - $document->getID(), - $this->_makeAttributes($document->getID(), $document->getFields()) - ); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on document insertion: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Replace an existing document with a new version - * - * @param string $collectionName - * @param array|Zend_Cloud_DocumentService_Document $document - * @param array $options - * @return void - */ - public function replaceDocument($collectionName, $document, $options = null) - { - if (is_array($document)) { - $document = $this->_getDocumentFromArray($document); - } - - if (!$document instanceof Zend_Cloud_DocumentService_Document) { - throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); - } - - // Delete document first, then insert. PutAttributes always keeps any - // fields not referenced in the payload, but present in the document - $documentId = $document->getId(); - $fields = $document->getFields(); - $docClass = get_class($document); - $this->deleteDocument($collectionName, $document, $options); - - $document = new $docClass($fields, $documentId); - $this->insertDocument($collectionName, $document); - } - - /** - * Update document. The new document replaces the existing document. - * - * Option 'merge' specifies to add all attributes (if true) or - * specific attributes ("attr" => true) instead of replacing them. - * By default, attributes are replaced. - * - * @param string $collectionName - * @param mixed|Zend_Cloud_DocumentService_Document $documentId Document ID, adapter-dependent - * @param array|Zend_Cloud_DocumentService_Document $fieldset Set of fields to update - * @param array $options - * @return boolean - */ - public function updateDocument($collectionName, $documentId, $fieldset = null, $options = null) - { - if (null === $fieldset && $documentId instanceof Zend_Cloud_DocumentService_Document) { - $fieldset = $documentId->getFields(); - if (empty($documentId)) { - $documentId = $documentId->getId(); - } - } elseif ($fieldset instanceof Zend_Cloud_DocumentService_Document) { - if (empty($documentId)) { - $documentId = $fieldset->getId(); - } - $fieldset = $fieldset->getFields(); - } - - $replace = array(); - if (empty($options[self::MERGE_OPTION])) { - // no merge option - we replace all - foreach ($fieldset as $key => $value) { - $replace[$key] = true; - } - } elseif (is_array($options[self::MERGE_OPTION])) { - foreach ($fieldset as $key => $value) { - if (empty($options[self::MERGE_OPTION][$key])) { - // if there's merge key, we add it, otherwise we replace it - $replace[$key] = true; - } - } - } // otherwise $replace is empty - all is merged - - try { - $this->_simpleDb->putAttributes( - $collectionName, - $documentId, - $this->_makeAttributes($documentId, $fieldset), - $replace - ); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on document update: '.$e->getMessage(), $e->getCode(), $e); - } - return true; - } - - /** - * Delete document. - * - * @param string $collectionName Collection from which to delete document - * @param mixed $document Document ID or Document object. - * @param array $options - * @return boolean - */ - public function deleteDocument($collectionName, $document, $options = null) - { - if ($document instanceof Zend_Cloud_DocumentService_Document) { - $document = $document->getId(); - } - try { - $this->_simpleDb->deleteAttributes($collectionName, $document); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on document deletion: '.$e->getMessage(), $e->getCode(), $e); - } - return true; - } - - /** - * Fetch single document by ID - * - * @param string $collectionName Collection name - * @param mixed $documentId Document ID, adapter-dependent - * @param array $options - * @return Zend_Cloud_DocumentService_Document - */ - public function fetchDocument($collectionName, $documentId, $options = null) - { - try { - $attributes = $this->_simpleDb->getAttributes($collectionName, $documentId); - if ($attributes == false || count($attributes) == 0) { - return false; - } - return $this->_resolveAttributes($attributes, true); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on fetching document: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Query for documents stored in the document service. If a string is passed in - * $query, the query string will be passed directly to the service. - * - * @param string $collectionName Collection name - * @param string $query - * @param array $options - * @return array Zend_Cloud_DocumentService_DocumentSet - */ - public function query($collectionName, $query, $options = null) - { - $returnDocs = isset($options[self::RETURN_DOCUMENTS]) - ? (bool) $options[self::RETURN_DOCUMENTS] - : true; - - try { - if ($query instanceof Zend_Cloud_DocumentService_Adapter_SimpleDb_Query) { - $query = $query->assemble($collectionName); - } - $result = $this->_simpleDb->select($query); - } catch(Zend_Service_Amazon_Exception $e) { - throw new Zend_Cloud_DocumentService_Exception('Error on document query: '.$e->getMessage(), $e->getCode(), $e); - } - - return $this->_getDocumentSetFromResultSet($result, $returnDocs); - } - - /** - * Create query statement - * - * @param string $fields - * @return Zend_Cloud_DocumentService_Adapter_SimpleDb_Query - */ - public function select($fields = null) - { - $queryClass = $this->getQueryClass(); - if (!class_exists($queryClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($queryClass); - } - - $query = new $queryClass($this); - $defaultClass = self::DEFAULT_QUERY_CLASS; - if (!$query instanceof $defaultClass) { - throw new Zend_Cloud_DocumentService_Exception('Query class must extend ' . self::DEFAULT_QUERY_CLASS); - } - - $query->select($fields); - return $query; - } - - /** - * Get the concrete service client - * - * @return Zend_Service_Amazon_SimpleDb - */ - public function getClient() - { - return $this->_simpleDb; - } - - /** - * Convert array of key-value pairs to array of Amazon attributes - * - * @param string $name - * @param array $attributes - * @return array - */ - protected function _makeAttributes($name, $attributes) - { - $result = array(); - foreach ($attributes as $key => $attr) { - $result[] = new Zend_Service_Amazon_SimpleDb_Attribute($name, $key, $attr); - } - return $result; - } - - /** - * Convert array of Amazon attributes to array of key-value pairs - * - * @param array $attributes - * @return array - */ - protected function _resolveAttributes($attributes, $returnDocument = false) - { - $result = array(); - foreach ($attributes as $attr) { - $value = $attr->getValues(); - if (count($value) == 0) { - $value = null; - } elseif (count($value) == 1) { - $value = $value[0]; - } - $result[$attr->getName()] = $value; - } - - // Return as document object? - if ($returnDocument) { - $documentClass = $this->getDocumentClass(); - return new $documentClass($result, $attr->getItemName()); - } - - return $result; - } - - /** - * Create suitable document from array of fields - * - * @param array $document - * @return Zend_Cloud_DocumentService_Document - */ - protected function _getDocumentFromArray($document) - { - if (!isset($document[Zend_Cloud_DocumentService_Document::KEY_FIELD])) { - if (isset($document[self::ITEM_NAME])) { - $key = $document[self::ITEM_NAME]; - unset($document[self::ITEM_NAME]); - } else { - throw new Zend_Cloud_DocumentService_Exception('Fields array should contain the key field '.Zend_Cloud_DocumentService_Document::KEY_FIELD); - } - } else { - $key = $document[Zend_Cloud_DocumentService_Document::KEY_FIELD]; - unset($document[Zend_Cloud_DocumentService_Document::KEY_FIELD]); - } - - $documentClass = $this->getDocumentClass(); - return new $documentClass($document, $key); - } - - /** - * Create a DocumentSet from a SimpleDb resultset - * - * @param Zend_Service_Amazon_SimpleDb_Page $resultSet - * @param bool $returnDocs - * @return Zend_Cloud_DocumentService_DocumentSet - */ - protected function _getDocumentSetFromResultSet(Zend_Service_Amazon_SimpleDb_Page $resultSet, $returnDocs = true) - { - $docs = array(); - foreach ($resultSet->getData() as $item) { - $docs[] = $this->_resolveAttributes($item, $returnDocs); - } - - $setClass = $this->getDocumentSetClass(); - return new $setClass($docs); - } -} +toArray(); + } + + if (!is_array($options)) { + throw new Zend_Cloud_DocumentService_Exception('Invalid options provided to constructor'); + } + + $this->_simpleDb = new Zend_Service_Amazon_SimpleDb( + $options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY] + ); + + if (isset($options[self::HTTP_ADAPTER])) { + $this->_simpleDb->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); + } + + if (isset($options[self::DOCUMENT_CLASS])) { + $this->setDocumentClass($options[self::DOCUMENT_CLASS]); + } + + if (isset($options[self::DOCUMENTSET_CLASS])) { + $this->setDocumentSetClass($options[self::DOCUMENTSET_CLASS]); + } + + if (isset($options[self::QUERY_CLASS])) { + $this->setQueryClass($options[self::QUERY_CLASS]); + } + } + + /** + * Create collection. + * + * @param string $name + * @param array $options + * @return void + */ + public function createCollection($name, $options = null) + { + try { + $this->_simpleDb->createDomain($name); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on domain creation: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Delete collection. + * + * @param string $name + * @param array $options + * @return void + */ + public function deleteCollection($name, $options = null) + { + try { + $this->_simpleDb->deleteDomain($name); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on collection deletion: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * List collections. + * + * @param array $options + * @return array + */ + public function listCollections($options = null) + { + try { + // TODO package this in Pages + $domains = $this->_simpleDb->listDomains()->getData(); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on collection deletion: '.$e->getMessage(), $e->getCode(), $e); + } + + return $domains; + } + + /** + * List documents + * + * Returns a key/value array of document names to document objects. + * + * @param string $collectionName Name of collection for which to list documents + * @param array|null $options + * @return Zend_Cloud_DocumentService_DocumentSet + */ + public function listDocuments($collectionName, array $options = null) + { + $query = $this->select('*')->from($collectionName); + $items = $this->query($collectionName, $query, $options); + return $items; + } + + /** + * Insert document + * + * @param string $collectionName Collection into which to insert document + * @param array|Zend_Cloud_DocumentService_Document $document + * @param array $options + * @return void + */ + public function insertDocument($collectionName, $document, $options = null) + { + if (is_array($document)) { + $document = $this->_getDocumentFromArray($document); + } + + if (!$document instanceof Zend_Cloud_DocumentService_Document) { + throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); + } + + try { + $this->_simpleDb->putAttributes( + $collectionName, + $document->getID(), + $this->_makeAttributes($document->getID(), $document->getFields()) + ); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on document insertion: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Replace an existing document with a new version + * + * @param string $collectionName + * @param array|Zend_Cloud_DocumentService_Document $document + * @param array $options + * @return void + */ + public function replaceDocument($collectionName, $document, $options = null) + { + if (is_array($document)) { + $document = $this->_getDocumentFromArray($document); + } + + if (!$document instanceof Zend_Cloud_DocumentService_Document) { + throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); + } + + // Delete document first, then insert. PutAttributes always keeps any + // fields not referenced in the payload, but present in the document + $documentId = $document->getId(); + $fields = $document->getFields(); + $docClass = get_class($document); + $this->deleteDocument($collectionName, $document, $options); + + $document = new $docClass($fields, $documentId); + $this->insertDocument($collectionName, $document); + } + + /** + * Update document. The new document replaces the existing document. + * + * Option 'merge' specifies to add all attributes (if true) or + * specific attributes ("attr" => true) instead of replacing them. + * By default, attributes are replaced. + * + * @param string $collectionName + * @param mixed|Zend_Cloud_DocumentService_Document $documentId Document ID, adapter-dependent + * @param array|Zend_Cloud_DocumentService_Document $fieldset Set of fields to update + * @param array $options + * @return boolean + */ + public function updateDocument($collectionName, $documentId, $fieldset = null, $options = null) + { + if (null === $fieldset && $documentId instanceof Zend_Cloud_DocumentService_Document) { + $fieldset = $documentId->getFields(); + if (empty($documentId)) { + $documentId = $documentId->getId(); + } + } elseif ($fieldset instanceof Zend_Cloud_DocumentService_Document) { + if (empty($documentId)) { + $documentId = $fieldset->getId(); + } + $fieldset = $fieldset->getFields(); + } + + $replace = array(); + if (empty($options[self::MERGE_OPTION])) { + // no merge option - we replace all + foreach ($fieldset as $key => $value) { + $replace[$key] = true; + } + } elseif (is_array($options[self::MERGE_OPTION])) { + foreach ($fieldset as $key => $value) { + if (empty($options[self::MERGE_OPTION][$key])) { + // if there's merge key, we add it, otherwise we replace it + $replace[$key] = true; + } + } + } // otherwise $replace is empty - all is merged + + try { + $this->_simpleDb->putAttributes( + $collectionName, + $documentId, + $this->_makeAttributes($documentId, $fieldset), + $replace + ); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on document update: '.$e->getMessage(), $e->getCode(), $e); + } + return true; + } + + /** + * Delete document. + * + * @param string $collectionName Collection from which to delete document + * @param mixed $document Document ID or Document object. + * @param array $options + * @return boolean + */ + public function deleteDocument($collectionName, $document, $options = null) + { + if ($document instanceof Zend_Cloud_DocumentService_Document) { + $document = $document->getId(); + } + try { + $this->_simpleDb->deleteAttributes($collectionName, $document); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on document deletion: '.$e->getMessage(), $e->getCode(), $e); + } + return true; + } + + /** + * Fetch single document by ID + * + * @param string $collectionName Collection name + * @param mixed $documentId Document ID, adapter-dependent + * @param array $options + * @return Zend_Cloud_DocumentService_Document + */ + public function fetchDocument($collectionName, $documentId, $options = null) + { + try { + $attributes = $this->_simpleDb->getAttributes($collectionName, $documentId); + if ($attributes == false || count($attributes) == 0) { + return false; + } + return $this->_resolveAttributes($attributes, true); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on fetching document: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Query for documents stored in the document service. If a string is passed in + * $query, the query string will be passed directly to the service. + * + * @param string $collectionName Collection name + * @param string $query + * @param array $options + * @return array Zend_Cloud_DocumentService_DocumentSet + */ + public function query($collectionName, $query, $options = null) + { + $returnDocs = isset($options[self::RETURN_DOCUMENTS]) + ? (bool) $options[self::RETURN_DOCUMENTS] + : true; + + try { + if ($query instanceof Zend_Cloud_DocumentService_Adapter_SimpleDb_Query) { + $query = $query->assemble($collectionName); + } + $result = $this->_simpleDb->select($query); + } catch(Zend_Service_Amazon_Exception $e) { + throw new Zend_Cloud_DocumentService_Exception('Error on document query: '.$e->getMessage(), $e->getCode(), $e); + } + + return $this->_getDocumentSetFromResultSet($result, $returnDocs); + } + + /** + * Create query statement + * + * @param string $fields + * @return Zend_Cloud_DocumentService_Adapter_SimpleDb_Query + */ + public function select($fields = null) + { + $queryClass = $this->getQueryClass(); + if (!class_exists($queryClass)) { + require_once 'Zend/Loader.php'; + Zend_Loader::loadClass($queryClass); + } + + $query = new $queryClass($this); + $defaultClass = self::DEFAULT_QUERY_CLASS; + if (!$query instanceof $defaultClass) { + throw new Zend_Cloud_DocumentService_Exception('Query class must extend ' . self::DEFAULT_QUERY_CLASS); + } + + $query->select($fields); + return $query; + } + + /** + * Get the concrete service client + * + * @return Zend_Service_Amazon_SimpleDb + */ + public function getClient() + { + return $this->_simpleDb; + } + + /** + * Convert array of key-value pairs to array of Amazon attributes + * + * @param string $name + * @param array $attributes + * @return array + */ + protected function _makeAttributes($name, $attributes) + { + $result = array(); + foreach ($attributes as $key => $attr) { + $result[] = new Zend_Service_Amazon_SimpleDb_Attribute($name, $key, $attr); + } + return $result; + } + + /** + * Convert array of Amazon attributes to array of key-value pairs + * + * @param array $attributes + * @return array + */ + protected function _resolveAttributes($attributes, $returnDocument = false) + { + $result = array(); + foreach ($attributes as $attr) { + $value = $attr->getValues(); + if (count($value) == 0) { + $value = null; + } elseif (count($value) == 1) { + $value = $value[0]; + } + $result[$attr->getName()] = $value; + } + + // Return as document object? + if ($returnDocument) { + $documentClass = $this->getDocumentClass(); + return new $documentClass($result, $attr->getItemName()); + } + + return $result; + } + + /** + * Create suitable document from array of fields + * + * @param array $document + * @return Zend_Cloud_DocumentService_Document + */ + protected function _getDocumentFromArray($document) + { + if (!isset($document[Zend_Cloud_DocumentService_Document::KEY_FIELD])) { + if (isset($document[self::ITEM_NAME])) { + $key = $document[self::ITEM_NAME]; + unset($document[self::ITEM_NAME]); + } else { + throw new Zend_Cloud_DocumentService_Exception('Fields array should contain the key field '.Zend_Cloud_DocumentService_Document::KEY_FIELD); + } + } else { + $key = $document[Zend_Cloud_DocumentService_Document::KEY_FIELD]; + unset($document[Zend_Cloud_DocumentService_Document::KEY_FIELD]); + } + + $documentClass = $this->getDocumentClass(); + return new $documentClass($document, $key); + } + + /** + * Create a DocumentSet from a SimpleDb resultset + * + * @param Zend_Service_Amazon_SimpleDb_Page $resultSet + * @param bool $returnDocs + * @return Zend_Cloud_DocumentService_DocumentSet + */ + protected function _getDocumentSetFromResultSet(Zend_Service_Amazon_SimpleDb_Page $resultSet, $returnDocs = true) + { + $docs = array(); + foreach ($resultSet->getData() as $item) { + $docs[] = $this->_resolveAttributes($item, $returnDocs); + } + + $setClass = $this->getDocumentSetClass(); + return new $setClass($docs); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php --- a/web/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,13 +23,13 @@ require_once 'Zend/Cloud/DocumentService/Query.php'; /** - * Class implementing Query adapter for working with SimpleDb queries in a + * Class implementing Query adapter for working with SimpleDb queries in a * structured way * * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_Adapter_SimpleDb_Query @@ -42,8 +42,8 @@ /** * Constructor - * - * @param Zend_Cloud_DocumentService_Adapter_SimpleDb $adapter + * + * @param Zend_Cloud_DocumentService_Adapter_SimpleDb $adapter * @param null|string $collectionName * @return void */ @@ -57,7 +57,7 @@ /** * Get adapter - * + * * @return Zend_Cloud_DocumentService_Adapter_SimpleDb */ public function getAdapter() @@ -67,7 +67,7 @@ /** * Assemble the query into a format the adapter can utilize - * + * * @var string $collectionName Name of collection from which to select * @return string */ @@ -150,10 +150,10 @@ /** * Parse a where statement into service-specific language - * + * * @todo Ensure this fulfills the entire SimpleDB query specification for WHERE - * @param string $where - * @param array $args + * @param string $where + * @param array $args * @return string */ protected function _parseWhere($where, $args) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php --- a/web/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,10 +29,10 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_DocumentService_Adapter_WindowsAzure +class Zend_Cloud_DocumentService_Adapter_WindowsAzure extends Zend_Cloud_DocumentService_Adapter_AbstractAdapter { /* @@ -50,20 +50,20 @@ const ROW_KEY = 'RowKey'; const VERIFY_ETAG = "verify_etag"; const TIMESTAMP_KEY = "Timestamp"; - + const DEFAULT_HOST = Zend_Service_WindowsAzure_Storage::URL_CLOUD_TABLE; const DEFAULT_QUERY_CLASS = 'Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query'; /** * Azure service instance. - * + * * @var Zend_Service_WindowsAzure_Storage_Table */ protected $_storageClient; /** * Class to utilize for new query objects - * + * * @var string */ protected $_queryClass = 'Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query'; @@ -76,11 +76,11 @@ /** * Constructor - * - * @param array $options + * + * @param array $options * @return void */ - public function __construct($options = array()) + public function __construct($options = array()) { if ($options instanceof Zend_Config) { $options = $options->toArray(); @@ -142,8 +142,8 @@ /** * Set the default partition key - * - * @param string $key + * + * @param string $key * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure */ public function setDefaultPartitionKey($key) @@ -155,7 +155,7 @@ /** * Retrieve default partition key - * + * * @return null|string */ public function getDefaultPartitionKey() @@ -170,7 +170,7 @@ * @param array $options * @return boolean */ - public function createCollection($name, $options = null) + public function createCollection($name, $options = null) { if (!preg_match('/^[A-Za-z][A-Za-z0-9]{2,}$/', $name)) { throw new Zend_Cloud_DocumentService_Exception('Invalid collection name; Windows Azure collection names must consist of alphanumeric characters only, and be at least 3 characters long'); @@ -192,7 +192,7 @@ * @param array $options * @return boolean */ - public function deleteCollection($name, $options = null) + public function deleteCollection($name, $options = null) { try { $this->_storageClient->deleteTable($name); @@ -210,7 +210,7 @@ * @param array $options * @return array */ - public function listCollections($options = null) + public function listCollections($options = null) { try { $tables = $this->_storageClient->listTables(); @@ -228,7 +228,7 @@ /** * Create suitable document from array of fields - * + * * @param array $document * @param null|string $collectionName Collection to which this document belongs * @return Zend_Cloud_DocumentService_Document @@ -257,12 +257,12 @@ $documentClass = $this->getDocumentClass(); return new $documentClass($document, $key); } - + /** * List all documents in a collection - * - * @param string $collectionName - * @param null|array $options + * + * @param string $collectionName + * @param null|array $options * @return Zend_Cloud_DocumentService_DocumentSet */ public function listDocuments($collectionName, array $options = null) @@ -282,19 +282,19 @@ { if (is_array($document)) { $document = $this->_getDocumentFromArray($document, $collectionName); - } - + } + if (!$document instanceof Zend_Cloud_DocumentService_Document) { throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); } - + $key = $this->_validateDocumentId($document->getId(), $collectionName); $document->setId($key); - + $this->_validateCompositeKey($key); $this->_validateFields($document); try { - + $entity = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($key[0], $key[1]); $entity->setAzureValues($document->getFields(), true); $this->_storageClient->insertEntity($collectionName, $entity); @@ -304,8 +304,8 @@ } /** - * Replace document. - * + * Replace document. + * * The new document replaces the existing document. * * @param Zend_Cloud_DocumentService_Document $document @@ -316,12 +316,12 @@ { if (is_array($document)) { $document = $this->_getDocumentFromArray($document, $collectionName); - } - + } + if (!$document instanceof Zend_Cloud_DocumentService_Document) { throw new Zend_Cloud_DocumentService_Exception('Invalid document supplied'); } - + $key = $this->_validateDocumentId($document->getId(), $collectionName); $this->_validateFields($document); try { @@ -330,7 +330,7 @@ if (isset($options[self::VERIFY_ETAG])) { $entity->setEtag($options[self::VERIFY_ETAG]); } - + $this->_storageClient->updateEntity($collectionName, $entity, isset($options[self::VERIFY_ETAG])); } catch(Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_DocumentService_Exception('Error on document replace: '.$e->getMessage(), $e->getCode(), $e); @@ -338,8 +338,8 @@ } /** - * Update document. - * + * Update document. + * * The new document is merged the existing document. * * @param string $collectionName @@ -375,13 +375,13 @@ if (isset($options[self::VERIFY_ETAG])) { $entity->setEtag($options[self::VERIFY_ETAG]); } - + $this->_storageClient->mergeEntity($collectionName, $entity, isset($options[self::VERIFY_ETAG])); } catch(Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_DocumentService_Exception('Error on document update: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Delete document. * @@ -412,7 +412,7 @@ /** * Fetch single document by ID - * + * * @param string $collectionName Collection name * @param mixed $documentId Document ID, adapter-dependent * @param array $options @@ -432,7 +432,7 @@ throw new Zend_Cloud_DocumentService_Exception('Error on document fetch: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Query for documents stored in the document service. If a string is passed in * $query, the query string will be passed directly to the service. @@ -466,7 +466,7 @@ $setClass = $this->getDocumentSetClass(); return new $setClass($resultSet); } - + /** * Create query statement * @@ -487,9 +487,9 @@ } $query->select($fields); - return $query; + return $query; } - + /** * Get the concrete service client * @@ -499,11 +499,11 @@ { return $this->_storageClient; } - + /** * Resolve table values to attributes - * - * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity + * + * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity * @return array */ protected function _resolveAttributes(Zend_Service_WindowsAzure_Storage_TableEntity $entity) @@ -514,12 +514,12 @@ } return $result; } - + /** * Validate a partition or row key - * - * @param string $key + * + * @param string $key * @return void * @throws Zend_Cloud_DocumentService_Exception */ @@ -532,8 +532,8 @@ /** * Validate a composite key - * - * @param array $key + * + * @param array $key * @return throws Zend_Cloud_DocumentService_Exception */ protected function _validateCompositeKey(array $key) @@ -549,15 +549,15 @@ /** * Validate a document identifier * - * If the identifier is an array containing a valid partition and row key, + * If the identifier is an array containing a valid partition and row key, * returns it. If the identifier is a string: - * - if a default partition key is present, it creates an identifier using + * - if a default partition key is present, it creates an identifier using * that and the provided document ID * - if a collection name is provided, it will use that for the partition key * - otherwise, it's invalid - * - * @param array|string $documentId - * @param null|string $collectionName + * + * @param array|string $documentId + * @param null|string $collectionName * @return array * @throws Zend_Cloud_DocumentService_Exception */ @@ -585,7 +585,7 @@ /** * Validate a document's fields for well-formedness * - * Since Azure uses Atom, and fieldnames are included as part of XML + * Since Azure uses Atom, and fieldnames are included as part of XML * element tag names, the field names must be valid XML names. * * @param Zend_Cloud_DocumentService_Document|array $document @@ -608,10 +608,10 @@ /** * Validate an individual field name for well-formedness * - * Since Azure uses Atom, and fieldnames are included as part of XML + * Since Azure uses Atom, and fieldnames are included as part of XML * element tag names, the field names must be valid XML names. * - * While we could potentially normalize names, this could also lead to + * While we could potentially normalize names, this could also lead to * conflict with other field names -- which we should avoid. As such, * invalid field names will raise an exception. * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php --- a/web/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,171 +1,171 @@ -_azureSelect = $select; - } - - /** - * SELECT clause (fields to be selected) - * - * Does nothing for Azure. - * - * @param string $select - * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query - */ - public function select($select) - { - return $this; - } - - /** - * FROM clause (table name) - * - * @param string $from - * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query - */ - public function from($from) - { - $this->_azureSelect->from($from); - return $this; - } - - /** - * WHERE clause (conditions to be used) - * - * @param string $where - * @param mixed $value Value or array of values to be inserted instead of ? - * @param string $op Operation to use to join where clauses (AND/OR) - * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query - */ - public function where($where, $value = null, $op = 'and') - { - if (!empty($value) && !is_array($value)) { - // fix buglet in Azure - numeric values are quoted unless passed as an array - $value = array($value); - } - $this->_azureSelect->where($where, $value, $op); - return $this; - } - - /** - * WHERE clause for item ID - * - * This one should be used when fetching specific rows since some adapters - * have special syntax for primary keys - * - * @param array $value Row ID for the document (PartitionKey, RowKey) - * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query - */ - public function whereId($value) - { - if (!is_array($value)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; - throw new Zend_Cloud_DocumentService_Exception('Invalid document key'); - } - $this->_azureSelect->wherePartitionKey($value[0])->whereRowKey($value[1]); - return $this; - } - - /** - * LIMIT clause (how many rows to return) - * - * @param int $limit - * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query - */ - public function limit($limit) - { - $this->_azureSelect->top($limit); - return $this; - } - - /** - * ORDER BY clause (sorting) - * - * @todo Azure service doesn't seem to support this yet; emulate? - * @param string $sort Column to sort by - * @param string $direction Direction - asc/desc - * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query - * @throws Zend_Cloud_OperationNotAvailableException - */ - public function order($sort, $direction = 'asc') - { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('No support for sorting for Azure yet'); - } - - /** - * Get Azure select query - * - * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery - */ - public function getAzureSelect() - { - return $this->_azureSelect; - } - - /** - * Assemble query - * - * Simply return the WindowsAzure table entity query object - * - * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery - */ - public function assemble() - { - return $this->getAzureSelect(); - } -} +_azureSelect = $select; + } + + /** + * SELECT clause (fields to be selected) + * + * Does nothing for Azure. + * + * @param string $select + * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query + */ + public function select($select) + { + return $this; + } + + /** + * FROM clause (table name) + * + * @param string $from + * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query + */ + public function from($from) + { + $this->_azureSelect->from($from); + return $this; + } + + /** + * WHERE clause (conditions to be used) + * + * @param string $where + * @param mixed $value Value or array of values to be inserted instead of ? + * @param string $op Operation to use to join where clauses (AND/OR) + * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query + */ + public function where($where, $value = null, $op = 'and') + { + if (!empty($value) && !is_array($value)) { + // fix buglet in Azure - numeric values are quoted unless passed as an array + $value = array($value); + } + $this->_azureSelect->where($where, $value, $op); + return $this; + } + + /** + * WHERE clause for item ID + * + * This one should be used when fetching specific rows since some adapters + * have special syntax for primary keys + * + * @param array $value Row ID for the document (PartitionKey, RowKey) + * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query + */ + public function whereId($value) + { + if (!is_array($value)) { + require_once 'Zend/Cloud/DocumentService/Exception.php'; + throw new Zend_Cloud_DocumentService_Exception('Invalid document key'); + } + $this->_azureSelect->wherePartitionKey($value[0])->whereRowKey($value[1]); + return $this; + } + + /** + * LIMIT clause (how many rows to return) + * + * @param int $limit + * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query + */ + public function limit($limit) + { + $this->_azureSelect->top($limit); + return $this; + } + + /** + * ORDER BY clause (sorting) + * + * @todo Azure service doesn't seem to support this yet; emulate? + * @param string $sort Column to sort by + * @param string $direction Direction - asc/desc + * @return Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query + * @throws Zend_Cloud_OperationNotAvailableException + */ + public function order($sort, $direction = 'asc') + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('No support for sorting for Azure yet'); + } + + /** + * Get Azure select query + * + * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery + */ + public function getAzureSelect() + { + return $this->_azureSelect; + } + + /** + * Assemble query + * + * Simply return the WindowsAzure table entity query object + * + * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery + */ + public function assemble() + { + return $this->getAzureSelect(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Document.php --- a/web/lib/Zend/Cloud/DocumentService/Document.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Document.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,248 +1,248 @@ -_fields = $fields; - $this->setId($id); - } - - /** - * Set document identifier - * - * @param mixed $id - * @return Zend_Cloud_DocumentService_Document - */ - public function setId($id) - { - $this->_id = $id; - return $this; - } - - /** - * Get ID name. - * - * @return string - */ - public function getId() - { - return $this->_id; - } - - /** - * Get fields as array. - * - * @return array - */ - public function getFields() - { - return $this->_fields; - } - - /** - * Get field by name. - * - * @param string $name - * @return mixed - */ - public function getField($name) - { - if (isset($this->_fields[$name])) { - return $this->_fields[$name]; - } - return null; - } - - /** - * Set field by name. - * - * @param string $name - * @param mixed $value - * @return Zend_Cloud_DocumentService_Document - */ - public function setField($name, $value) - { - $this->_fields[$name] = $value; - return $this; - } - - /** - * Overloading: get value - * - * @param string $name - * @return mixed - */ - public function __get($name) - { - return $this->getField($name); - } - - /** - * Overloading: set field - * - * @param string $name - * @param mixed $value - * @return void - */ - public function __set($name, $value) - { - $this->setField($name, $value); - } - - /** - * ArrayAccess: does field exist? - * - * @param string $name - * @return bool - */ - public function offsetExists($name) - { - return isset($this->_fields[$name]); - } - - /** - * ArrayAccess: get field by name - * - * @param string $name - * @return mixed - */ - public function offsetGet($name) - { - return $this->getField($name); - } - - /** - * ArrayAccess: set field to value - * - * @param string $name - * @param mixed $value - * @return void - */ - public function offsetSet($name, $value) - { - $this->setField($name, $value); - } - - /** - * ArrayAccess: remove field from document - * - * @param string $name - * @return void - */ - public function offsetUnset($name) - { - if ($this->offsetExists($name)) { - unset($this->_fields[$name]); - } - } - - /** - * Overloading: retrieve and set fields by name - * - * @param string $name - * @param mixed $args - * @return mixed - */ - public function __call($name, $args) - { - $prefix = substr($name, 0, 3); - if ($prefix == 'get') { - // Get value - $option = substr($name, 3); - return $this->getField($option); - } elseif ($prefix == 'set') { - // set value - $option = substr($name, 3); - return $this->setField($option, $args[0]); - } - - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException("Unknown operation $name"); - } - - /** - * Countable: return count of fields in document - * - * @return int - */ - public function count() - { - return count($this->_fields); - } - - /** - * IteratorAggregate: return iterator for iterating over fields - * - * @return Iterator - */ - public function getIterator() - { - return new ArrayIterator($this->_fields); - } -} +_fields = $fields; + $this->setId($id); + } + + /** + * Set document identifier + * + * @param mixed $id + * @return Zend_Cloud_DocumentService_Document + */ + public function setId($id) + { + $this->_id = $id; + return $this; + } + + /** + * Get ID name. + * + * @return string + */ + public function getId() + { + return $this->_id; + } + + /** + * Get fields as array. + * + * @return array + */ + public function getFields() + { + return $this->_fields; + } + + /** + * Get field by name. + * + * @param string $name + * @return mixed + */ + public function getField($name) + { + if (isset($this->_fields[$name])) { + return $this->_fields[$name]; + } + return null; + } + + /** + * Set field by name. + * + * @param string $name + * @param mixed $value + * @return Zend_Cloud_DocumentService_Document + */ + public function setField($name, $value) + { + $this->_fields[$name] = $value; + return $this; + } + + /** + * Overloading: get value + * + * @param string $name + * @return mixed + */ + public function __get($name) + { + return $this->getField($name); + } + + /** + * Overloading: set field + * + * @param string $name + * @param mixed $value + * @return void + */ + public function __set($name, $value) + { + $this->setField($name, $value); + } + + /** + * ArrayAccess: does field exist? + * + * @param string $name + * @return bool + */ + public function offsetExists($name) + { + return isset($this->_fields[$name]); + } + + /** + * ArrayAccess: get field by name + * + * @param string $name + * @return mixed + */ + public function offsetGet($name) + { + return $this->getField($name); + } + + /** + * ArrayAccess: set field to value + * + * @param string $name + * @param mixed $value + * @return void + */ + public function offsetSet($name, $value) + { + $this->setField($name, $value); + } + + /** + * ArrayAccess: remove field from document + * + * @param string $name + * @return void + */ + public function offsetUnset($name) + { + if ($this->offsetExists($name)) { + unset($this->_fields[$name]); + } + } + + /** + * Overloading: retrieve and set fields by name + * + * @param string $name + * @param mixed $args + * @return mixed + */ + public function __call($name, $args) + { + $prefix = substr($name, 0, 3); + if ($prefix == 'get') { + // Get value + $option = substr($name, 3); + return $this->getField($option); + } elseif ($prefix == 'set') { + // set value + $option = substr($name, 3); + return $this->setField($option, $args[0]); + } + + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException("Unknown operation $name"); + } + + /** + * Countable: return count of fields in document + * + * @return int + */ + public function count() + { + return count($this->_fields); + } + + /** + * IteratorAggregate: return iterator for iterating over fields + * + * @return Iterator + */ + public function getIterator() + { + return new ArrayIterator($this->_fields); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/DocumentSet.php --- a/web/lib/Zend/Cloud/DocumentService/DocumentSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/DocumentSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_DocumentService_DocumentSet implements Countable, IteratorAggregate @@ -48,7 +48,7 @@ /** * Countable: number of documents in set - * + * * @return int */ public function count() @@ -58,7 +58,7 @@ /** * IteratorAggregate: retrieve iterator - * + * * @return Traversable */ public function getIterator() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/Exception.php --- a/web/lib/Zend/Cloud/DocumentService/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,38 +1,38 @@ -foo('bar') - * but concrete adapters should be able to recognise it - * - * The call will be iterpreted as clause 'foo' with argument 'bar' - * - * @param string $name Clause/method name - * @param mixed $args - * @return Zend_Cloud_DocumentService_Query - */ - public function __call($name, $args) - { - $this->_clauses[] = array(strtolower($name), $args); - return $this; - } - - /** - * SELECT clause (fields to be selected) - * - * @param null|string|array $select - * @return Zend_Cloud_DocumentService_Query - */ - public function select($select) - { - if (empty($select)) { - return $this; - } - if (!is_string($select) && !is_array($select)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; - throw new Zend_Cloud_DocumentService_Exception("SELECT argument must be a string or an array of strings"); - } - $this->_clauses[] = array(self::QUERY_SELECT, $select); - return $this; - } - - /** - * FROM clause - * - * @param string $name Field names - * @return Zend_Cloud_DocumentService_Query - */ - public function from($name) - { - if(!is_string($name)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; - throw new Zend_Cloud_DocumentService_Exception("FROM argument must be a string"); - } - $this->_clauses[] = array(self::QUERY_FROM, $name); - return $this; - } - - /** - * WHERE query - * - * @param string $cond Condition - * @param array $args Arguments to substitute instead of ?'s in condition - * @param string $op relation to other clauses - and/or - * @return Zend_Cloud_DocumentService_Query - */ - public function where($cond, $value = null, $op = 'and') - { - if (!is_string($cond)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; - throw new Zend_Cloud_DocumentService_Exception("WHERE argument must be a string"); - } - $this->_clauses[] = array(self::QUERY_WHERE, array($cond, $value, $op)); - return $this; - } - - /** - * Select record or fields by ID - * - * @param string|int $value Identifier to select by - * @return Zend_Cloud_DocumentService_Query - */ - public function whereId($value) - { - if (!is_scalar($value)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; - throw new Zend_Cloud_DocumentService_Exception("WHEREID argument must be a scalar"); - } - $this->_clauses[] = array(self::QUERY_WHEREID, $value); - return $this; - } - - /** - * LIMIT clause (how many items to return) - * - * @param int $limit - * @return Zend_Cloud_DocumentService_Query - */ - public function limit($limit) - { - if ($limit != (int) $limit) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; - throw new Zend_Cloud_DocumentService_Exception("LIMIT argument must be an integer"); - } - $this->_clauses[] = array(self::QUERY_LIMIT, $limit); - return $this; - } - - /** - * ORDER clause; field or fields to sort by, and direction to sort - * - * @param string|int|array $sort - * @param string $direction - * @return Zend_Cloud_DocumentService_Query - */ - public function order($sort, $direction = 'asc') - { - $this->_clauses[] = array(self::QUERY_ORDER, array($sort, $direction)); - return $this; - } - - /** - * "Assemble" the query - * - * Simply returns the clauses present. - * - * @return array - */ - public function assemble() - { - return $this->getClauses(); - } - - /** - * Return query clauses as an array - * - * @return array Clauses in the query - */ - public function getClauses() - { - return $this->_clauses; - } -} +foo('bar') + * but concrete adapters should be able to recognise it + * + * The call will be iterpreted as clause 'foo' with argument 'bar' + * + * @param string $name Clause/method name + * @param mixed $args + * @return Zend_Cloud_DocumentService_Query + */ + public function __call($name, $args) + { + $this->_clauses[] = array(strtolower($name), $args); + return $this; + } + + /** + * SELECT clause (fields to be selected) + * + * @param null|string|array $select + * @return Zend_Cloud_DocumentService_Query + */ + public function select($select) + { + if (empty($select)) { + return $this; + } + if (!is_string($select) && !is_array($select)) { + require_once 'Zend/Cloud/DocumentService/Exception.php'; + throw new Zend_Cloud_DocumentService_Exception("SELECT argument must be a string or an array of strings"); + } + $this->_clauses[] = array(self::QUERY_SELECT, $select); + return $this; + } + + /** + * FROM clause + * + * @param string $name Field names + * @return Zend_Cloud_DocumentService_Query + */ + public function from($name) + { + if(!is_string($name)) { + require_once 'Zend/Cloud/DocumentService/Exception.php'; + throw new Zend_Cloud_DocumentService_Exception("FROM argument must be a string"); + } + $this->_clauses[] = array(self::QUERY_FROM, $name); + return $this; + } + + /** + * WHERE query + * + * @param string $cond Condition + * @param array $args Arguments to substitute instead of ?'s in condition + * @param string $op relation to other clauses - and/or + * @return Zend_Cloud_DocumentService_Query + */ + public function where($cond, $value = null, $op = 'and') + { + if (!is_string($cond)) { + require_once 'Zend/Cloud/DocumentService/Exception.php'; + throw new Zend_Cloud_DocumentService_Exception("WHERE argument must be a string"); + } + $this->_clauses[] = array(self::QUERY_WHERE, array($cond, $value, $op)); + return $this; + } + + /** + * Select record or fields by ID + * + * @param string|int $value Identifier to select by + * @return Zend_Cloud_DocumentService_Query + */ + public function whereId($value) + { + if (!is_scalar($value)) { + require_once 'Zend/Cloud/DocumentService/Exception.php'; + throw new Zend_Cloud_DocumentService_Exception("WHEREID argument must be a scalar"); + } + $this->_clauses[] = array(self::QUERY_WHEREID, $value); + return $this; + } + + /** + * LIMIT clause (how many items to return) + * + * @param int $limit + * @return Zend_Cloud_DocumentService_Query + */ + public function limit($limit) + { + if ($limit != (int) $limit) { + require_once 'Zend/Cloud/DocumentService/Exception.php'; + throw new Zend_Cloud_DocumentService_Exception("LIMIT argument must be an integer"); + } + $this->_clauses[] = array(self::QUERY_LIMIT, $limit); + return $this; + } + + /** + * ORDER clause; field or fields to sort by, and direction to sort + * + * @param string|int|array $sort + * @param string $direction + * @return Zend_Cloud_DocumentService_Query + */ + public function order($sort, $direction = 'asc') + { + $this->_clauses[] = array(self::QUERY_ORDER, array($sort, $direction)); + return $this; + } + + /** + * "Assemble" the query + * + * Simply returns the clauses present. + * + * @return array + */ + public function assemble() + { + return $this->getClauses(); + } + + /** + * Return query clauses as an array + * + * @return array Clauses in the query + */ + public function getClauses() + { + return $this->_clauses; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/DocumentService/QueryAdapter.php --- a/web/lib/Zend/Cloud/DocumentService/QueryAdapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/DocumentService/QueryAdapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,102 +1,102 @@ -_clientException = $clientException; - parent::__construct($message, $code, $clientException); - } - - public function getClientException() { - return $this->_getPrevious(); - } -} - +_clientException = $clientException; + parent::__construct($message, $code, $clientException); + } + + public function getClientException() { + return $this->_getPrevious(); + } +} + diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/Infrastructure/Adapter.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/Infrastructure/Adapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,167 @@ +adapterResult; + } + + /** + * Wait for status $status with a timeout of $timeout seconds + * + * @param string $id + * @param string $status + * @param integer $timeout + * @return boolean + */ + public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS_CHANGE) + { + if (empty($id) || empty($status)) { + return false; + } + + $num = 0; + while (($num<$timeout) && ($this->statusInstance($id) != $status)) { + sleep(self::TIME_STEP_STATUS_CHANGE); + $num += self::TIME_STEP_STATUS_CHANGE; + } + return ($num < $timeout); + } + + /** + * Run arbitrary shell script on an instance + * + * @param string $id + * @param array $param + * @param string|array $cmd + * @return string|array + */ + public function deployInstance($id, $params, $cmd) + { + if (!function_exists("ssh2_connect")) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Deployment requires the PHP "SSH" extension (ext/ssh2)'); + } + + if (empty($id)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You must specify the instance where to deploy'); + } + + if (empty($cmd)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You must specify the shell commands to run on the instance'); + } + + if (empty($params) + || empty($params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME]) + || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD]) + && empty($params[Zend_Cloud_Infrastructure_Instance::SSH_KEY])) + ) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You must specify the params for the SSH connection'); + } + + $host = $this->publicDnsInstance($id); + if (empty($host)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception(sprintf( + 'The instance identified by "%s" does not exist', + $id + )); + } + + $conn = ssh2_connect($host); + if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME], + $params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('SSH authentication failed'); + } + + if (is_array($cmd)) { + $result = array(); + foreach ($cmd as $command) { + $stream = ssh2_exec($conn, $command); + $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR); + + stream_set_blocking($errorStream, true); + stream_set_blocking($stream, true); + + $output = stream_get_contents($stream); + $error = stream_get_contents($errorStream); + + if (empty($error)) { + $result[$command] = $output; + } else { + $result[$command] = $error; + } + } + } else { + $stream = ssh2_exec($conn, $cmd); + $result = stream_set_blocking($stream, true); + $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR); + + stream_set_blocking($errorStream, true); + stream_set_blocking($stream, true); + + $output = stream_get_contents($stream); + $error = stream_get_contents($errorStream); + + if (empty($error)) { + $result = $output; + } else { + $result = $error; + } + } + return $result; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,496 @@ + Zend_Cloud_Infrastructure_Instance::STATUS_RUNNING, + 'terminated' => Zend_Cloud_Infrastructure_Instance::STATUS_TERMINATED, + 'pending' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'shutting-down' => Zend_Cloud_Infrastructure_Instance::STATUS_SHUTTING_DOWN, + 'stopping' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'stopped' => Zend_Cloud_Infrastructure_Instance::STATUS_STOPPED, + 'rebooting' => Zend_Cloud_Infrastructure_Instance::STATUS_REBOOTING, + ); + + /** + * Map monitor metrics between Infrastructure and EC2 + * + * @var array + */ + protected $mapMetrics= array ( + Zend_Cloud_Infrastructure_Instance::MONITOR_CPU => 'CPUUtilization', + Zend_Cloud_Infrastructure_Instance::MONITOR_DISK_READ => 'DiskReadBytes', + Zend_Cloud_Infrastructure_Instance::MONITOR_DISK_WRITE => 'DiskWriteBytes', + Zend_Cloud_Infrastructure_Instance::MONITOR_NETWORK_IN => 'NetworkIn', + Zend_Cloud_Infrastructure_Instance::MONITOR_NETWORK_OUT => 'NetworkOut', + ); + + /** + * Constructor + * + * @param array|Zend_Config $options + * @return void + */ + public function __construct($options = array()) + { + if (is_object($options)) { + if (method_exists($options, 'toArray')) { + $options= $options->toArray(); + } elseif ($options instanceof Traversable) { + $options = iterator_to_array($options); + } + } + + if (empty($options) || !is_array($options)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); + } + + if (!isset($options[self::AWS_ACCESS_KEY]) + || !isset($options[self::AWS_SECRET_KEY]) + ) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('AWS keys not specified!'); + } + + $this->accessKey = $options[self::AWS_ACCESS_KEY]; + $this->accessSecret = $options[self::AWS_SECRET_KEY]; + $this->region = ''; + + if (isset($options[self::AWS_REGION])) { + $this->region= $options[self::AWS_REGION]; + } + + try { + $this->ec2 = new Zend_Service_Amazon_Ec2_Instance($options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY], $this->region); + } catch (Exception $e) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); + } + + if (isset($options[self::HTTP_ADAPTER])) { + $this->ec2->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); + } + } + + /** + * Convert the attributes of EC2 into attributes of Infrastructure + * + * @param array $attr + * @return array|boolean + */ + private function convertAttributes($attr) + { + $result = array(); + if (!empty($attr) && is_array($attr)) { + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ID] = $attr['instanceId']; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STATUS] = $this->mapStatus[$attr['instanceState']['name']]; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_IMAGEID] = $attr['imageId']; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE] = $attr['availabilityZone']; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_LAUNCHTIME] = $attr['launchTime']; + + switch ($attr['instanceType']) { + case Zend_Service_Amazon_Ec2_Instance::MICRO: + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '1 virtual core'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '613MB'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '0GB'; + break; + case Zend_Service_Amazon_Ec2_Instance::SMALL: + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '1 virtual core'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '1.7GB'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '160GB'; + break; + case Zend_Service_Amazon_Ec2_Instance::LARGE: + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '2 virtual core'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '7.5GB'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '850GB'; + break; + case Zend_Service_Amazon_Ec2_Instance::XLARGE: + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '4 virtual core'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '15GB'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '1690GB'; + break; + case Zend_Service_Amazon_Ec2_Instance::HCPU_MEDIUM: + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '2 virtual core'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '1.7GB'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '350GB'; + break; + case Zend_Service_Amazon_Ec2_Instance::HCPU_XLARGE: + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_CPU] = '8 virtual core'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = '7GB'; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = '1690GB'; + break; + } + } + return $result; + } + + /** + * Return a list of the available instancies + * + * @return Zend_Cloud_Infrastructure_InstanceList + */ + public function listInstances() + { + $this->adapterResult = $this->ec2->describe(); + + $result = array(); + foreach ($this->adapterResult['instances'] as $instance) { + $result[]= $this->convertAttributes($instance); + } + return new Zend_Cloud_Infrastructure_InstanceList($this, $result); + } + + /** + * Return the status of an instance + * + * @param string + * @return string|boolean + */ + public function statusInstance($id) + { + $this->adapterResult = $this->ec2->describe($id); + if (empty($this->adapterResult['instances'])) { + return false; + } + $result = $this->adapterResult['instances'][0]; + return $this->mapStatus[$result['instanceState']['name']]; + } + + /** + * Return the public DNS name of the instance + * + * @param string $id + * @return string|boolean + */ + public function publicDnsInstance($id) + { + $this->adapterResult = $this->ec2->describe($id); + if (empty($this->adapterResult['instances'])) { + return false; + } + $result = $this->adapterResult['instances'][0]; + return $result['dnsName']; + } + + /** + * Reboot an instance + * + * @param string $id + * @return boolean + */ + public function rebootInstance($id) + { + $this->adapterResult= $this->ec2->reboot($id); + return $this->adapterResult; + } + + /** + * Create a new instance + * + * @param string $name + * @param array $options + * @return Instance|boolean + */ + public function createInstance($name, $options) + { + // @todo instance's name management? + $this->adapterResult = $this->ec2->run($options); + if (empty($this->adapterResult['instances'])) { + return false; + } + $this->error= false; + return new Zend_Cloud_Infrastructure_Instance($this, $this->convertAttributes($this->adapterResult['instances'][0])); + } + + /** + * Stop an instance + * + * @param string $id + * @return boolean + */ + public function stopInstance($id) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); + } + + /** + * Start an instance + * + * @param string $id + * @return boolean + */ + public function startInstance($id) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); + } + + /** + * Destroy an instance + * + * @param string $id + * @return boolean + */ + public function destroyInstance($id) + { + $this->adapterResult = $this->ec2->terminate($id); + return (!empty($this->adapterResult)); + } + + /** + * Return a list of all the available instance images + * + * @return ImageList + */ + public function imagesInstance() + { + if (!isset($this->ec2Image)) { + $this->ec2Image = new Zend_Service_Amazon_Ec2_Image($this->accessKey, $this->accessSecret, $this->region); + } + + $this->adapterResult = $this->ec2Image->describe(); + + $images = array(); + + foreach ($this->adapterResult as $result) { + switch (strtolower($result['platform'])) { + case 'windows' : + $platform = Zend_Cloud_Infrastructure_Image::IMAGE_WINDOWS; + break; + default: + $platform = Zend_Cloud_Infrastructure_Image::IMAGE_LINUX; + break; + } + + $images[]= array ( + Zend_Cloud_Infrastructure_Image::IMAGE_ID => $result['imageId'], + Zend_Cloud_Infrastructure_Image::IMAGE_NAME => '', + Zend_Cloud_Infrastructure_Image::IMAGE_DESCRIPTION => $result['imageLocation'], + Zend_Cloud_Infrastructure_Image::IMAGE_OWNERID => $result['imageOwnerId'], + Zend_Cloud_Infrastructure_Image::IMAGE_ARCHITECTURE => $result['architecture'], + Zend_Cloud_Infrastructure_Image::IMAGE_PLATFORM => $platform, + ); + } + return new Zend_Cloud_Infrastructure_ImageList($images,$this->ec2Image); + } + + /** + * Return all the available zones + * + * @return array + */ + public function zonesInstance() + { + if (!isset($this->ec2Zone)) { + $this->ec2Zone = new Zend_Service_Amazon_Ec2_AvailabilityZones($this->accessKey,$this->accessSecret,$this->region); + } + $this->adapterResult = $this->ec2Zone->describe(); + + $zones = array(); + foreach ($this->adapterResult as $zone) { + if (strtolower($zone['zoneState']) === 'available') { + $zones[] = array ( + Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE => $zone['zoneName'], + ); + } + } + return $zones; + } + + /** + * Return the system information about the $metric of an instance + * + * @param string $id + * @param string $metric + * @param null|array $options + * @return array + */ + public function monitorInstance($id, $metric, $options = null) + { + if (empty($id) || empty($metric)) { + return false; + } + + if (!in_array($metric,$this->validMetrics)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception(sprintf( + 'The metric "%s" is not valid', + $metric + )); + } + + if (!empty($options) && !is_array($options)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); + } + + if (!empty($options) + && (empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME]) + || empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME])) + ) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception(sprintf( + 'The options array must contain: "%s" and "%s"', + $options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME], + $options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME] + )); + } + + if (!isset($this->ec2Monitor)) { + $this->ec2Monitor = new Zend_Service_Amazon_Ec2_CloudWatch($this->accessKey, $this->accessSecret, $this->region); + } + + $param = array( + 'MeasureName' => $this->mapMetrics[$metric], + 'Statistics' => array('Average'), + 'Dimensions' => array('InstanceId' => $id), + ); + + if (!empty($options)) { + $param['StartTime'] = $options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME]; + $param['EndTime'] = $options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME]; + } + + $this->adapterResult = $this->ec2Monitor->getMetricStatistics($param); + + $monitor = array(); + $num = 0; + $average = 0; + + if (!empty($this->adapterResult['datapoints'])) { + foreach ($this->adapterResult['datapoints'] as $result) { + $monitor['series'][] = array ( + 'timestamp' => $result['Timestamp'], + 'value' => $result['Average'], + ); + $average += $result['Average']; + $num++; + } + } + + if ($num > 0) { + $monitor['average'] = $average / $num; + } + + return $monitor; + } + + /** + * Get the adapter + * + * @return Zend_Service_Amazon_Ec2_Instance + */ + public function getAdapter() + { + return $this->ec2; + } + + /** + * Get last HTTP request + * + * @return string + */ + public function getLastHttpRequest() + { + return $this->ec2->getHttpClient()->getLastRequest(); + } + + /** + * Get the last HTTP response + * + * @return Zend_Http_Response + */ + public function getLastHttpResponse() + { + return $this->ec2->getHttpClient()->getLastResponse(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,483 @@ + Zend_Cloud_Infrastructure_Instance::STATUS_RUNNING, + 'SUSPENDED' => Zend_Cloud_Infrastructure_Instance::STATUS_STOPPED, + 'BUILD' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, + 'REBUILD' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, + 'QUEUE_RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'PREP_RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, + 'VERIFY_RESIZE' => Zend_Cloud_Infrastructure_Instance::STATUS_REBUILD, + 'PASSWORD' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'RESCUE' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'REBOOT' => Zend_Cloud_Infrastructure_Instance::STATUS_REBOOTING, + 'HARD_REBOOT' => Zend_Cloud_Infrastructure_Instance::STATUS_REBOOTING, + 'SHARE_IP' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'SHARE_IP_NO_CONFIG' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'DELETE_IP' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING, + 'UNKNOWN' => Zend_Cloud_Infrastructure_Instance::STATUS_PENDING + ); + /** + * Constructor + * + * @param array|Zend_Config $options + * @return void + */ + public function __construct($options = array()) + { + if (is_object($options)) { + if (method_exists($options, 'toArray')) { + $options= $options->toArray(); + } elseif ($options instanceof Traversable) { + $options = iterator_to_array($options); + } + } + + if (empty($options) || !is_array($options)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); + } + + if (!isset($options[self::RACKSPACE_USER])) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Rackspace access user not specified!'); + } + + if (!isset($options[self::RACKSPACE_KEY])) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Rackspace access key not specified!'); + } + + $this->accessUser = $options[self::RACKSPACE_USER]; + $this->accessKey = $options[self::RACKSPACE_KEY]; + + if (isset($options[self::RACKSPACE_REGION])) { + switch ($options[self::RACKSPACE_REGION]) { + case self::RACKSPACE_ZONE_UK: + $this->region= Zend_Service_Rackspace_Servers::UK_AUTH_URL; + break; + case self::RACKSPACE_ZONE_USA: + $this->region = Zend_Service_Rackspace_Servers::US_AUTH_URL; + break; + default: + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The region is not valid'); + } + } else { + $this->region = Zend_Service_Rackspace_Servers::US_AUTH_URL; + } + + try { + $this->rackspace = new Zend_Service_Rackspace_Servers($this->accessUser,$this->accessKey, $this->region); + } catch (Exception $e) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); + } + + if (isset($options[self::HTTP_ADAPTER])) { + $this->rackspace->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); + } + + } + /** + * Convert the attributes of Rackspace server into attributes of Infrastructure + * + * @param array $attr + * @return array|boolean + */ + protected function convertAttributes($attr) + { + $result = array(); + if (!empty($attr) && is_array($attr)) { + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ID] = $attr['id']; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_NAME] = $attr['name']; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STATUS] = $this->mapStatus[$attr['status']]; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_IMAGEID] = $attr['imageId']; + if ($this->region==Zend_Service_Rackspace_Servers::US_AUTH_URL) { + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE] = self::RACKSPACE_ZONE_USA; + } else { + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ZONE] = self::RACKSPACE_ZONE_UK; + } + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_RAM] = $this->flavors[$attr['flavorId']]['ram']; + $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STORAGE] = $this->flavors[$attr['flavorId']]['disk']; + } + return $result; + } + /** + * Return a list of the available instancies + * + * @return InstanceList|boolean + */ + public function listInstances() + { + $this->adapterResult = $this->rackspace->listServers(true); + if ($this->adapterResult===false) { + return false; + } + $array= $this->adapterResult->toArray(); + $result = array(); + foreach ($array as $instance) { + $result[]= $this->convertAttributes($instance); + } + return new Zend_Cloud_Infrastructure_InstanceList($this, $result); + } + /** + * Return the status of an instance + * + * @param string + * @return string|boolean + */ + public function statusInstance($id) + { + $this->adapterResult = $this->rackspace->getServer($id); + if ($this->adapterResult===false) { + return false; + } + $array= $this->adapterResult->toArray(); + return $this->mapStatus[$array['status']]; + } + /** + * Return the public DNS name/Ip address of the instance + * + * @param string $id + * @return string|boolean + */ + public function publicDnsInstance($id) + { + $this->adapterResult = $this->rackspace->getServerPublicIp($id); + if (empty($this->adapterResult)) { + return false; + } + return $this->adapterResult[0]; + } + /** + * Reboot an instance + * + * @param string $id + * @return boolean + */ + public function rebootInstance($id) + { + return $this->rackspace->rebootServer($id,true); + } + /** + * Create a new instance + * + * @param string $name + * @param array $options + * @return Instance|boolean + */ + public function createInstance($name, $options) + { + if (empty($name)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You must specify the name of the instance'); + } + if (empty($options) || !is_array($options)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); + } + // @todo create an generic abstract definition for an instance? + $metadata= array(); + if (isset($options['metadata'])) { + $metadata= $options['metadata']; + unset($options['metadata']); + } + $files= array(); + if (isset($options['files'])) { + $files= $options['files']; + unset($options['files']); + } + $options['name']= $name; + $this->adapterResult = $this->rackspace->createServer($options,$metadata,$files); + if ($this->adapterResult===false) { + return false; + } + return new Zend_Cloud_Infrastructure_Instance($this, $this->convertAttributes($this->adapterResult->toArray())); + } + /** + * Stop an instance + * + * @param string $id + * @return boolean + */ + public function stopInstance($id) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); + } + + /** + * Start an instance + * + * @param string $id + * @return boolean + */ + public function startInstance($id) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); + } + + /** + * Destroy an instance + * + * @param string $id + * @return boolean + */ + public function destroyInstance($id) + { + $this->adapterResult= $this->rackspace->deleteServer($id); + return $this->adapterResult; + } + /** + * Return a list of all the available instance images + * + * @return ImageList|boolean + */ + public function imagesInstance() + { + $this->adapterResult = $this->rackspace->listImages(true); + if ($this->adapterResult===false) { + return false; + } + + $images= $this->adapterResult->toArray(); + $result= array(); + + foreach ($images as $image) { + if (strtolower($image['status'])==='active') { + if (strpos($image['name'],'Windows')!==false) { + $platform = Zend_Cloud_Infrastructure_Image::IMAGE_WINDOWS; + } else { + $platform = Zend_Cloud_Infrastructure_Image::IMAGE_LINUX; + } + if (strpos($image['name'],'x64')!==false) { + $arch = Zend_Cloud_Infrastructure_Image::ARCH_64BIT; + } else { + $arch = Zend_Cloud_Infrastructure_Image::ARCH_32BIT; + } + $result[]= array ( + Zend_Cloud_Infrastructure_Image::IMAGE_ID => $image['id'], + Zend_Cloud_Infrastructure_Image::IMAGE_NAME => $image['name'], + Zend_Cloud_Infrastructure_Image::IMAGE_DESCRIPTION => $image['name'], + Zend_Cloud_Infrastructure_Image::IMAGE_ARCHITECTURE => $arch, + Zend_Cloud_Infrastructure_Image::IMAGE_PLATFORM => $platform, + ); + } + } + return new Zend_Cloud_Infrastructure_ImageList($result,$this->adapterResult); + } + /** + * Return all the available zones + * + * @return array + */ + public function zonesInstance() + { + return array(self::RACKSPACE_ZONE_USA,self::RACKSPACE_ZONE_UK); + } + /** + * Return the system information about the $metric of an instance + * NOTE: it works only for Linux servers + * + * @param string $id + * @param string $metric + * @param null|array $options + * @return array|boolean + */ + public function monitorInstance($id, $metric, $options = null) + { + if (!function_exists("ssh2_connect")) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Monitor requires the PHP "SSH" extension (ext/ssh2)'); + } + if (empty($id)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You must specify the id of the instance to monitor'); + } + if (empty($metric)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You must specify the metric to monitor'); + } + if (!in_array($metric,$this->validMetrics)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception(sprintf('The metric "%s" is not valid', $metric)); + } + if (!empty($options) && !is_array($options)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); + } + + switch ($metric) { + case Zend_Cloud_Infrastructure_Instance::MONITOR_CPU: + $cmd= 'top -b -n '.self::MONITOR_CPU_SAMPLES.' | grep \'Cpu\''; + break; + case Zend_Cloud_Infrastructure_Instance::MONITOR_RAM: + $cmd= 'top -b -n 1 | grep \'Mem\''; + break; + case Zend_Cloud_Infrastructure_Instance::MONITOR_DISK: + $cmd= 'df --total | grep total'; + break; + } + if (empty($cmd)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('The metric specified is not supported by the adapter'); + } + + $params= array( + Zend_Cloud_Infrastructure_Instance::SSH_USERNAME => $options['username'], + Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD => $options['password'] + ); + $exec_time= time(); + $result= $this->deployInstance($id,$params,$cmd); + + if (empty($result)) { + return false; + } + + $monitor = array(); + $num = 0; + $average = 0; + + $outputs= explode("\n",$result); + foreach ($outputs as $output) { + if (!empty($output)) { + switch ($metric) { + case Zend_Cloud_Infrastructure_Instance::MONITOR_CPU: + if (preg_match('/(\d+\.\d)%us/', $output,$match)) { + $usage = (float) $match[1]; + } + break; + case Zend_Cloud_Infrastructure_Instance::MONITOR_RAM: + if (preg_match('/(\d+)k total/', $output,$match)) { + $total = (integer) $match[1]; + } + if (preg_match('/(\d+)k used/', $output,$match)) { + $used = (integer) $match[1]; + } + if ($total>0) { + $usage= (float) $used/$total; + } + break; + case Zend_Cloud_Infrastructure_Instance::MONITOR_DISK: + if (preg_match('/(\d+)%/', $output,$match)) { + $usage = (float) $match[1]; + } + break; + } + + $monitor['series'][] = array ( + 'timestamp' => $exec_time, + 'value' => number_format($usage,2).'%' + ); + + $average += $usage; + $exec_time+= 60; // seconds + $num++; + } + } + + if ($num>0) { + $monitor['average'] = number_format($average/$num,2).'%'; + } + return $monitor; + } + /** + * Get the adapter + * + * @return Zend_Service_Rackspace_Servers + */ + public function getAdapter() + { + return $this->rackspace; + } + /** + * Get last HTTP request + * + * @return string + */ + public function getLastHttpRequest() + { + return $this->rackspace->getHttpClient()->getLastRequest(); + } + /** + * Get the last HTTP response + * + * @return Zend_Http_Response + */ + public function getLastHttpResponse() + { + return $this->rackspace->getHttpClient()->getLastResponse(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/Infrastructure/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/Infrastructure/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,25 @@ +toArray(); + } elseif ($data instanceof Traversable) { + $data = iterator_to_array($data); + } + } + + if (empty($data) || !is_array($data)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You must pass an array of parameters'); + } + + foreach ($this->attributeRequired as $key) { + if (empty($data[$key])) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception(sprintf( + 'The param "%s" is a required parameter for class %s', + $key, + __CLASS__ + )); + } + } + + $this->attributes = $data; + $this->adapter = $adapter; + } + + /** + * Get Attribute with a specific key + * + * @param array $data + * @return misc|boolean + */ + public function getAttribute($key) + { + if (!empty($this->attributes[$key])) { + return $this->attributes[$key]; + } + return false; + } + + /** + * Get all the attributes + * + * @return array + */ + public function getAttributes() + { + return $this->attributes; + } + + /** + * Get the image ID + * + * @return string + */ + public function getId() + { + return $this->attributes[self::IMAGE_ID]; + } + + /** + * Get the Owner ID + * + * @return string + */ + public function getOwnerId() + { + return $this->attributes[self::IMAGE_OWNERID]; + } + + /** + * Get the name + * + * @return string + */ + public function getName() + { + return $this->attributes[self::IMAGE_NAME]; + } + + /** + * Get the description + * + * @return string + */ + public function getDescription() + { + return $this->attributes[self::IMAGE_DESCRIPTION]; + } + + /** + * Get the platform + * + * @return string + */ + public function getPlatform() + { + return $this->attributes[self::IMAGE_PLATFORM]; + } + + /** + * Get the architecture + * + * @return string + */ + public function getArchitecture() + { + return $this->attributes[self::IMAGE_ARCHITECTURE]; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/Infrastructure/ImageList.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/Infrastructure/ImageList.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,218 @@ +adapter = $adapter; + $this->constructFromArray($images); + } + + /** + * Transforms the Array to array of Instances + * + * @param array $list + * @return void + */ + protected function constructFromArray(array $list) + { + foreach ($list as $image) { + $this->addImage(new Zend_Cloud_Infrastructure_Image($image, $this->adapter)); + } + } + + /** + * Add an image + * + * @param Image + * @return ImageList + */ + protected function addImage(Zend_Cloud_Infrastructure_Image $image) + { + $this->images[] = $image; + return $this; + } + + /** + * Return number of images + * + * Implement Countable::count() + * + * @return int + */ + public function count() + { + return count($this->images); + } + + /** + * Return the current element + * + * Implement Iterator::current() + * + * @return Image + */ + public function current() + { + return $this->images[$this->iteratorKey]; + } + + /** + * Return the key of the current element + * + * Implement Iterator::key() + * + * @return int + */ + public function key() + { + return $this->iteratorKey; + } + + /** + * Move forward to next element + * + * Implement Iterator::next() + * + * @return void + */ + public function next() + { + $this->iteratorKey++; + } + + /** + * Rewind the Iterator to the first element + * + * Implement Iterator::rewind() + * + * @return void + */ + public function rewind() + { + $this->iteratorKey = 0; + } + + /** + * Check if there is a current element after calls to rewind() or next() + * + * Implement Iterator::valid() + * + * @return bool + */ + public function valid() + { + $numItems = $this->count(); + if ($numItems > 0 && $this->iteratorKey < $numItems) { + return true; + } + return false; + } + + /** + * Whether the offset exists + * + * Implement ArrayAccess::offsetExists() + * + * @param int $offset + * @return bool + */ + public function offsetExists($offset) + { + return ($offset < $this->count()); + } + + /** + * Return value at given offset + * + * Implement ArrayAccess::offsetGet() + * + * @param int $offset + * @throws Zend_Cloud_Infrastructure_Exception + * @return Image + */ + public function offsetGet($offset) + { + if (!$this->offsetExists($offset)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); + } + return $this->images[$offset]; + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetSet() + * + * @param int $offset + * @param string $value + * @throws Zend_Cloud_Infrastructure_Exception + */ + public function offsetSet($offset, $value) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetUnset() + * + * @param int $offset + * @throws Zend_Cloud_Infrastructure_Exception + */ + public function offsetUnset($offset) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/Infrastructure/Instance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/Infrastructure/Instance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,320 @@ +toArray(); + } elseif ($data instanceof Traversable) { + $data = iterator_to_array($data); + } + } + + if (empty($data) || !is_array($data)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception("You must pass an array of parameters"); + } + + foreach ($this->attributeRequired as $key) { + if (empty($data[$key])) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception(sprintf( + 'The param "%s" is a required param for %s', + $key, + __CLASS__ + )); + } + } + + $this->adapter = $adapter; + $this->attributes = $data; + } + + /** + * Get Attribute with a specific key + * + * @param array $data + * @return misc|false + */ + public function getAttribute($key) + { + if (!empty($this->attributes[$key])) { + return $this->attributes[$key]; + } + return false; + } + + /** + * Get all the attributes + * + * @return array + */ + public function getAttributes() + { + return $this->attributes; + } + + /** + * Get the instance's id + * + * @return string + */ + public function getId() + { + return $this->attributes[self::INSTANCE_ID]; + } + + /** + * Get the instance's image id + * + * @return string + */ + public function getImageId() + { + return $this->attributes[self::INSTANCE_IMAGEID]; + } + + /** + * Get the instance's name + * + * @return string + */ + public function getName() + { + return $this->attributes[self::INSTANCE_NAME]; + } + + /** + * Get the status of the instance + * + * @return string|boolean + */ + public function getStatus() + { + return $this->adapter->statusInstance($this->attributes[self::INSTANCE_ID]); + } + + /** + * Wait for status $status with a timeout of $timeout seconds + * + * @param string $status + * @param integer $timeout + * @return boolean + */ + public function waitStatus($status, $timeout = Adapter::TIMEOUT_STATUS_CHANGE) + { + return $this->adapter->waitStatusInstance($this->attributes[self::INSTANCE_ID], $status, $timeout); + } + + /** + * Get the public DNS of the instance + * + * @return string + */ + public function getPublicDns() + { + if (!isset($this->attributes[self::INSTANCE_PUBLICDNS])) { + $this->attributes[self::INSTANCE_PUBLICDNS] = $this->adapter->publicDnsInstance($this->attributes[self::INSTANCE_ID]); + } + return $this->attributes[self::INSTANCE_PUBLICDNS]; + } + + /** + * Get the instance's CPU + * + * @return string + */ + public function getCpu() + { + return $this->attributes[self::INSTANCE_CPU]; + } + + /** + * Get the instance's RAM size + * + * @return string + */ + public function getRamSize() + { + return $this->attributes[self::INSTANCE_RAM]; + } + + /** + * Get the instance's storage size + * + * @return string + */ + public function getStorageSize() + { + return $this->attributes[self::INSTANCE_STORAGE]; + } + + /** + * Get the instance's zone + * + * @return string + */ + public function getZone() + { + return $this->attributes[self::INSTANCE_ZONE]; + } + + /** + * Get the instance's launch time + * + * @return string + */ + public function getLaunchTime() + { + return $this->attributes[self::INSTANCE_LAUNCHTIME]; + } + + /** + * Reboot the instance + * + * @return boolean + */ + public function reboot() + { + return $this->adapter->rebootInstance($this->attributes[self::INSTANCE_ID]); + } + + /** + * Stop the instance + * + * @return boolean + */ + public function stop() + { + return $this->adapter->stopInstance($this->attributes[self::INSTANCE_ID]); + } + + /** + * Start the instance + * + * @return boolean + */ + public function start() + { + return $this->adapter->startInstance($this->attributes[self::INSTANCE_ID]); + } + + /** + * Destroy the instance + * + * @return boolean + */ + public function destroy() + { + return $this->adapter->destroyInstance($this->attributes[self::INSTANCE_ID]); + } + + /** + * Return the system informations about the $metric of an instance + * + * @param string $metric + * @param null|array $options + * @return array|boolean + */ + public function monitor($metric, $options = null) + { + return $this->adapter->monitorInstance($this->attributes[self::INSTANCE_ID], $metric, $options); + } + + /** + * Run arbitrary shell script on the instance + * + * @param array $param + * @param string|array $cmd + * @return string|array + */ + public function deploy($params, $cmd) + { + return $this->adapter->deployInstance($this->attributes[self::INSTANCE_ID], $params, $cmd); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/Infrastructure/InstanceList.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/Infrastructure/InstanceList.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,219 @@ +adapter = $adapter; + $this->constructFromArray($instances); + } + + /** + * Transforms the Array to array of Instances + * + * @param array $list + * @return void + */ + protected function constructFromArray(array $list) + { + foreach ($list as $instance) { + $this->addInstance(new Zend_Cloud_Infrastructure_Instance($this->adapter,$instance)); + } + } + + /** + * Add an instance + * + * @param Instance + * @return InstanceList + */ + protected function addInstance(Zend_Cloud_Infrastructure_Instance $instance) + { + $this->instances[] = $instance; + return $this; + } + + /** + * Return number of instances + * + * Implement Countable::count() + * + * @return int + */ + public function count() + { + return count($this->instances); + } + + /** + * Return the current element + * + * Implement Iterator::current() + * + * @return Instance + */ + public function current() + { + return $this->instances[$this->iteratorKey]; + } + + /** + * Return the key of the current element + * + * Implement Iterator::key() + * + * @return int + */ + public function key() + { + return $this->iteratorKey; + } + + /** + * Move forward to next element + * + * Implement Iterator::next() + * + * @return void + */ + public function next() + { + $this->iteratorKey++; + } + + /** + * Rewind the Iterator to the first element + * + * Implement Iterator::rewind() + * + * @return void + */ + public function rewind() + { + $this->iteratorKey = 0; + } + + /** + * Check if there is a current element after calls to rewind() or next() + * + * Implement Iterator::valid() + * + * @return bool + */ + public function valid() + { + $numItems = $this->count(); + if ($numItems > 0 && $this->iteratorKey < $numItems) { + return true; + } + return false; + } + + /** + * Whether the offset exists + * + * Implement ArrayAccess::offsetExists() + * + * @param int $offset + * @return bool + */ + public function offsetExists($offset) + { + return ($offset < $this->count()); + } + + /** + * Return value at given offset + * + * Implement ArrayAccess::offsetGet() + * + * @param int $offset + * @return Instance + * @throws Zend_Cloud_Infrastructure_Exception + */ + public function offsetGet($offset) + { + if (!$this->offsetExists($offset)) { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); + } + return $this->instances[$offset]; + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetSet() + * + * @param int $offset + * @param string $value + * @throws Zend_Cloud_Infrastructure_Exception + */ + public function offsetSet($offset, $value) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetUnset() + * + * @param int $offset + * @throws Zend_Cloud_Infrastructure_Exception + */ + public function offsetUnset($offset) + { + require_once 'Zend/Cloud/Infrastructure/Exception.php'; + throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/OperationNotAvailableException.php --- a/web/lib/Zend/Cloud/OperationNotAvailableException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/OperationNotAvailableException.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,34 +1,34 @@ -toArray(); @@ -85,7 +85,7 @@ if(isset($options[self::HTTP_ADAPTER])) { $this->_sqs->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } + } } /** @@ -97,7 +97,7 @@ * @param array $options * @return string Queue ID (typically URL) */ - public function createQueue($name, $options = null) + public function createQueue($name, $options = null) { try { return $this->_sqs->create($name, $options[self::CREATE_TIMEOUT]); @@ -113,7 +113,7 @@ * @param array $options * @return boolean true if successful, false otherwise */ - public function deleteQueue($queueId, $options = null) + public function deleteQueue($queueId, $options = null) { try { return $this->_sqs->delete($queueId); @@ -128,7 +128,7 @@ * @param array $options * @return array Queue IDs */ - public function listQueues($options = null) + public function listQueues($options = null) { try { return $this->_sqs->getQueues(); @@ -144,7 +144,7 @@ * @param array $options * @return array */ - public function fetchQueueMetadata($queueId, $options = null) + public function fetchQueueMetadata($queueId, $options = null) { try { // TODO: ZF-9050 Fix the SQS client library in trunk to return all attribute values @@ -169,7 +169,7 @@ * @param array $options * @return void */ - public function storeQueueMetadata($queueId, $metadata, $options = null) + public function storeQueueMetadata($queueId, $metadata, $options = null) { // TODO Add support for SetQueueAttributes to client library require_once 'Zend/Cloud/OperationNotAvailableException.php'; @@ -184,7 +184,7 @@ * @param array $options * @return string Message ID */ - public function sendMessage($queueId, $message, $options = null) + public function sendMessage($queueId, $message, $options = null) { try { return $this->_sqs->send($queueId, $message); @@ -202,7 +202,7 @@ * @param array $options * @return array */ - public function receiveMessages($queueId, $max = 1, $options = null) + public function receiveMessages($queueId, $max = 1, $options = null) { try { return $this->_makeMessages($this->_sqs->receive($queueId, $max, $options[self::VISIBILITY_TIMEOUT])); @@ -210,11 +210,11 @@ throw new Zend_Cloud_QueueService_Exception('Error on recieving messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create Zend_Cloud_QueueService_Message array for * Sqs messages. - * + * * @param array $messages * @return Zend_Cloud_QueueService_Message[] */ @@ -237,7 +237,7 @@ * @param array $options * @return void */ - public function deleteMessage($queueId, $message, $options = null) + public function deleteMessage($queueId, $message, $options = null) { try { if($message instanceof Zend_Cloud_QueueService_Message) { @@ -249,7 +249,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on deleting a message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Peek at the messages from the specified queue without removing them. * @@ -269,7 +269,7 @@ /** * Get SQS implementation - * @return Zend_Service_Amazon_Sqs + * @return Zend_Service_Amazon_Sqs */ public function getClient() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php --- a/web/lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,10 +27,10 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_QueueService_Adapter_WindowsAzure +class Zend_Cloud_QueueService_Adapter_WindowsAzure extends Zend_Cloud_QueueService_Adapter_AbstractAdapter { /** @@ -49,20 +49,20 @@ /** message options */ const MESSAGE_TTL = 'ttl'; - + const DEFAULT_HOST = Zend_Service_WindowsAzure_Storage::URL_CLOUD_QUEUE; /** * Storage client - * + * * @var Zend_Service_WindowsAzure_Storage_Queue */ protected $_storageClient = null; - + /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ public function __construct($options = array()) @@ -112,9 +112,9 @@ } catch(Zend_Service_WindowsAzure_Exception $e) { throw new Zend_Cloud_QueueService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); } - + } - + /** * Create a queue. Returns the ID of the created queue (typically the URL). * It may take some time to create the queue. Check your vendor's @@ -133,7 +133,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on queue creation: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Delete a queue. All messages in the queue will also be deleted. * @@ -152,7 +152,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on queue deletion: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * List all queues. * @@ -177,7 +177,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on listing queues: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Get a key/value array of metadata for the given queue. * @@ -196,12 +196,12 @@ throw new Zend_Cloud_QueueService_Exception('Error on fetching queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Store a key/value array of metadata for the specified queue. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. Some adapters may not support this method. - * + * * @param string $queueId * @param array $metadata * @param array $options @@ -218,10 +218,10 @@ throw new Zend_Cloud_QueueService_Exception('Error on setting queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Send a message to the specified queue. - * + * * @param string $queueId * @param string $message * @param array $options @@ -240,11 +240,11 @@ throw new Zend_Cloud_QueueService_Exception('Error on sending message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Recieve at most $max messages from the specified queue and return the * message IDs for messages recieved. - * + * * @param string $queueId * @param int $max * @param array $options @@ -266,11 +266,11 @@ throw new Zend_Cloud_QueueService_Exception('Error on recieving messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create Zend_Cloud_QueueService_Message array for * Azure messages. - * + * * @param array $messages * @return Zend_Cloud_QueueService_Message[] */ @@ -287,9 +287,9 @@ /** * Delete the specified message from the specified queue. - * + * * @param string $queueId - * @param Zend_Cloud_QueueService_Message $message Message ID or message + * @param Zend_Cloud_QueueService_Message $message Message ID or message * @param array $options * @return void */ @@ -331,10 +331,10 @@ throw new Zend_Cloud_QueueService_Exception('Error on peeking messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Get Azure implementation - * @return Zend_Service_Azure_Storage_Queue + * @return Zend_Service_Azure_Storage_Queue */ public function getClient() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php --- a/web/lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,33 +27,33 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cloud_QueueService_Adapter_ZendQueue +class Zend_Cloud_QueueService_Adapter_ZendQueue extends Zend_Cloud_QueueService_Adapter_AbstractAdapter { /** * Options array keys for the Zend_Queue adapter. */ const ADAPTER = 'adapter'; - + /** * Storage client - * + * * @var Zend_Queue */ protected $_queue = null; - + /** * @var array All queues */ protected $_queues = array(); - + /** * Constructor - * - * @param array|Zend_Config $options + * + * @param array|Zend_Config $options * @return void */ public function __construct ($options = array()) @@ -87,7 +87,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create a queue. Returns the ID of the created queue (typically the URL). * It may take some time to create the queue. Check your vendor's @@ -106,7 +106,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on queue creation: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Delete a queue. All messages in the queue will also be deleted. * @@ -128,7 +128,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on queue deletion: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * List all queues. * @@ -143,7 +143,7 @@ throw new Zend_Cloud_QueueService_Exception('Error on listing queues: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Get a key/value array of metadata for the given queue. * @@ -162,12 +162,12 @@ throw new Zend_Cloud_QueueService_Exception('Error on fetching queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Store a key/value array of metadata for the specified queue. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. Some adapters may not support this method. - * + * * @param string $queueId * @param array $metadata * @param array $options @@ -184,10 +184,10 @@ throw new Zend_Cloud_QueueService_Exception('Error on setting queue metadata: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Send a message to the specified queue. - * + * * @param string $queueId * @param string $message * @param array $options @@ -204,11 +204,11 @@ throw new Zend_Cloud_QueueService_Exception('Error on sending message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Recieve at most $max messages from the specified queue and return the * message IDs for messages recieved. - * + * * @param string $queueId * @param int $max * @param array $options @@ -230,11 +230,11 @@ throw new Zend_Cloud_QueueService_Exception('Error on recieving messages: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Create Zend_Cloud_QueueService_Message array for * Azure messages. - * + * * @param array $messages * @return Zend_Cloud_QueueService_Message[] */ @@ -248,12 +248,12 @@ } return new $setClass($result); } - + /** * Delete the specified message from the specified queue. - * + * * @param string $queueId - * @param Zend_Cloud_QueueService_Message $message Message ID or message + * @param Zend_Cloud_QueueService_Message $message Message ID or message * @param array $options * @return void */ @@ -269,13 +269,13 @@ if (!($message instanceof Zend_Queue_Message)) { throw new Zend_Cloud_QueueService_Exception('Cannot delete the message: Zend_Queue_Message object required'); } - + return $this->_queues[$queueId]->deleteMessage($message); } catch (Zend_Queue_Exception $e) { throw new Zend_Cloud_QueueService_Exception('Error on deleting a message: '.$e->getMessage(), $e->getCode(), $e); } } - + /** * Peek at the messages from the specified queue without removing them. * @@ -289,10 +289,10 @@ require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('ZendQueue doesn\'t currently support message peeking'); } - + /** * Get Azure implementation - * @return Zend_Queue + * @return Zend_Queue */ public function getClient() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/QueueService/Exception.php --- a/web/lib/Zend/Cloud/QueueService/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/QueueService/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,37 +1,37 @@ -_body = $body; - $this->_clientMessage = $message; - } - - /** - * Get the message body - * @return string - */ - public function getBody() - { - return $this->_body; - } - - /** - * Get the original adapter-specific message - */ - public function getMessage() - { - return $this->_clientMessage; - } -} +_body = $body; + $this->_clientMessage = $message; + } + + /** + * Get the message body + * @return string + */ + public function getBody() + { + return $this->_body; + } + + /** + * Get the original adapter-specific message + */ + public function getMessage() + { + return $this->_clientMessage; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/QueueService/MessageSet.php --- a/web/lib/Zend/Cloud/QueueService/MessageSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/QueueService/MessageSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cloud_QueueService_MessageSet implements Countable, IteratorAggregate @@ -36,8 +36,8 @@ /** * Constructor - * - * @param array $messages + * + * @param array $messages * @return void */ public function __construct(array $messages) @@ -48,7 +48,7 @@ /** * Countable: number of messages in collection - * + * * @return int */ public function count() @@ -58,7 +58,7 @@ /** * IteratorAggregate: return iterable object - * + * * @return Traversable */ public function getIterator() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/StorageService/Adapter.php --- a/web/lib/Zend/Cloud/StorageService/Adapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/StorageService/Adapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Cloud_StorageService_Adapter @@ -39,10 +39,10 @@ * @return mixed */ public function fetchItem($path, $options = null); - + /** * Store an item in the storage service. - * WARNING: This operation overwrites any item that is located at + * WARNING: This operation overwrites any item that is located at * $destinationPath. * @param string $destinationPath * @param mixed $data @@ -52,7 +52,7 @@ public function storeItem($destinationPath, $data, $options = null); - + /** * Delete an item in the storage service. * @@ -61,10 +61,10 @@ * @return void */ public function deleteItem($path, $options = null); - + /** * Copy an item in the storage service to a given path. - * + * * The $destinationPath must be a directory. * * @param string $sourcePath @@ -73,10 +73,10 @@ * @return void */ public function copyItem($sourcePath, $destinationPath, $options = null); - + /** * Move an item in the storage service to a given path. - * + * * The $destinationPath must be a directory. * * @param string $sourcePath @@ -85,7 +85,7 @@ * @return void */ public function moveItem($sourcePath, $destinationPath, $options = null); - + /** * Rename an item in the storage service to a given name. * @@ -96,10 +96,10 @@ * @return void */ public function renameItem($path, $name, $options = null); - + /** * List items in the given directory in the storage service - * + * * The $path must be a directory * * @@ -108,7 +108,7 @@ * @return array A list of item names */ public function listItems($path, $options = null); - + /** * Get a key/value array of metadata for the given path. * @@ -117,10 +117,10 @@ * @return array */ public function fetchMetadata($path, $options = null); - + /** * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at + * WARNING: This operation overwrites any metadata that is located at * $destinationPath. * * @param string $destinationPath @@ -128,7 +128,7 @@ * @return void */ public function storeMetadata($destinationPath, $metadata, $options = null); - + /** * Delete a key/value array of metadata at the given path. * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/StorageService/Adapter/FileSystem.php --- a/web/lib/Zend/Cloud/StorageService/Adapter/FileSystem.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/StorageService/Adapter/FileSystem.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,267 +1,267 @@ -toArray(); - } - - if (!is_array($options)) { - throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); - } - - if (isset($options[self::LOCAL_DIRECTORY])) { - $this->_directory = $options[self::LOCAL_DIRECTORY]; - } else { - $this->_directory = realpath(sys_get_temp_dir()); - } - } - - /** - * Get an item from the storage service. - * - * TODO: Support streaming - * - * @param string $path - * @param array $options - * @return false|string - */ - public function fetchItem($path, $options = array()) - { - $filepath = $this->_getFullPath($path); - $path = realpath($filepath); - - if (!$path) { - return false; - } - - return file_get_contents($path); - } - - /** - * Store an item in the storage service. - * - * WARNING: This operation overwrites any item that is located at - * $destinationPath. - * - * @TODO Support streams - * - * @param string $destinationPath - * @param mixed $data - * @param array $options - * @return void - */ - public function storeItem($destinationPath, $data, $options = array()) - { - $path = $this->_getFullPath($destinationPath); - file_put_contents($path, $data); - chmod($path, 0777); - } - - /** - * Delete an item in the storage service. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteItem($path, $options = array()) - { - if (!isset($path)) { - return; - } - - $filepath = $this->_getFullPath($path); - if (file_exists($filepath)) { - unlink($filepath); - } - } - - /** - * Copy an item in the storage service to a given path. - * - * WARNING: This operation is *very* expensive for services that do not - * support copying an item natively. - * - * @TODO Support streams for those services that don't support natively - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function copyItem($sourcePath, $destinationPath, $options = array()) - { - copy($this->_getFullPath($sourcePath), $this->_getFullPath($destinationPath)); - } - - /** - * Move an item in the storage service to a given path. - * - * WARNING: This operation is *very* expensive for services that do not - * support moving an item natively. - * - * @TODO Support streams for those services that don't support natively - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function moveItem($sourcePath, $destinationPath, $options = array()) - { - rename($this->_getFullPath($sourcePath), $this->_getFullPath($destinationPath)); - } - - /** - * Rename an item in the storage service to a given name. - * - * - * @param string $path - * @param string $name - * @param array $options - * @return void - */ - public function renameItem($path, $name, $options = null) - { - rename( - $this->_getFullPath($path), - dirname($this->_getFullPath($path)) . DIRECTORY_SEPARATOR . $name - ); - } - - /** - * List items in the given directory in the storage service - * - * The $path must be a directory - * - * - * @param string $path Must be a directory - * @param array $options - * @return array A list of item names - */ - public function listItems($path, $options = null) - { - $listing = scandir($this->_getFullPath($path)); - - // Remove the hidden navigation directories - $listing = array_diff($listing, array('.', '..')); - - return $listing; - } - - /** - * Get a key/value array of metadata for the given path. - * - * @param string $path - * @param array $options - * @return array - */ - public function fetchMetadata($path, $options = array()) - { - $fullPath = $this->_getFullPath($path); - $metadata = null; - if (file_exists($fullPath)) { - $metadata = stat(realpath($fullPath)); - } - - return isset($metadata) ? $metadata : false; - } - - /** - * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at - * $destinationPath. - * - * @param string $destinationPath - * @param array $options - * @return void - */ - public function storeMetadata($destinationPath, $metadata, $options = array()) - { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('Storing metadata not implemented'); - } - - /** - * Delete a key/value array of metadata at the given path. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteMetadata($path) - { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not implemented'); - } - - /** - * Return the full path for the file. - * - * @param string $path - * @return string - */ - private function _getFullPath($path) - { - return $this->_directory . DIRECTORY_SEPARATOR . $path; - } - - /** - * Get the concrete client. - * @return strings - */ - public function getClient() - { - return $this->_directory; - } -} +toArray(); + } + + if (!is_array($options)) { + throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); + } + + if (isset($options[self::LOCAL_DIRECTORY])) { + $this->_directory = $options[self::LOCAL_DIRECTORY]; + } else { + $this->_directory = realpath(sys_get_temp_dir()); + } + } + + /** + * Get an item from the storage service. + * + * TODO: Support streaming + * + * @param string $path + * @param array $options + * @return false|string + */ + public function fetchItem($path, $options = array()) + { + $filepath = $this->_getFullPath($path); + $path = realpath($filepath); + + if (!$path || !file_exists($path)) { + return false; + } + + return file_get_contents($path); + } + + /** + * Store an item in the storage service. + * + * WARNING: This operation overwrites any item that is located at + * $destinationPath. + * + * @TODO Support streams + * + * @param string $destinationPath + * @param mixed $data + * @param array $options + * @return void + */ + public function storeItem($destinationPath, $data, $options = array()) + { + $path = $this->_getFullPath($destinationPath); + file_put_contents($path, $data); + chmod($path, 0777); + } + + /** + * Delete an item in the storage service. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteItem($path, $options = array()) + { + if (!isset($path)) { + return; + } + + $filepath = $this->_getFullPath($path); + if (file_exists($filepath)) { + unlink($filepath); + } + } + + /** + * Copy an item in the storage service to a given path. + * + * WARNING: This operation is *very* expensive for services that do not + * support copying an item natively. + * + * @TODO Support streams for those services that don't support natively + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function copyItem($sourcePath, $destinationPath, $options = array()) + { + copy($this->_getFullPath($sourcePath), $this->_getFullPath($destinationPath)); + } + + /** + * Move an item in the storage service to a given path. + * + * WARNING: This operation is *very* expensive for services that do not + * support moving an item natively. + * + * @TODO Support streams for those services that don't support natively + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function moveItem($sourcePath, $destinationPath, $options = array()) + { + rename($this->_getFullPath($sourcePath), $this->_getFullPath($destinationPath)); + } + + /** + * Rename an item in the storage service to a given name. + * + * + * @param string $path + * @param string $name + * @param array $options + * @return void + */ + public function renameItem($path, $name, $options = null) + { + rename( + $this->_getFullPath($path), + dirname($this->_getFullPath($path)) . DIRECTORY_SEPARATOR . $name + ); + } + + /** + * List items in the given directory in the storage service + * + * The $path must be a directory + * + * + * @param string $path Must be a directory + * @param array $options + * @return array A list of item names + */ + public function listItems($path, $options = null) + { + $listing = scandir($this->_getFullPath($path)); + + // Remove the hidden navigation directories + $listing = array_diff($listing, array('.', '..')); + + return $listing; + } + + /** + * Get a key/value array of metadata for the given path. + * + * @param string $path + * @param array $options + * @return array + */ + public function fetchMetadata($path, $options = array()) + { + $fullPath = $this->_getFullPath($path); + $metadata = null; + if (file_exists($fullPath)) { + $metadata = stat(realpath($fullPath)); + } + + return isset($metadata) ? $metadata : false; + } + + /** + * Store a key/value array of metadata at the given path. + * WARNING: This operation overwrites any metadata that is located at + * $destinationPath. + * + * @param string $destinationPath + * @param array $options + * @return void + */ + public function storeMetadata($destinationPath, $metadata, $options = array()) + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('Storing metadata not implemented'); + } + + /** + * Delete a key/value array of metadata at the given path. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteMetadata($path) + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not implemented'); + } + + /** + * Return the full path for the file. + * + * @param string $path + * @return string + */ + private function _getFullPath($path) + { + return $this->_directory . DIRECTORY_SEPARATOR . $path; + } + + /** + * Get the concrete client. + * @return strings + */ + public function getClient() + { + return $this->_directory; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php --- a/web/lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,399 +1,399 @@ -toArray(); - } - - if (!is_array($options)) { - throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); - } - - $auth = array( - 'username' => $options[self::USERNAME], - 'password' => $options[self::PASSWORD], - 'appKey' => $options[self::APP_KEY], - ); - $nirvanix_options = array(); - if (isset($options[self::HTTP_ADAPTER])) { - $httpc = new Zend_Http_Client(); - $httpc->setAdapter($options[self::HTTP_ADAPTER]); - $nirvanix_options['httpClient'] = $httpc; - } - try { - $this->_nirvanix = new Zend_Service_Nirvanix($auth, $nirvanix_options); - $this->_remoteDirectory = $options[self::REMOTE_DIRECTORY]; - $this->_imfNs = $this->_nirvanix->getService('IMFS'); - $this->_metadataNs = $this->_nirvanix->getService('Metadata'); - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Get an item from the storage service. - * - * @param string $path - * @param array $options - * @return mixed - */ - public function fetchItem($path, $options = null) - { - $path = $this->_getFullPath($path); - try { - $item = $this->_imfNs->getContents($path); - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); - } - return $item; - } - - /** - * Store an item in the storage service. - * WARNING: This operation overwrites any item that is located at - * $destinationPath. - * @param string $destinationPath - * @param mixed $data - * @param array $options - * @return void - */ - public function storeItem($destinationPath, $data, $options = null) - { - try { - $path = $this->_getFullPath($destinationPath); - $this->_imfNs->putContents($path, $data); - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); - } - return true; - } - - /** - * Delete an item in the storage service. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteItem($path, $options = null) - { - try { - $path = $this->_getFullPath($path); - $this->_imfNs->unlink($path); - } catch(Zend_Service_Nirvanix_Exception $e) { -// if (trim(strtoupper($e->getMessage())) != 'INVALID PATH') { -// // TODO Differentiate among errors in the Nirvanix adapter - throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Copy an item in the storage service to a given path. - * WARNING: This operation is *very* expensive for services that do not - * support copying an item natively. - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function copyItem($sourcePath, $destinationPath, $options = null) - { - try { - $sourcePath = $this->_getFullPath($sourcePath); - $destinationPath = $this->_getFullPath($destinationPath); - $this->_imfNs->CopyFiles(array('srcFilePath' => $sourcePath, - 'destFolderPath' => $destinationPath)); - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Move an item in the storage service to a given path. - * WARNING: This operation is *very* expensive for services that do not - * support moving an item natively. - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function moveItem($sourcePath, $destinationPath, $options = null) - { - try { - $sourcePath = $this->_getFullPath($sourcePath); - $destinationPath = $this->_getFullPath($destinationPath); - $this->_imfNs->RenameFile(array('filePath' => $sourcePath, - 'newFileName' => $destinationPath)); - // $this->_imfNs->MoveFiles(array('srcFilePath' => $sourcePath, - // 'destFolderPath' => $destinationPath)); - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Rename an item in the storage service to a given name. - * - * - * @param string $path - * @param string $name - * @param array $options - * @return void - */ - public function renameItem($path, $name, $options = null) - { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented'); - } - - /** - * Get a key/value array of metadata for the given path. - * - * @param string $path - * @param array $options - * @return array An associative array of key/value pairs specifying the metadata for this object. - * If no metadata exists, an empty array is returned. - */ - public function fetchMetadata($path, $options = null) - { - $path = $this->_getFullPath($path); - try { - $metadataNode = $this->_metadataNs->getMetadata(array('path' => $path)); - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on fetching metadata: '.$e->getMessage(), $e->getCode(), $e); - } - - $metadata = array(); - $length = count($metadataNode->Metadata); - - // Need to special case this as Nirvanix returns an array if there is - // more than one, but doesn't return an array if there is only one. - if ($length == 1) - { - $metadata[(string)$metadataNode->Metadata->Type->value] = (string)$metadataNode->Metadata->Value; - } - else if ($length > 1) - { - for ($i=0; $i<$length; $i++) - { - $metadata[(string)$metadataNode->Metadata[$i]->Type] = (string)$metadataNode->Metadata[$i]->Value; - } - } - return $metadata; - } - - /** - * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at - * $destinationPath. - * - * @param array $metadata - An associative array specifying the key/value pairs for the metadata. - * @param $destinationPath - * @param array $options - * @return void - */ - public function storeMetadata($destinationPath, $metadata, $options = null) - { - $destinationPath = $this->_getFullPath($destinationPath); - if ($metadata != null) { - try { - foreach ($metadata AS $key=>$value) { - $metadataString = $key . ":" . $value; - $this->_metadataNs->SetMetadata(array( - 'path' => $destinationPath, - 'metadata' => $metadataString, - )); - } - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on storing metadata: '.$e->getMessage(), $e->getCode(), $e); - } - } - } - - /** - * Delete a key/value array of metadata at the given path. - * - * @param string $path - * @param array $metadata - An associative array specifying the key/value pairs for the metadata - * to be deleted. If null, all metadata associated with the object will - * be deleted. - * @param array $options - * @return void - */ - public function deleteMetadata($path, $metadata = null, $options = null) - { - $path = $this->_getFullPath($path); - try { - if ($metadata == null) { - $this->_metadataNs->DeleteAllMetadata(array('path' => $path)); - } else { - foreach ($metadata AS $key=>$value) { - $this->_metadataNs->DeleteMetadata(array( - 'path' => $path, - 'metadata' => $key, - )); - } - } - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on deleting metadata: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /* - * Recursively traverse all the folders and build an array that contains - * the path names for each folder. - * - * @param $path - The folder path to get the list of folders from. - * @param &$resultArray - reference to the array that contains the path names - * for each folder. - */ - private function getAllFolders($path, &$resultArray) - { - $response = $this->_imfNs->ListFolder(array( - 'folderPath' => $path, - 'pageNumber' => 1, - 'pageSize' => $this->maxPageSize, - )); - $numFolders = $response->ListFolder->TotalFolderCount; - if ($numFolders == 0) { - return; - } else { - //Need to special case this as Nirvanix returns an array if there is - //more than one, but doesn't return an array if there is only one. - if ($numFolders == 1) { - $folderPath = $response->ListFolder->Folder->Path; - array_push($resultArray, $folderPath); - $this->getAllFolders('/' . $folderPath, $resultArray); - } else { - foreach ($response->ListFolder->Folder as $arrayElem) { - $folderPath = $arrayElem->Path; - array_push($resultArray, $folderPath); - $this->getAllFolders('/' . $folderPath, $resultArray); - } - } - } - } - - /** - * Return an array of the items contained in the given path. The items - * returned are the files or objects that in the specified path. - * - * @param string $path - * @param array $options - * @return array - */ - public function listItems($path, $options = null) - { - $path = $this->_getFullPath($path); - $resultArray = array(); - - if (!isset($path)) { - return false; - } else { - try { - $response = $this->_imfNs->ListFolder(array( - 'folderPath' => $path, - 'pageNumber' => 1, - 'pageSize' => $this->maxPageSize, - )); - } catch (Zend_Service_Nirvanix_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); - } - - $numFiles = $response->ListFolder->TotalFileCount; - - //Add the file names to the array - if ($numFiles != 0) { - //Need to special case this as Nirvanix returns an array if there is - //more than one, but doesn't return an array if there is only one. - if ($numFiles == 1) { - $resultArray[] = (string)$response->ListFolder->File->Name; - } - else { - foreach ($response->ListFolder->File as $arrayElem) { - $resultArray[] = (string) $arrayElem->Name; - } - } - } - } - - return $resultArray; - } - - /** - * Get full path to an object - * - * @param string $path - * @return string - */ - private function _getFullPath($path) - { - return $this->_remoteDirectory . $path; - } - - /** - * Get the concrete client. - * @return Zend_Service_Nirvanix - */ - public function getClient() - { - return $this->_nirvanix; - } -} +toArray(); + } + + if (!is_array($options)) { + throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); + } + + $auth = array( + 'username' => $options[self::USERNAME], + 'password' => $options[self::PASSWORD], + 'appKey' => $options[self::APP_KEY], + ); + $nirvanix_options = array(); + if (isset($options[self::HTTP_ADAPTER])) { + $httpc = new Zend_Http_Client(); + $httpc->setAdapter($options[self::HTTP_ADAPTER]); + $nirvanix_options['httpClient'] = $httpc; + } + try { + $this->_nirvanix = new Zend_Service_Nirvanix($auth, $nirvanix_options); + $this->_remoteDirectory = $options[self::REMOTE_DIRECTORY]; + $this->_imfNs = $this->_nirvanix->getService('IMFS'); + $this->_metadataNs = $this->_nirvanix->getService('Metadata'); + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Get an item from the storage service. + * + * @param string $path + * @param array $options + * @return mixed + */ + public function fetchItem($path, $options = null) + { + $path = $this->_getFullPath($path); + try { + $item = $this->_imfNs->getContents($path); + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); + } + return $item; + } + + /** + * Store an item in the storage service. + * WARNING: This operation overwrites any item that is located at + * $destinationPath. + * @param string $destinationPath + * @param mixed $data + * @param array $options + * @return void + */ + public function storeItem($destinationPath, $data, $options = null) + { + try { + $path = $this->_getFullPath($destinationPath); + $this->_imfNs->putContents($path, $data); + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); + } + return true; + } + + /** + * Delete an item in the storage service. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteItem($path, $options = null) + { + try { + $path = $this->_getFullPath($path); + $this->_imfNs->unlink($path); + } catch(Zend_Service_Nirvanix_Exception $e) { +// if (trim(strtoupper($e->getMessage())) != 'INVALID PATH') { +// // TODO Differentiate among errors in the Nirvanix adapter + throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Copy an item in the storage service to a given path. + * WARNING: This operation is *very* expensive for services that do not + * support copying an item natively. + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function copyItem($sourcePath, $destinationPath, $options = null) + { + try { + $sourcePath = $this->_getFullPath($sourcePath); + $destinationPath = $this->_getFullPath($destinationPath); + $this->_imfNs->CopyFiles(array('srcFilePath' => $sourcePath, + 'destFolderPath' => $destinationPath)); + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Move an item in the storage service to a given path. + * WARNING: This operation is *very* expensive for services that do not + * support moving an item natively. + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function moveItem($sourcePath, $destinationPath, $options = null) + { + try { + $sourcePath = $this->_getFullPath($sourcePath); + $destinationPath = $this->_getFullPath($destinationPath); + $this->_imfNs->RenameFile(array('filePath' => $sourcePath, + 'newFileName' => $destinationPath)); + // $this->_imfNs->MoveFiles(array('srcFilePath' => $sourcePath, + // 'destFolderPath' => $destinationPath)); + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Rename an item in the storage service to a given name. + * + * + * @param string $path + * @param string $name + * @param array $options + * @return void + */ + public function renameItem($path, $name, $options = null) + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented'); + } + + /** + * Get a key/value array of metadata for the given path. + * + * @param string $path + * @param array $options + * @return array An associative array of key/value pairs specifying the metadata for this object. + * If no metadata exists, an empty array is returned. + */ + public function fetchMetadata($path, $options = null) + { + $path = $this->_getFullPath($path); + try { + $metadataNode = $this->_metadataNs->getMetadata(array('path' => $path)); + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on fetching metadata: '.$e->getMessage(), $e->getCode(), $e); + } + + $metadata = array(); + $length = count($metadataNode->Metadata); + + // Need to special case this as Nirvanix returns an array if there is + // more than one, but doesn't return an array if there is only one. + if ($length == 1) + { + $metadata[(string)$metadataNode->Metadata->Type->value] = (string)$metadataNode->Metadata->Value; + } + else if ($length > 1) + { + for ($i=0; $i<$length; $i++) + { + $metadata[(string)$metadataNode->Metadata[$i]->Type] = (string)$metadataNode->Metadata[$i]->Value; + } + } + return $metadata; + } + + /** + * Store a key/value array of metadata at the given path. + * WARNING: This operation overwrites any metadata that is located at + * $destinationPath. + * + * @param string $destinationPath + * @param array $metadata associative array specifying the key/value pairs for the metadata. + * @param array $options + * @return void + */ + public function storeMetadata($destinationPath, $metadata, $options = null) + { + $destinationPath = $this->_getFullPath($destinationPath); + if ($metadata != null) { + try { + foreach ($metadata AS $key=>$value) { + $metadataString = $key . ":" . $value; + $this->_metadataNs->SetMetadata(array( + 'path' => $destinationPath, + 'metadata' => $metadataString, + )); + } + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on storing metadata: '.$e->getMessage(), $e->getCode(), $e); + } + } + } + + /** + * Delete a key/value array of metadata at the given path. + * + * @param string $path + * @param array $metadata - An associative array specifying the key/value pairs for the metadata + * to be deleted. If null, all metadata associated with the object will + * be deleted. + * @param array $options + * @return void + */ + public function deleteMetadata($path, $metadata = null, $options = null) + { + $path = $this->_getFullPath($path); + try { + if ($metadata == null) { + $this->_metadataNs->DeleteAllMetadata(array('path' => $path)); + } else { + foreach ($metadata AS $key=>$value) { + $this->_metadataNs->DeleteMetadata(array( + 'path' => $path, + 'metadata' => $key, + )); + } + } + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on deleting metadata: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /* + * Recursively traverse all the folders and build an array that contains + * the path names for each folder. + * + * @param string $path folder path to get the list of folders from. + * @param array& $resultArray reference to the array that contains the path names + * for each folder. + */ + private function getAllFolders($path, &$resultArray) + { + $response = $this->_imfNs->ListFolder(array( + 'folderPath' => $path, + 'pageNumber' => 1, + 'pageSize' => $this->maxPageSize, + )); + $numFolders = $response->ListFolder->TotalFolderCount; + if ($numFolders == 0) { + return; + } else { + //Need to special case this as Nirvanix returns an array if there is + //more than one, but doesn't return an array if there is only one. + if ($numFolders == 1) { + $folderPath = $response->ListFolder->Folder->Path; + array_push($resultArray, $folderPath); + $this->getAllFolders('/' . $folderPath, $resultArray); + } else { + foreach ($response->ListFolder->Folder as $arrayElem) { + $folderPath = $arrayElem->Path; + array_push($resultArray, $folderPath); + $this->getAllFolders('/' . $folderPath, $resultArray); + } + } + } + } + + /** + * Return an array of the items contained in the given path. The items + * returned are the files or objects that in the specified path. + * + * @param string $path + * @param array $options + * @return array + */ + public function listItems($path, $options = null) + { + $path = $this->_getFullPath($path); + $resultArray = array(); + + if (!isset($path)) { + return false; + } else { + try { + $response = $this->_imfNs->ListFolder(array( + 'folderPath' => $path, + 'pageNumber' => 1, + 'pageSize' => $this->maxPageSize, + )); + } catch (Zend_Service_Nirvanix_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); + } + + $numFiles = $response->ListFolder->TotalFileCount; + + //Add the file names to the array + if ($numFiles != 0) { + //Need to special case this as Nirvanix returns an array if there is + //more than one, but doesn't return an array if there is only one. + if ($numFiles == 1) { + $resultArray[] = (string)$response->ListFolder->File->Name; + } + else { + foreach ($response->ListFolder->File as $arrayElem) { + $resultArray[] = (string) $arrayElem->Name; + } + } + } + } + + return $resultArray; + } + + /** + * Get full path to an object + * + * @param string $path + * @return string + */ + private function _getFullPath($path) + { + return $this->_remoteDirectory . $path; + } + + /** + * Get the concrete client. + * @return Zend_Service_Nirvanix + */ + public function getClient() + { + return $this->_nirvanix; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,332 @@ +toArray(); + } + + if (!is_array($options) || empty($options)) { + throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); + } + + try { + $this->_rackspace = new Zend_Service_Rackspace_Files($options[self::USER], $options[self::API_KEY]); + } catch (Zend_Service_Rackspace_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); + } + + if (isset($options[self::HTTP_ADAPTER])) { + $this->_rackspace->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); + } + if (!empty($options[self::REMOTE_CONTAINER])) { + $this->_container = $options[self::REMOTE_CONTAINER]; + } + } + + /** + * Get an item from the storage service. + * + * @param string $path + * @param array $options + * @return mixed + */ + public function fetchItem($path, $options = null) + { + $item = $this->_rackspace->getObject($this->_container,$path, $options); + if (!$this->_rackspace->isSuccessful() && ($this->_rackspace->getErrorCode()!='404')) { + throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$this->_rackspace->getErrorMsg()); + } + if (!empty($item)) { + return $item->getContent(); + } else { + return false; + } + } + + /** + * Store an item in the storage service. + * + * @param string $destinationPath + * @param mixed $data + * @param array $options + * @return void + */ + public function storeItem($destinationPath, $data, $options = null) + { + $this->_rackspace->storeObject($this->_container,$destinationPath,$data,$options); + if (!$this->_rackspace->isSuccessful()) { + throw new Zend_Cloud_StorageService_Exception('Error on store: '.$this->_rackspace->getErrorMsg()); + } + } + + /** + * Delete an item in the storage service. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteItem($path, $options = null) + { + $this->_rackspace->deleteObject($this->_container,$path); + if (!$this->_rackspace->isSuccessful()) { + throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$this->_rackspace->getErrorMsg()); + } + } + + /** + * Copy an item in the storage service to a given path. + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function copyItem($sourcePath, $destinationPath, $options = null) + { + $this->_rackspace->copyObject($this->_container,$sourcePath,$this->_container,$destinationPath,$options); + if (!$this->_rackspace->isSuccessful()) { + throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$this->_rackspace->getErrorMsg()); + } + } + + /** + * Move an item in the storage service to a given path. + * WARNING: This operation is *very* expensive for services that do not + * support moving an item natively. + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function moveItem($sourcePath, $destinationPath, $options = null) + { + try { + $this->copyItem($sourcePath, $destinationPath, $options); + } catch (Zend_Service_Rackspace_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage()); + } + try { + $this->deleteItem($sourcePath); + } catch (Zend_Service_Rackspace_Exception $e) { + $this->deleteItem($destinationPath); + throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage()); + } + } + + /** + * Rename an item in the storage service to a given name. + * + * @param string $path + * @param string $name + * @param array $options + * @return void + */ + public function renameItem($path, $name, $options = null) + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented'); + } + + /** + * Get a key/value array of metadata for the given path. + * + * @param string $path + * @param array $options + * @return array An associative array of key/value pairs specifying the metadata for this object. + * If no metadata exists, an empty array is returned. + */ + public function fetchMetadata($path, $options = null) + { + $result = $this->_rackspace->getMetadataObject($this->_container,$path); + if (!$this->_rackspace->isSuccessful()) { + throw new Zend_Cloud_StorageService_Exception('Error on fetch metadata: '.$this->_rackspace->getErrorMsg()); + } + $metadata = array(); + if (isset($result['metadata'])) { + $metadata = $result['metadata']; + } + // delete the self::DELETE_METADATA_KEY - this is a trick to remove all + // the metadata information of an object (see deleteMetadata). + // Rackspace doesn't have an API to remove the metadata of an object + unset($metadata[self::DELETE_METADATA_KEY]); + return $metadata; + } + + /** + * Store a key/value array of metadata at the given path. + * WARNING: This operation overwrites any metadata that is located at + * $destinationPath. + * + * @param string $destinationPath + * @param array $metadata associative array specifying the key/value pairs for the metadata. + * @param array $options + * @return void + */ + public function storeMetadata($destinationPath, $metadata, $options = null) + { + $this->_rackspace->setMetadataObject($this->_container, $destinationPath, $metadata); + if (!$this->_rackspace->isSuccessful()) { + throw new Zend_Cloud_StorageService_Exception('Error on store metadata: '.$this->_rackspace->getErrorMsg()); + } + } + + /** + * Delete a key/value array of metadata at the given path. + * + * @param string $path + * @param array $metadata - An associative array specifying the key/value pairs for the metadata + * to be deleted. If null, all metadata associated with the object will + * be deleted. + * @param array $options + * @return void + */ + public function deleteMetadata($path, $metadata = null, $options = null) + { + if (empty($metadata)) { + $newMetadata = array(self::DELETE_METADATA_KEY => true); + try { + $this->storeMetadata($path, $newMetadata); + } catch (Zend_Service_Rackspace_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage()); + } + } else { + try { + $oldMetadata = $this->fetchMetadata($path); + } catch (Zend_Service_Rackspace_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage()); + } + $newMetadata = array_diff_assoc($oldMetadata, $metadata); + try { + $this->storeMetadata($path, $newMetadata); + } catch (Zend_Service_Rackspace_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage()); + } + } + } + + /* + * Recursively traverse all the folders and build an array that contains + * the path names for each folder. + * + * @param string $path folder path to get the list of folders from. + * @param array& $resultArray reference to the array that contains the path names + * for each folder. + * @return void + */ + private function getAllFolders($path, &$resultArray) + { + if (!empty($path)) { + $options = array ( + 'prefix' => $path + ); + } + $files = $this->_rackspace->getObjects($this->_container,$options); + if (!$this->_rackspace->isSuccessful()) { + throw new Zend_Cloud_StorageService_Exception('Error on get all folders: '.$this->_rackspace->getErrorMsg()); + } + $resultArray = array(); + foreach ($files as $file) { + $resultArray[dirname($file->getName())] = true; + } + $resultArray = array_keys($resultArray); + } + + /** + * Return an array of the items contained in the given path. The items + * returned are the files or objects that in the specified path. + * + * @param string $path + * @param array $options + * @return array + */ + public function listItems($path, $options = null) + { + if (!empty($path)) { + $options = array ( + 'prefix' => $path + ); + } + + $files = $this->_rackspace->getObjects($this->_container,$options); + if (!$this->_rackspace->isSuccessful()) { + throw new Zend_Cloud_StorageService_Exception('Error on list items: '.$this->_rackspace->getErrorMsg()); + } + $resultArray = array(); + if (!empty($files)) { + foreach ($files as $file) { + $resultArray[] = $file->getName(); + } + } + return $resultArray; + } + + /** + * Get the concrete client. + * + * @return Zend_Service_Rackspace_File + */ + public function getClient() + { + return $this->_rackspace; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/StorageService/Adapter/S3.php --- a/web/lib/Zend/Cloud/StorageService/Adapter/S3.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/StorageService/Adapter/S3.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,327 +1,332 @@ -toArray(); - } - - if (!is_array($options)) { - throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); - } - - if (!isset($options[self::AWS_ACCESS_KEY]) || !isset($options[self::AWS_SECRET_KEY])) { - throw new Zend_Cloud_StorageService_Exception('AWS keys not specified!'); - } - - try { - $this->_s3 = new Zend_Service_Amazon_S3($options[self::AWS_ACCESS_KEY], - $options[self::AWS_SECRET_KEY]); - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); - } - - if (isset($options[self::HTTP_ADAPTER])) { - $this->_s3->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); - } - - if (isset($options[self::BUCKET_NAME])) { - $this->_defaultBucketName = $options[self::BUCKET_NAME]; - } - - if (isset($options[self::BUCKET_AS_DOMAIN])) { - $this->_defaultBucketAsDomain = $options[self::BUCKET_AS_DOMAIN]; - } - } - - /** - * Get an item from the storage service. - * - * @TODO Support streams - * - * @param string $path - * @param array $options - * @return string - */ - public function fetchItem($path, $options = array()) - { - $fullPath = $this->_getFullPath($path, $options); - try { - if (!empty($options[self::FETCH_STREAM])) { - return $this->_s3->getObjectStream($fullPath, $options[self::FETCH_STREAM]); - } else { - return $this->_s3->getObject($fullPath); - } - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Store an item in the storage service. - * - * WARNING: This operation overwrites any item that is located at - * $destinationPath. - * - * @TODO Support streams - * - * @param string $destinationPath - * @param string|resource $data - * @param array $options - * @return void - */ - public function storeItem($destinationPath, $data, $options = array()) - { - try { - $fullPath = $this->_getFullPath($destinationPath, $options); - return $this->_s3->putObject( - $fullPath, - $data, - empty($options[self::METADATA]) ? null : $options[self::METADATA] - ); - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Delete an item in the storage service. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteItem($path, $options = array()) - { - try { - $this->_s3->removeObject($this->_getFullPath($path, $options)); - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Copy an item in the storage service to a given path. - * - * WARNING: This operation is *very* expensive for services that do not - * support copying an item natively. - * - * @TODO Support streams for those services that don't support natively - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function copyItem($sourcePath, $destinationPath, $options = array()) - { - try { - // TODO We *really* need to add support for object copying in the S3 adapter - $item = $this->fetch($_getFullPath(sourcePath), $options); - $this->storeItem($item, $destinationPath, $options); - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Move an item in the storage service to a given path. - * - * @TODO Support streams for those services that don't support natively - * - * @param string $sourcePath - * @param string $destination path - * @param array $options - * @return void - */ - public function moveItem($sourcePath, $destinationPath, $options = array()) - { - try { - $fullSourcePath = $this->_getFullPath($sourcePath, $options); - $fullDestPath = $this->_getFullPath($destinationPath, $options); - return $this->_s3->moveObject( - $fullSourcePath, - $fullDestPath, - empty($options[self::METADATA]) ? null : $options[self::METADATA] - ); - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Rename an item in the storage service to a given name. - * - * - * @param string $path - * @param string $name - * @param array $options - * @return void - */ - public function renameItem($path, $name, $options = null) - { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('Rename not implemented'); - } - - /** - * List items in the given directory in the storage service - * - * The $path must be a directory - * - * - * @param string $path Must be a directory - * @param array $options - * @return array A list of item names - */ - public function listItems($path, $options = null) - { - try { - // TODO Support 'prefix' parameter for Zend_Service_Amazon_S3::getObjectsByBucket() - return $this->_s3->getObjectsByBucket($this->_defaultBucketName); - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Get a key/value array of metadata for the given path. - * - * @param string $path - * @param array $options - * @return array - */ - public function fetchMetadata($path, $options = array()) - { - try { - return $this->_s3->getInfo($this->_getFullPath($path, $options)); - } catch (Zend_Service_Amazon_S3_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at - * $destinationPath. - * - * @param string $destinationPath - * @param array $options - * @return void - */ - public function storeMetadata($destinationPath, $metadata, $options = array()) - { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('Storing separate metadata is not supported, use storeItem() with \'metadata\' option key'); - } - - /** - * Delete a key/value array of metadata at the given path. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteMetadata($path) - { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; - throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not supported'); - } - - /** - * Get full path, including bucket, for an object - * - * @param string $path - * @param array $options - * @return void - */ - protected function _getFullPath($path, $options) - { - if (isset($options[self::BUCKET_NAME])) { - $bucket = $options[self::BUCKET_NAME]; - } else if (isset($this->_defaultBucketName)) { - $bucket = $this->_defaultBucketName; - } else { - require_once 'Zend/Cloud/StorageService/Exception.php'; - throw new Zend_Cloud_StorageService_Exception('Bucket name must be specified for S3 adapter.'); - } - - if (isset($options[self::BUCKET_AS_DOMAIN])) { - // TODO: support bucket domain names - require_once 'Zend/Cloud/StorageService/Exception.php'; - throw new Zend_Cloud_StorageService_Exception('The S3 adapter does not currently support buckets in domain names.'); - } - - return trim($bucket) . '/' . trim($path); - } - - /** - * Get the concrete client. - * @return Zend_Service_Amazon_S3 - */ - public function getClient() - { - return $this->_s3; - } -} +toArray(); + } + + if (!is_array($options)) { + throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); + } + + if (!isset($options[self::AWS_ACCESS_KEY]) || !isset($options[self::AWS_SECRET_KEY])) { + throw new Zend_Cloud_StorageService_Exception('AWS keys not specified!'); + } + + try { + $this->_s3 = new Zend_Service_Amazon_S3($options[self::AWS_ACCESS_KEY], + $options[self::AWS_SECRET_KEY]); + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e); + } + + if (isset($options[self::HTTP_ADAPTER])) { + $this->_s3->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]); + } + + if (isset($options[self::BUCKET_NAME])) { + $this->_defaultBucketName = $options[self::BUCKET_NAME]; + } + + if (isset($options[self::BUCKET_AS_DOMAIN])) { + $this->_defaultBucketAsDomain = $options[self::BUCKET_AS_DOMAIN]; + } + } + + /** + * Get an item from the storage service. + * + * @TODO Support streams + * + * @param string $path + * @param array $options + * @return string + */ + public function fetchItem($path, $options = array()) + { + $fullPath = $this->_getFullPath($path, $options); + try { + if (!empty($options[self::FETCH_STREAM])) { + return $this->_s3->getObjectStream($fullPath, $options[self::FETCH_STREAM]); + } else { + return $this->_s3->getObject($fullPath); + } + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Store an item in the storage service. + * + * WARNING: This operation overwrites any item that is located at + * $destinationPath. + * + * @TODO Support streams + * + * @param string $destinationPath + * @param string|resource $data + * @param array $options + * @return void + */ + public function storeItem($destinationPath, $data, $options = array()) + { + try { + $fullPath = $this->_getFullPath($destinationPath, $options); + return $this->_s3->putObject( + $fullPath, + $data, + empty($options[self::METADATA]) ? null : $options[self::METADATA] + ); + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Delete an item in the storage service. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteItem($path, $options = array()) + { + try { + $this->_s3->removeObject($this->_getFullPath($path, $options)); + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Copy an item in the storage service to a given path. + * + * WARNING: This operation is *very* expensive for services that do not + * support copying an item natively. + * + * @TODO Support streams for those services that don't support natively + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function copyItem($sourcePath, $destinationPath, $options = array()) + { + try { + $fullSourcePath = $this->_getFullPath($sourcePath, $options); + $fullDestPath = $this->_getFullPath($destinationPath, $options); + return $this->_s3->copyObject( + $fullSourcePath, + $fullDestPath, + empty($options[self::METADATA]) ? null : $options[self::METADATA] + ); + + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Move an item in the storage service to a given path. + * + * @TODO Support streams for those services that don't support natively + * + * @param string $sourcePath + * @param string $destination path + * @param array $options + * @return void + */ + public function moveItem($sourcePath, $destinationPath, $options = array()) + { + try { + $fullSourcePath = $this->_getFullPath($sourcePath, $options); + $fullDestPath = $this->_getFullPath($destinationPath, $options); + return $this->_s3->moveObject( + $fullSourcePath, + $fullDestPath, + empty($options[self::METADATA]) ? null : $options[self::METADATA] + ); + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Rename an item in the storage service to a given name. + * + * + * @param string $path + * @param string $name + * @param array $options + * @return void + */ + public function renameItem($path, $name, $options = null) + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('Rename not implemented'); + } + + /** + * List items in the given directory in the storage service + * + * The $path must be a directory + * + * + * @param string $path Must be a directory + * @param array $options + * @return array A list of item names + */ + public function listItems($path, $options = null) + { + try { + // TODO Support 'prefix' parameter for Zend_Service_Amazon_S3::getObjectsByBucket() + return $this->_s3->getObjectsByBucket($this->_defaultBucketName); + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Get a key/value array of metadata for the given path. + * + * @param string $path + * @param array $options + * @return array + */ + public function fetchMetadata($path, $options = array()) + { + try { + return $this->_s3->getInfo($this->_getFullPath($path, $options)); + } catch (Zend_Service_Amazon_S3_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Store a key/value array of metadata at the given path. + * WARNING: This operation overwrites any metadata that is located at + * $destinationPath. + * + * @param string $destinationPath + * @param array $options + * @return void + */ + public function storeMetadata($destinationPath, $metadata, $options = array()) + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('Storing separate metadata is not supported, use storeItem() with \'metadata\' option key'); + } + + /** + * Delete a key/value array of metadata at the given path. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteMetadata($path) + { + require_once 'Zend/Cloud/OperationNotAvailableException.php'; + throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not supported'); + } + + /** + * Get full path, including bucket, for an object + * + * @param string $path + * @param array $options + * @return void + */ + protected function _getFullPath($path, $options) + { + if (isset($options[self::BUCKET_NAME])) { + $bucket = $options[self::BUCKET_NAME]; + } else if (isset($this->_defaultBucketName)) { + $bucket = $this->_defaultBucketName; + } else { + require_once 'Zend/Cloud/StorageService/Exception.php'; + throw new Zend_Cloud_StorageService_Exception('Bucket name must be specified for S3 adapter.'); + } + + if (isset($options[self::BUCKET_AS_DOMAIN])) { + // TODO: support bucket domain names + require_once 'Zend/Cloud/StorageService/Exception.php'; + throw new Zend_Cloud_StorageService_Exception('The S3 adapter does not currently support buckets in domain names.'); + } + + return trim($bucket) . '/' . trim($path); + } + + /** + * Get the concrete client. + * @return Zend_Service_Amazon_S3 + */ + public function getClient() + { + return $this->_s3; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php --- a/web/lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,443 +1,443 @@ -toArray(); - } - - if (!is_array($options)) { - throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); - } - - // Build Zend_Service_WindowsAzure_Storage_Blob instance - if (!isset($options[self::HOST])) { - $host = self::DEFAULT_HOST; - } else { - $host = $options[self::HOST]; - } - - if (!isset($options[self::ACCOUNT_NAME])) { - throw new Zend_Cloud_StorageService_Exception('No Windows Azure account name provided.'); - } - if (!isset($options[self::ACCOUNT_KEY])) { - throw new Zend_Cloud_StorageService_Exception('No Windows Azure account key provided.'); - } - - $this->_storageClient = new Zend_Service_WindowsAzure_Storage_Blob($host, - $options[self::ACCOUNT_NAME], $options[self::ACCOUNT_KEY]); - - // Parse other options - if (!empty($options[self::PROXY_HOST])) { - $proxyHost = $options[self::PROXY_HOST]; - $proxyPort = isset($options[self::PROXY_PORT]) ? $options[self::PROXY_PORT] : 8080; - $proxyCredentials = isset($options[self::PROXY_CREDENTIALS]) ? $options[self::PROXY_CREDENTIALS] : ''; - - $this->_storageClient->setProxy(true, $proxyHost, $proxyPort, $proxyCredentials); - } - - if (isset($options[self::HTTP_ADAPTER])) { - $this->_storageClient->setHttpClientChannel($options[self::HTTP_ADAPTER]); - } - - // Set container - $this->_container = $options[self::CONTAINER]; - - // Make sure the container exists - if (!$this->_storageClient->containerExists($this->_container)) { - $this->_storageClient->createContainer($this->_container); - } - } - - /** - * Get an item from the storage service. - * - * @param string $path - * @param array $options - * @return mixed - */ - public function fetchItem($path, $options = null) - { - // Options - $returnType = self::RETURN_STRING; - $returnPath = tempnam('', 'azr'); - $openMode = 'r'; - - // Parse options - if (is_array($options)) { - if (isset($options[self::RETURN_TYPE])) { - $returnType = $options[self::RETURN_TYPE]; - } - - if (isset($options[self::RETURN_PATHNAME])) { - $returnPath = $options[self::RETURN_PATHNAME]; - } - - if (isset($options[self::RETURN_OPENMODE])) { - $openMode = $options[self::RETURN_OPENMODE]; - } - } - - // Fetch the blob - try { - $this->_storageClient->getBlob( - $this->_container, - $path, - $returnPath - ); - } catch (Zend_Service_WindowsAzure_Exception $e) { - if (strpos($e->getMessage(), "does not exist") !== false) { - return false; - } - throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); - } - - // Return value - if ($returnType == self::RETURN_PATH) { - return $returnPath; - } - if ($returnType == self::RETURN_STRING) { - return file_get_contents($returnPath); - } - if ($returnType == self::RETURN_STREAM) { - return fopen($returnPath, $openMode); - } - } - - /** - * Store an item in the storage service. - * WARNING: This operation overwrites any item that is located at - * $destinationPath. - * @param string $destinationPath - * @param mixed $data - * @param array $options - * @return boolean - */ - public function storeItem($destinationPath, $data, $options = null) - { - // Create a temporary file that will be uploaded - $temporaryFilePath = ''; - $removeTemporaryFilePath = false; - - if (is_resource($data)) { - $temporaryFilePath = tempnam('', 'azr'); - $fpDestination = fopen($temporaryFilePath, 'w'); - - $fpSource = $data; - rewind($fpSource); - while (!feof($fpSource)) { - fwrite($fpDestination, fread($fpSource, 8192)); - } - - fclose($fpDestination); - - $removeTemporaryFilePath = true; - } elseif (file_exists($data)) { - $temporaryFilePath = $data; - $removeTemporaryFilePath = false; - } else { - $temporaryFilePath = tempnam('', 'azr'); - file_put_contents($temporaryFilePath, $data); - $removeTemporaryFilePath = true; - } - - try { - // Upload data - $this->_storageClient->putBlob( - $this->_container, - $destinationPath, - $temporaryFilePath - ); - } catch(Zend_Service_WindowsAzure_Exception $e) { - @unlink($temporaryFilePath); - throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); - } - if ($removeTemporaryFilePath) { - @unlink($temporaryFilePath); - } - } - - /** - * Delete an item in the storage service. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteItem($path, $options = null) - { - try { - $this->_storageClient->deleteBlob( - $this->_container, - $path - ); - } catch (Zend_Service_WindowsAzure_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Copy an item in the storage service to a given path. - * - * @param string $sourcePath - * @param string $destinationPath - * @param array $options - * @return void - */ - public function copyItem($sourcePath, $destinationPath, $options = null) - { - try { - $this->_storageClient->copyBlob( - $this->_container, - $sourcePath, - $this->_container, - $destinationPath - ); - } catch (Zend_Service_WindowsAzure_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Move an item in the storage service to a given path. - * - * @param string $sourcePath - * @param string $destinationPath - * @param array $options - * @return void - */ - public function moveItem($sourcePath, $destinationPath, $options = null) - { - try { - $this->_storageClient->copyBlob( - $this->_container, - $sourcePath, - $this->_container, - $destinationPath - ); - - $this->_storageClient->deleteBlob( - $this->_container, - $sourcePath - ); - } catch (Zend_Service_WindowsAzure_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); - } - - } - - /** - * Rename an item in the storage service to a given name. - * - * - * @param string $path - * @param string $name - * @param array $options - * @return void - */ - public function renameItem($path, $name, $options = null) - { - return $this->moveItem($path, $name, $options); - } - - /** - * List items in the given directory in the storage service - * - * The $path must be a directory - * - * - * @param string $path Must be a directory - * @param array $options - * @return array A list of item names - */ - public function listItems($path, $options = null) - { - // Options - $returnType = self::RETURN_NAMES; // 1: return list of paths, 2: return raw output from underlying provider - - // Parse options - if (is_array($options)&& isset($options[self::RETURN_TYPE])) { - $returnType = $options[self::RETURN_TYPE]; - } - - try { - // Fetch list - $blobList = $this->_storageClient->listBlobs( - $this->_container, - $path - ); - } catch (Zend_Service_WindowsAzure_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); - } - - // Return - if ($returnType == self::RETURN_LIST) { - return $blobList; - } - - $returnValue = array(); - foreach ($blobList as $blob) { - $returnValue[] = $blob->Name; - } - - return $returnValue; - } - - /** - * Get a key/value array of metadata for the given path. - * - * @param string $path - * @param array $options - * @return array - */ - public function fetchMetadata($path, $options = null) - { - try { - return $this->_storageClient->getBlobMetaData( - $this->_container, - $path - ); - } catch (Zend_Service_WindowsAzure_Exception $e) { - if (strpos($e->getMessage(), "could not be accessed") !== false) { - return false; - } - throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Store a key/value array of metadata at the given path. - * WARNING: This operation overwrites any metadata that is located at - * $destinationPath. - * - * @param string $destinationPath - * @param array $options - * @return void - */ - public function storeMetadata($destinationPath, $metadata, $options = null) - { - try { - $this->_storageClient->setBlobMetadata($this->_container, $destinationPath, $metadata); - } catch (Zend_Service_WindowsAzure_Exception $e) { - if (strpos($e->getMessage(), "could not be accessed") === false) { - throw new Zend_Cloud_StorageService_Exception('Error on store metadata: '.$e->getMessage(), $e->getCode(), $e); - } - } - } - - /** - * Delete a key/value array of metadata at the given path. - * - * @param string $path - * @param array $options - * @return void - */ - public function deleteMetadata($path, $options = null) - { - try { - $this->_storageClient->setBlobMetadata($this->_container, $destinationPath, array()); - } catch (Zend_Service_WindowsAzure_Exception $e) { - if (strpos($e->getMessage(), "could not be accessed") === false) { - throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage(), $e->getCode(), $e); - } - } - } - - /** - * Delete container - * - * @return void - */ - public function deleteContainer() - { - try { - $this->_storageClient->deleteContainer($this->_container); - } catch (Zend_Service_WindowsAzure_Exception $e) { - throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); - } - } - - /** - * Get the concrete adapter. - * @return Zend_Service_Azure_Storage_Blob - */ - public function getClient() - { - return $this->_storageClient; - } -} +toArray(); + } + + if (!is_array($options)) { + throw new Zend_Cloud_StorageService_Exception('Invalid options provided'); + } + + // Build Zend_Service_WindowsAzure_Storage_Blob instance + if (!isset($options[self::HOST])) { + $host = self::DEFAULT_HOST; + } else { + $host = $options[self::HOST]; + } + + if (!isset($options[self::ACCOUNT_NAME])) { + throw new Zend_Cloud_StorageService_Exception('No Windows Azure account name provided.'); + } + if (!isset($options[self::ACCOUNT_KEY])) { + throw new Zend_Cloud_StorageService_Exception('No Windows Azure account key provided.'); + } + + $this->_storageClient = new Zend_Service_WindowsAzure_Storage_Blob($host, + $options[self::ACCOUNT_NAME], $options[self::ACCOUNT_KEY]); + + // Parse other options + if (!empty($options[self::PROXY_HOST])) { + $proxyHost = $options[self::PROXY_HOST]; + $proxyPort = isset($options[self::PROXY_PORT]) ? $options[self::PROXY_PORT] : 8080; + $proxyCredentials = isset($options[self::PROXY_CREDENTIALS]) ? $options[self::PROXY_CREDENTIALS] : ''; + + $this->_storageClient->setProxy(true, $proxyHost, $proxyPort, $proxyCredentials); + } + + if (isset($options[self::HTTP_ADAPTER])) { + $this->_storageClient->setHttpClientChannel($options[self::HTTP_ADAPTER]); + } + + // Set container + $this->_container = $options[self::CONTAINER]; + + // Make sure the container exists + if (!$this->_storageClient->containerExists($this->_container)) { + $this->_storageClient->createContainer($this->_container); + } + } + + /** + * Get an item from the storage service. + * + * @param string $path + * @param array $options + * @return mixed + */ + public function fetchItem($path, $options = null) + { + // Options + $returnType = self::RETURN_STRING; + $returnPath = tempnam('', 'azr'); + $openMode = 'r'; + + // Parse options + if (is_array($options)) { + if (isset($options[self::RETURN_TYPE])) { + $returnType = $options[self::RETURN_TYPE]; + } + + if (isset($options[self::RETURN_PATHNAME])) { + $returnPath = $options[self::RETURN_PATHNAME]; + } + + if (isset($options[self::RETURN_OPENMODE])) { + $openMode = $options[self::RETURN_OPENMODE]; + } + } + + // Fetch the blob + try { + $this->_storageClient->getBlob( + $this->_container, + $path, + $returnPath + ); + } catch (Zend_Service_WindowsAzure_Exception $e) { + if (strpos($e->getMessage(), "does not exist") !== false) { + return false; + } + throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); + } + + // Return value + if ($returnType == self::RETURN_PATH) { + return $returnPath; + } + if ($returnType == self::RETURN_STRING) { + return file_get_contents($returnPath); + } + if ($returnType == self::RETURN_STREAM) { + return fopen($returnPath, $openMode); + } + } + + /** + * Store an item in the storage service. + * WARNING: This operation overwrites any item that is located at + * $destinationPath. + * @param string $destinationPath + * @param mixed $data + * @param array $options + * @return boolean + */ + public function storeItem($destinationPath, $data, $options = null) + { + // Create a temporary file that will be uploaded + $temporaryFilePath = ''; + $removeTemporaryFilePath = false; + + if (is_resource($data)) { + $temporaryFilePath = tempnam('', 'azr'); + $fpDestination = fopen($temporaryFilePath, 'w'); + + $fpSource = $data; + rewind($fpSource); + while (!feof($fpSource)) { + fwrite($fpDestination, fread($fpSource, 8192)); + } + + fclose($fpDestination); + + $removeTemporaryFilePath = true; + } elseif (file_exists($data)) { + $temporaryFilePath = $data; + $removeTemporaryFilePath = false; + } else { + $temporaryFilePath = tempnam('', 'azr'); + file_put_contents($temporaryFilePath, $data); + $removeTemporaryFilePath = true; + } + + try { + // Upload data + $this->_storageClient->putBlob( + $this->_container, + $destinationPath, + $temporaryFilePath + ); + } catch(Zend_Service_WindowsAzure_Exception $e) { + @unlink($temporaryFilePath); + throw new Zend_Cloud_StorageService_Exception('Error on store: '.$e->getMessage(), $e->getCode(), $e); + } + if ($removeTemporaryFilePath) { + @unlink($temporaryFilePath); + } + } + + /** + * Delete an item in the storage service. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteItem($path, $options = null) + { + try { + $this->_storageClient->deleteBlob( + $this->_container, + $path + ); + } catch (Zend_Service_WindowsAzure_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Copy an item in the storage service to a given path. + * + * @param string $sourcePath + * @param string $destinationPath + * @param array $options + * @return void + */ + public function copyItem($sourcePath, $destinationPath, $options = null) + { + try { + $this->_storageClient->copyBlob( + $this->_container, + $sourcePath, + $this->_container, + $destinationPath + ); + } catch (Zend_Service_WindowsAzure_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on copy: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Move an item in the storage service to a given path. + * + * @param string $sourcePath + * @param string $destinationPath + * @param array $options + * @return void + */ + public function moveItem($sourcePath, $destinationPath, $options = null) + { + try { + $this->_storageClient->copyBlob( + $this->_container, + $sourcePath, + $this->_container, + $destinationPath + ); + + $this->_storageClient->deleteBlob( + $this->_container, + $sourcePath + ); + } catch (Zend_Service_WindowsAzure_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage(), $e->getCode(), $e); + } + + } + + /** + * Rename an item in the storage service to a given name. + * + * + * @param string $path + * @param string $name + * @param array $options + * @return void + */ + public function renameItem($path, $name, $options = null) + { + return $this->moveItem($path, $name, $options); + } + + /** + * List items in the given directory in the storage service + * + * The $path must be a directory + * + * + * @param string $path Must be a directory + * @param array $options + * @return array A list of item names + */ + public function listItems($path, $options = null) + { + // Options + $returnType = self::RETURN_NAMES; // 1: return list of paths, 2: return raw output from underlying provider + + // Parse options + if (is_array($options)&& isset($options[self::RETURN_TYPE])) { + $returnType = $options[self::RETURN_TYPE]; + } + + try { + // Fetch list + $blobList = $this->_storageClient->listBlobs( + $this->_container, + $path + ); + } catch (Zend_Service_WindowsAzure_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on list: '.$e->getMessage(), $e->getCode(), $e); + } + + // Return + if ($returnType == self::RETURN_LIST) { + return $blobList; + } + + $returnValue = array(); + foreach ($blobList as $blob) { + $returnValue[] = $blob->Name; + } + + return $returnValue; + } + + /** + * Get a key/value array of metadata for the given path. + * + * @param string $path + * @param array $options + * @return array + */ + public function fetchMetadata($path, $options = null) + { + try { + return $this->_storageClient->getBlobMetaData( + $this->_container, + $path + ); + } catch (Zend_Service_WindowsAzure_Exception $e) { + if (strpos($e->getMessage(), "could not be accessed") !== false) { + return false; + } + throw new Zend_Cloud_StorageService_Exception('Error on fetch: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Store a key/value array of metadata at the given path. + * WARNING: This operation overwrites any metadata that is located at + * $destinationPath. + * + * @param string $destinationPath + * @param array $options + * @return void + */ + public function storeMetadata($destinationPath, $metadata, $options = null) + { + try { + $this->_storageClient->setBlobMetadata($this->_container, $destinationPath, $metadata); + } catch (Zend_Service_WindowsAzure_Exception $e) { + if (strpos($e->getMessage(), "could not be accessed") === false) { + throw new Zend_Cloud_StorageService_Exception('Error on store metadata: '.$e->getMessage(), $e->getCode(), $e); + } + } + } + + /** + * Delete a key/value array of metadata at the given path. + * + * @param string $path + * @param array $options + * @return void + */ + public function deleteMetadata($path, $options = null) + { + try { + $this->_storageClient->setBlobMetadata($this->_container, $destinationPath, array()); + } catch (Zend_Service_WindowsAzure_Exception $e) { + if (strpos($e->getMessage(), "could not be accessed") === false) { + throw new Zend_Cloud_StorageService_Exception('Error on delete metadata: '.$e->getMessage(), $e->getCode(), $e); + } + } + } + + /** + * Delete container + * + * @return void + */ + public function deleteContainer() + { + try { + $this->_storageClient->deleteContainer($this->_container); + } catch (Zend_Service_WindowsAzure_Exception $e) { + throw new Zend_Cloud_StorageService_Exception('Error on delete: '.$e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Get the concrete adapter. + * @return Zend_Service_Azure_Storage_Blob + */ + public function getClient() + { + return $this->_storageClient; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Cloud/StorageService/Exception.php --- a/web/lib/Zend/Cloud/StorageService/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Cloud/StorageService/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,38 +1,38 @@ -setConstant($const); + } + + return $this; + } + + /** * setProperty() * * @param array|Zend_CodeGenerator_Php_Property $property @@ -296,6 +316,9 @@ throw new Zend_CodeGenerator_Php_Exception('setProperty() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); } + if ($property->isConst()) { + return $this->setConstant($property); + } if (isset($this->_properties[$propertyName])) { require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('A property by name ' . $propertyName . ' already exists in this class.'); @@ -306,6 +329,37 @@ } /** + * setConstant() + * + * @param array|Zend_CodeGenerator_Php_Property $const + * @return Zend_CodeGenerator_Php_Class + */ + public function setConstant($const) + { + if (is_array($const)) { + $const = new Zend_CodeGenerator_Php_Property($const); + $constName = $const->getName(); + } elseif ($const instanceof Zend_CodeGenerator_Php_Property) { + $constName = $const->getName(); + } else { + require_once 'Zend/CodeGenerator/Php/Exception.php'; + throw new Zend_CodeGenerator_Php_Exception('setConstant() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); + } + + if (!$const->isConst()) { + require_once 'Zend/CodeGenerator/Php/Exception.php'; + throw new Zend_CodeGenerator_Php_Exception('setProperty() expects argument to define a constant'); + } + if (isset($this->_constants[$constName])) { + require_once 'Zend/CodeGenerator/Php/Exception.php'; + throw new Zend_CodeGenerator_Php_Exception('A constant by name ' . $constName . ' already exists in this class.'); + } + + $this->_constants[$constName] = $const; + return $this; + } + + /** * getProperties() * * @return array @@ -316,6 +370,16 @@ } /** + * getConstants() + * + * @return array + */ + public function getConstants() + { + return $this->_constants; + } + + /** * getProperty() * * @param string $propertyName @@ -332,6 +396,22 @@ } /** + * getConstant() + * + * @param string $constName + * @return Zend_CodeGenerator_Php_Property + */ + public function getConstant($constName) + { + foreach ($this->_constants as $const) { + if ($const->getName() == $constName) { + return $const; + } + } + return false; + } + + /** * hasProperty() * * @param string $propertyName @@ -343,6 +423,17 @@ } /** + * hasConstant() + * + * @param string $constName + * @return bool + */ + public function hasConstant($constName) + { + return isset($this->_constants[$constName]); + } + + /** * setMethods() * * @param array $methods @@ -437,6 +528,12 @@ } } + foreach ($this->_constants as $constant) { + if ($constant->isSourceDirty()) { + return true; + } + } + foreach ($this->_methods as $method) { if ($method->isSourceDirty()) { return true; @@ -481,6 +578,13 @@ $output .= self::LINE_FEED . '{' . self::LINE_FEED . self::LINE_FEED; + $constants = $this->getConstants(); + if (!empty($constants)) { + foreach ($constants as $const) { + $output .= $const->generate() . self::LINE_FEED . self::LINE_FEED; + } + } + $properties = $this->getProperties(); if (!empty($properties)) { foreach ($properties as $property) { @@ -507,6 +611,7 @@ protected function _init() { $this->_properties = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_PROPERTY); + $this->_constants = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_PROPERTY); $this->_methods = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_METHOD); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Docblock.php --- a/web/lib/Zend/CodeGenerator/Php/Docblock.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Docblock.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docblock.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Docblock.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract @@ -211,7 +211,11 @@ $content = wordwrap($content, 80, self::LINE_FEED); $lines = explode(self::LINE_FEED, $content); foreach ($lines as $line) { - $output .= $indent . ' * ' . $line . self::LINE_FEED; + $output .= $indent . ' *'; + if ($line) { + $output .= " $line"; + } + $output .= self::LINE_FEED; } $output .= $indent . ' */' . self::LINE_FEED; return $output; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Docblock/Tag.php --- a/web/lib/Zend/CodeGenerator/Php/Docblock/Tag.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Docblock/Tag.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,30 +15,20 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tag.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_CodeGenerator_Abstract + * @see Zend_CodeGenerator_Php_Abstract */ require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** - * @see Zend_CodeGenerator_Php_Docblock_Tag_Param - */ -require_once 'Zend/CodeGenerator/Php/Docblock/Tag/Param.php'; - -/** - * @see Zend_CodeGenerator_Php_Docblock_Tag_Return - */ -require_once 'Zend/CodeGenerator/Php/Docblock/Tag/Return.php'; - -/** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstract @@ -178,7 +168,11 @@ */ public function generate() { - return '@' . $this->_name . ' ' . $this->_description; + $tag = '@' . $this->_name; + if ($this->_description) { + $tag .= ' ' . $this->_description; + } + return $tag; } -} \ No newline at end of file +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php --- a/web/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: License.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: License.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php_Docblock_Tag diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Docblock/Tag/Param.php --- a/web/lib/Zend/CodeGenerator/Php/Docblock/Tag/Param.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Docblock/Tag/Param.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Param.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Param.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_Docblock_Tag @@ -53,7 +53,7 @@ * fromReflection() * * @param Zend_Reflection_Docblock_Tag $reflectionTagParam - * @return Zend_CodeGenerator_Php_Docblock_Tag_Param + * @return Zend_CodeGenerator_Php_Docblock_Tag */ public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTagParam) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php --- a/web/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Return.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Return.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_Docblock_Tag diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Exception.php --- a/web/lib/Zend/CodeGenerator/Php/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Exception extends Zend_CodeGenerator_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/File.php --- a/web/lib/Zend/CodeGenerator/Php/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract @@ -97,7 +97,7 @@ } /** - * fromReflectedFilePath() - use this if you intend on generating code generation objects based on the same file. + * fromReflectedFileName() - use this if you intend on generating code generation objects based on the same file. * This will keep previous changes to the file in tact during the same PHP process * * @param string $filePath @@ -110,7 +110,7 @@ $realpath = realpath($filePath); if ($realpath === false) { - if ( ($realpath = Zend_Reflection_file::findRealpathInIncludePath($filePath)) === false) { + if ( ($realpath = Zend_Reflection_File::findRealpathInIncludePath($filePath)) === false) { require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('No file for ' . $realpath . ' was found.'); } @@ -394,7 +394,7 @@ // if there are markers, put the body into the output $body = $this->getBody(); - if (preg_match('#/\* Zend_CodeGenerator_Php_File-(.*?)Marker:#', $body)) { + if (preg_match('#/\* Zend_CodeGenerator_Php_File-(.*?)Marker#', $body)) { $output .= $body; $body = ''; } @@ -428,6 +428,9 @@ $classes = $this->getClasses(); if (!empty($classes)) { foreach ($classes as $class) { + if($this->getDocblock() == $class->getDocblock()) { + $class->setDocblock(null); + } $regex = str_replace('?', $class->getName(), self::$_markerClass); $regex = preg_quote($regex, '#'); if (preg_match('#'.$regex.'#', $output)) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Member/Abstract.php --- a/web/lib/Zend/CodeGenerator/Php/Member/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Member/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator_Php_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Member/Container.php --- a/web/lib/Zend/CodeGenerator/Php/Member/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Member/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Member_Container extends ArrayObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Method.php --- a/web/lib/Zend/CodeGenerator/Php/Method.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Method.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Method.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstract @@ -220,10 +220,12 @@ $output .= ')' . self::LINE_FEED . $indent . '{' . self::LINE_FEED; - if ($this->_body) { + if ($this->_body && $this->isSourceDirty()) { $output .= ' ' . str_replace(self::LINE_FEED, self::LINE_FEED . $indent . $indent, trim($this->_body)) . self::LINE_FEED; + } elseif ($this->_body) { + $output .= $this->_body . self::LINE_FEED; } $output .= $indent . '}' . self::LINE_FEED; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Parameter.php --- a/web/lib/Zend/CodeGenerator/Php/Parameter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Parameter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 21889 2010-04-16 18:40:50Z juokaz $ + * @version $Id: Parameter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php --- a/web/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage Php - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultValue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DefaultValue.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage Php - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Parameter_DefaultValue diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Property.php --- a/web/lib/Zend/CodeGenerator/Php/Property.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Property.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Property.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Property.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/CodeGenerator/Php/Property/DefaultValue.php --- a/web/lib/Zend/CodeGenerator/Php/Property/DefaultValue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/CodeGenerator/Php/Property/DefaultValue.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultValue.php 21979 2010-04-24 11:07:11Z jan $ + * @version $Id: DefaultValue.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Php_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config.php --- a/web/lib/Zend/Config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Config.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config implements Countable, Iterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Exception.php --- a/web/lib/Zend/Config/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Exception extends Zend_Exception {} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Ini.php --- a/web/lib/Zend/Config/Ini.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Ini.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ini.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ini.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Ini extends Zend_Config @@ -83,16 +83,17 @@ * * The $options parameter may be provided as either a boolean or an array. * If provided as a boolean, this sets the $allowModifications option of - * Zend_Config. If provided as an array, there are two configuration + * Zend_Config. If provided as an array, there are three configuration * directives that may be set. For example: * * $options = array( * 'allowModifications' => false, - * 'nestSeparator' => '->' + * 'nestSeparator' => ':', + * 'skipExtends' => false, * ); * * @param string $filename - * @param string|null $section + * @param mixed $section * @param boolean|array $options * @throws Zend_Config_Exception * @return void @@ -157,11 +158,11 @@ $this->_loadedSection = $section; } - + /** * Load the INI file from disk using parse_ini_file(). Use a private error * handler to convert any loading errors into a Zend_Config_Exception - * + * * @param string $filename * @throws Zend_Config_Exception * @return array @@ -171,7 +172,7 @@ set_error_handler(array($this, '_loadFileErrorHandler')); $iniArray = parse_ini_file($filename, true); // Warnings and errors are suppressed restore_error_handler(); - + // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { /** @@ -180,7 +181,7 @@ require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } - + return $iniArray; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Json.php --- a/web/lib/Zend/Config/Json.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Json.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 23294 2010-11-05 00:27:34Z ramon $ + * @version $Id: Json.php 24810 2012-05-17 21:20:12Z rob $ */ /** @@ -220,7 +220,9 @@ { foreach ($this->_getConstants() as $constant) { if (strstr($value, $constant)) { - $value = str_replace($constant, constant($constant), $value); + // handle backslashes that may represent windows path names for instance + $replacement = str_replace('\\', '\\\\', constant($constant)); + $value = str_replace($constant, $replacement, $value); } } return $value; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Writer.php --- a/web/lib/Zend/Config/Writer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Writer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Writer.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Config_Writer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Writer/Array.php --- a/web/lib/Zend/Config/Writer/Array.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Writer/Array.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Writer_Array extends Zend_Config_Writer_FileAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Writer/FileAbstract.php --- a/web/lib/Zend/Config/Writer/FileAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Writer/FileAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Config * @package Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * * @category Zend * @package Zend_package - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FileAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Writer/Ini.php --- a/web/lib/Zend/Config/Writer/Ini.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Writer/Ini.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ini.php 21983 2010-04-25 08:09:09Z jan $ + * @version $Id: Ini.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Writer_Ini extends Zend_Config_Writer_FileAbstract @@ -161,11 +161,11 @@ throw new Zend_Config_Exception('Value can not contain double quotes "'); } } - + /** * Root elements that are not assigned to any section needs to be * on the top of config. - * + * * @see http://framework.zend.com/issues/browse/ZF-6289 * @param Zend_Config * @return Zend_Config @@ -174,7 +174,7 @@ { $configArray = $config->toArray(); $sections = array(); - + // remove sections from config array foreach ($configArray as $key => $value) { if (is_array($value)) { @@ -182,12 +182,12 @@ unset($configArray[$key]); } } - + // readd sections to the end foreach ($sections as $key => $value) { $configArray[$key] = $value; } - + return new Zend_Config($configArray); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Writer/Json.php --- a/web/lib/Zend/Config/Writer/Json.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Writer/Json.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 23294 2010-11-05 00:27:34Z ramon $ + * @version $Id: Json.php 23293 2010-11-04 23:40:23Z ramon $ */ /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Writer/Xml.php --- a/web/lib/Zend/Config/Writer/Xml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Writer/Xml.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Writer_Xml extends Zend_Config_Writer_FileAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Writer/Yaml.php --- a/web/lib/Zend/Config/Writer/Yaml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Writer/Yaml.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yaml.php 23294 2010-11-05 00:27:34Z ramon $ + * @version $Id: Yaml.php 23650 2011-01-21 21:32:57Z mikaelkael $ */ /** @@ -57,7 +57,7 @@ /** * Set callback for decoding YAML * - * @param $yamlEncoder the decoder to set + * @param callable $yamlEncoder the decoder to set * @return Zend_Config_Yaml */ public function setYamlEncoder($yamlEncoder) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Xml.php --- a/web/lib/Zend/Config/Xml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Xml.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Xml extends Zend_Config @@ -58,10 +58,20 @@ * * Note that the keys in $section will override any keys of the same * name in the sections that have been included via "extends". + * + * The $options parameter may be provided as either a boolean or an array. + * If provided as a boolean, this sets the $allowModifications option of + * Zend_Config. If provided as an array, there are two configuration + * directives that may be set. For example: * - * @param string $xml XML file or string to process - * @param mixed $section Section to process - * @param boolean $options Whether modifications are allowed at runtime + * $options = array( + * 'allowModifications' => false, + * 'skipExtends' => false + * ); + * + * @param string $xml XML file or string to process + * @param mixed $section Section to process + * @param array|boolean $options * @throws Zend_Config_Exception When xml is not set or cannot be loaded * @throws Zend_Config_Exception When section $sectionName cannot be found in $xml */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Config/Yaml.php --- a/web/lib/Zend/Config/Yaml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Config/Yaml.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yaml.php 23294 2010-11-05 00:27:34Z ramon $ + * @version $Id: Yaml.php 25169 2012-12-22 12:23:11Z rob $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Config_Yaml extends Zend_Config @@ -93,7 +93,7 @@ /** * Set callback for decoding YAML * - * @param $yamlDecoder the decoder to set + * @param callable $yamlDecoder the decoder to set * @return Zend_Config_Yaml */ public function setYamlDecoder($yamlDecoder) @@ -124,9 +124,9 @@ * - skip_extends: whether or not to skip processing of parent configuration * - yaml_decoder: a callback to use to decode the Yaml source * - * @param string $yaml YAML file to process - * @param mixed $section Section to process - * @param boolean $options Whether modifiacations are allowed at runtime + * @param string $yaml YAML file to process + * @param mixed $section Section to process + * @param array|boolean $options */ public function __construct($yaml, $section = null, $options = false) { @@ -201,7 +201,10 @@ foreach ($section as $sectionName) { if (!isset($config[$sectionName])) { require_once 'Zend/Config/Exception.php'; - throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); + throw new Zend_Config_Exception(sprintf( + 'Section "%s" cannot be found', + implode(' ', (array)$section) + )); } $dataArray = array_merge($this->_processExtends($config, $sectionName), $dataArray); @@ -210,7 +213,10 @@ } else { if (!isset($config[$section])) { require_once 'Zend/Config/Exception.php'; - throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); + throw new Zend_Config_Exception(sprintf( + 'Section "%s" cannot be found', + implode(' ', (array)$section) + )); } $dataArray = $this->_processExtends($config, $section); @@ -284,14 +290,13 @@ $config = array(); $inIndent = false; while (list($n, $line) = each($lines)) { - $lineno = $n+1; + $lineno = $n + 1; + + $line = rtrim(preg_replace("/#.*$/", "", $line)); if (strlen($line) == 0) { continue; } - if ($line[0] == '#') { - // comment - continue; - } + $indent = strspn($line, " "); // line without the spaces @@ -311,20 +316,12 @@ $inIndent = true; } - if (preg_match("/(\w+):\s*(.*)/", $line, $m)) { + if (preg_match("/(?!-)([\w\-]+):\s*(.*)/", $line, $m)) { // key: value - if ($m[2]) { + if (strlen($m[2])) { // simple key: value - $value = $m[2]; - // Check for booleans and constants - if (preg_match('/^(t(rue)?|on|y(es)?)$/i', $value)) { - $value = true; - } elseif (preg_match('/^(f(alse)?|off|n(o)?)$/i', $value)) { - $value = false; - } elseif (!self::$_ignoreConstants) { - // test for constants - $value = self::_replaceConstants($value); - } + $value = preg_replace("/#.*$/", "", $m[2]); + $value = self::_parseValue($value); } else { // key: and then values on new lines $value = self::_decodeYaml($currentIndent + 1, $lines); @@ -337,7 +334,9 @@ // item in the list: // - FOO if (strlen($line) > 2) { - $config[] = substr($line, 2); + $value = substr($line, 2); + + $config[] = self::_parseValue($value); } else { $config[] = self::_decodeYaml($currentIndent + 1, $lines); } @@ -353,6 +352,40 @@ } /** + * Parse values + * + * @param string $value + * @return string + */ + protected static function _parseValue($value) + { + $value = trim($value); + + // remove quotes from string. + if ('"' == $value['0']) { + if ('"' == $value[count($value) -1]) { + $value = substr($value, 1, -1); + } + } elseif ('\'' == $value['0'] && '\'' == $value[count($value) -1]) { + $value = strtr($value, array("''" => "'", "'" => '')); + } + + // Check for booleans and constants + if (preg_match('/^(t(rue)?|on|y(es)?)$/i', $value)) { + $value = true; + } elseif (preg_match('/^(f(alse)?|off|n(o)?)$/i', $value)) { + $value = false; + } elseif (strcasecmp($value, 'null') === 0) { + $value = null; + } elseif (!self::$_ignoreConstants) { + // test for constants + $value = self::_replaceConstants($value); + } + + return $value; + } + + /** * Replace any constants referenced in a string with their values * * @param string $value diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Console/Getopt.php --- a/web/lib/Zend/Console/Getopt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Console/Getopt.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Getopt.php 22191 2010-05-17 21:50:14Z jan $ + * @version $Id: Getopt.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -80,7 +80,7 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version Release: @package_version@ * @since Class available since Release 0.6.0 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Console/Getopt/Exception.php --- a/web/lib/Zend/Console/Getopt/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Console/Getopt/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Console_Getopt_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action.php --- a/web/lib/Zend/Controller/Action.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Action.php 22792 2010-08-05 18:30:27Z matthew $ + * @version $Id: Action.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interface @@ -505,14 +505,18 @@ $this->_classMethods = get_class_methods($this); } - // preDispatch() didn't change the action, so we can continue - if ($this->getInvokeArg('useCaseSensitiveActions') || in_array($action, $this->_classMethods)) { - if ($this->getInvokeArg('useCaseSensitiveActions')) { - trigger_error('Using case sensitive actions without word separators is deprecated; please do not rely on this "feature"'); + // If pre-dispatch hooks introduced a redirect then stop dispatch + // @see ZF-7496 + if (!($this->getResponse()->isRedirect())) { + // preDispatch() didn't change the action, so we can continue + if ($this->getInvokeArg('useCaseSensitiveActions') || in_array($action, $this->_classMethods)) { + if ($this->getInvokeArg('useCaseSensitiveActions')) { + trigger_error('Using case sensitive actions without word separators is deprecated; please do not rely on this "feature"'); + } + $this->$action(); + } else { + $this->__call($action, array()); } - $this->$action(); - } else { - $this->__call($action, array()); } $this->postDispatch(); } @@ -579,8 +583,24 @@ */ protected function _getParam($paramName, $default = null) { + return $this->getParam($paramName, $default); + } + + /** + * Gets a parameter from the {@link $_request Request object}. If the + * parameter does not exist, NULL will be returned. + * + * If the parameter does not exist and $default is set, then + * $default will be returned instead of NULL. + * + * @param string $paramName + * @param mixed $default + * @return mixed + */ + public function getParam($paramName, $default = null) + { $value = $this->getRequest()->getParam($paramName); - if ((null === $value || '' === $value) && (null !== $default)) { + if ((null === $value || '' === $value) && (null !== $default)) { $value = $default; } @@ -593,9 +613,23 @@ * @param string $paramName * @param mixed $value * @return Zend_Controller_Action + * @deprecated Deprecated as of Zend Framework 1.7. Use + * setParam() instead. */ protected function _setParam($paramName, $value) { + return $this->setParam($paramName, $value); + } + + /** + * Set a parameter in the {@link $_request Request object}. + * + * @param string $paramName + * @param mixed $value + * @return Zend_Controller_Action + */ + public function setParam($paramName, $value) + { $this->getRequest()->setParam($paramName, $value); return $this; @@ -607,9 +641,23 @@ * * @param string $paramName * @return boolean + * @deprecated Deprecated as of Zend Framework 1.7. Use + * hasParam() instead. */ protected function _hasParam($paramName) { + return $this->hasParam($paramName); + } + + /** + * Determine whether a given parameter exists in the + * {@link $_request Request object}. + * + * @param string $paramName + * @return boolean + */ + public function hasParam($paramName) + { return null !== $this->getRequest()->getParam($paramName); } @@ -618,9 +666,22 @@ * as an associative array. * * @return array + * @deprecated Deprecated as of Zend Framework 1.7. Use + * getAllParams() instead. */ protected function _getAllParams() { + return $this->getAllParams(); + } + + /** + * Return all parameters in the {@link $_request Request object} + * as an associative array. + * + * @return array + */ + public function getAllParams() + { return $this->getRequest()->getParams(); } @@ -650,9 +711,42 @@ * @param string $module * @param array $params * @return void + * @deprecated Deprecated as of Zend Framework 1.7. Use + * forward() instead. */ final protected function _forward($action, $controller = null, $module = null, array $params = null) { + $this->forward($action, $controller, $module, $params); + } + + /** + * Forward to another controller/action. + * + * It is important to supply the unformatted names, i.e. "article" + * rather than "ArticleController". The dispatcher will do the + * appropriate formatting when the request is received. + * + * If only an action name is provided, forwards to that action in this + * controller. + * + * If an action and controller are specified, forwards to that action and + * controller in this module. + * + * Specifying an action, controller, and module is the most specific way to + * forward. + * + * A fourth argument, $params, will be used to set the request parameters. + * If either the controller or module are unnecessary for forwarding, + * simply pass null values for them before specifying the parameters. + * + * @param string $action + * @param string $controller + * @param string $module + * @param array $params + * @return void + */ + final public function forward($action, $controller = null, $module = null, array $params = null) + { $request = $this->getRequest(); if (null !== $params) { @@ -680,9 +774,25 @@ * @param string $url * @param array $options Options to be used when redirecting * @return void + * @deprecated Deprecated as of Zend Framework 1.7. Use + * redirect() instead. */ protected function _redirect($url, array $options = array()) { + $this->redirect($url, $options); + } + + /** + * Redirect to another URL + * + * Proxies to {@link Zend_Controller_Action_Helper_Redirector::gotoUrl()}. + * + * @param string $url + * @param array $options Options to be used when redirecting + * @return void + */ + public function redirect($url, array $options = array()) + { $this->_helper->redirector->gotoUrl($url, $options); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Exception.php --- a/web/lib/Zend/Controller/Action/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Exception extends Zend_Controller_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/Abstract.php --- a/web/lib/Zend/Controller/Action/Helper/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20261 2010-01-13 18:55:25Z matthew $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action_Helper_Abstract @@ -142,13 +142,15 @@ */ public function getName() { - $full_class_name = get_class($this); - - if (strpos($full_class_name, '_') !== false) { - $helper_name = strrchr($full_class_name, '_'); - return ltrim($helper_name, '_'); + $fullClassName = get_class($this); + if (strpos($fullClassName, '_') !== false) { + $helperName = strrchr($fullClassName, '_'); + return ltrim($helperName, '_'); + } elseif (strpos($fullClassName, '\\') !== false) { + $helperName = strrchr($fullClassName, '\\'); + return ltrim($helperName, '\\'); } else { - return $full_class_name; + return $fullClassName; } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/ActionStack.php --- a/web/lib/Zend/Controller/Action/Helper/ActionStack.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/ActionStack.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionStack.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActionStack.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/AjaxContext.php --- a/web/lib/Zend/Controller/Action/Helper/AjaxContext.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/AjaxContext.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AjaxContext.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AjaxContext.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_Helper_ContextSwitch @@ -68,7 +68,10 @@ { $this->_currentContext = null; - if (!$this->getRequest()->isXmlHttpRequest()) { + $request = $this->getRequest(); + if (!method_exists($request, 'isXmlHttpRequest') || + !$this->getRequest()->isXmlHttpRequest()) + { return; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/AutoComplete/Abstract.php --- a/web/lib/Zend/Controller/Action/Helper/AutoComplete/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/AutoComplete/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_Controller_Action_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/AutoCompleteDojo.php --- a/web/lib/Zend/Controller/Action/Helper/AutoCompleteDojo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/AutoCompleteDojo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoCompleteDojo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AutoCompleteDojo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Action_Helper_AutoComplete_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php --- a/web/lib/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoCompleteScriptaculous.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AutoCompleteScriptaculous.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Controller_Action_Helper_AutoComplete_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/Cache.php --- a/web/lib/Zend/Controller/Action/Helper/Cache.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/Cache.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Cache.php 24853 2012-05-31 23:19:27Z adamlundrigan $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Cache @@ -64,7 +64,7 @@ * @var array */ protected $_tags = array(); - + /** * Indexed map of Extensions by Controller and Action * @@ -130,16 +130,26 @@ public function removePage($relativeUrl, $recursive = false) { $cache = $this->getCache(Zend_Cache_Manager::PAGECACHE); + $encodedCacheId = $this->_encodeCacheId($relativeUrl); + if ($recursive) { $backend = $cache->getBackend(); if (($backend instanceof Zend_Cache_Backend) && method_exists($backend, 'removeRecursively') ) { - return $backend->removeRecursively($relativeUrl); + $result = $backend->removeRecursively($encodedCacheId); + if (is_null($result) ) { + $result = $backend->removeRecursively($relativeUrl); + } + return $result; } } - return $cache->remove($relativeUrl); + $result = $cache->remove($encodedCacheId); + if (is_null($result) ) { + $result = $cache->remove($relativeUrl); + } + return $result; } /** @@ -189,7 +199,7 @@ ->start($this->_encodeCacheId($reqUri), $tags, $extension); } } - + /** * Encode a Cache ID as hexadecimal. This is a workaround because Backend ID validation * is trapped in the Frontend classes. Will try to get this reversed for ZF 2.0 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/ContextSwitch.php --- a/web/lib/Zend/Controller/Action/Helper/ContextSwitch.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/ContextSwitch.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContextSwitch.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContextSwitch.php 24864 2012-06-02 00:51:50Z adamlundrigan $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action_Helper_Abstract @@ -1304,7 +1304,6 @@ if (null === $controller) { return array(); } - $action = (string) $action; $contextKey = $this->_contextKey; if (!isset($controller->$contextKey)) { @@ -1312,6 +1311,7 @@ } if (null !== $action) { + $action = (string) $action; if (isset($controller->{$contextKey}[$action])) { return $controller->{$contextKey}[$action]; } else { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/FlashMessenger.php --- a/web/lib/Zend/Controller/Action/Helper/FlashMessenger.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/FlashMessenger.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FlashMessenger.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FlashMessenger.php 24813 2012-05-22 16:49:24Z adamlundrigan $ */ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable { @@ -112,6 +112,16 @@ $this->_namespace = $namespace; return $this; } + + /** + * getNamespace() - return the current namepsace + * + * @return string + */ + public function getNamespace() + { + return $this->_namespace; + } /** * resetNamespace() - reset the namespace to the default @@ -130,17 +140,22 @@ * @param string $message * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface */ - public function addMessage($message) + public function addMessage($message, $namespace = null) { + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + if (self::$_messageAdded === false) { self::$_session->setExpirationHops(1, null, true); } if (!is_array(self::$_session->{$this->_namespace})) { - self::$_session->{$this->_namespace} = array(); + self::$_session->{$namespace} = array(); } - self::$_session->{$this->_namespace}[] = $message; + self::$_session->{$namespace}[] = $message; + self::$_messageAdded = true; return $this; } @@ -150,9 +165,13 @@ * * @return boolean */ - public function hasMessages() + public function hasMessages($namespace = null) { - return isset(self::$_messages[$this->_namespace]); + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + + return isset(self::$_messages[$namespace]); } /** @@ -160,10 +179,14 @@ * * @return array */ - public function getMessages() + public function getMessages($namespace = null) { - if ($this->hasMessages()) { - return self::$_messages[$this->_namespace]; + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + + if ($this->hasMessages($namespace)) { + return self::$_messages[$namespace]; } return array(); @@ -174,10 +197,14 @@ * * @return boolean True if messages were cleared, false if none existed */ - public function clearMessages() + public function clearMessages($namespace = null) { - if ($this->hasMessages()) { - unset(self::$_messages[$this->_namespace]); + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + + if ($this->hasMessages($namespace)) { + unset(self::$_messages[$namespace]); return true; } @@ -190,9 +217,13 @@ * * @return boolean */ - public function hasCurrentMessages() + public function hasCurrentMessages($namespace = null) { - return isset(self::$_session->{$this->_namespace}); + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + + return isset(self::$_session->{$namespace}); } /** @@ -201,10 +232,14 @@ * * @return array */ - public function getCurrentMessages() + public function getCurrentMessages($namespace = null) { - if ($this->hasCurrentMessages()) { - return self::$_session->{$this->_namespace}; + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + + if ($this->hasCurrentMessages($namespace)) { + return self::$_session->{$namespace}; } return array(); @@ -215,10 +250,14 @@ * * @return boolean */ - public function clearCurrentMessages() + public function clearCurrentMessages($namespace = null) { + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + if ($this->hasCurrentMessages()) { - unset(self::$_session->{$this->_namespace}); + unset(self::$_session->{$namespace}); return true; } @@ -230,10 +269,14 @@ * * @return ArrayObject */ - public function getIterator() + public function getIterator($namespace = null) { - if ($this->hasMessages()) { - return new ArrayObject($this->getMessages()); + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + + if ($this->hasMessages($namespace)) { + return new ArrayObject($this->getMessages($namespace)); } return new ArrayObject(); @@ -244,10 +287,14 @@ * * @return int */ - public function count() + public function count($namespace = null) { - if ($this->hasMessages()) { - return count($this->getMessages()); + if (!is_string($namespace) || $namespace == '') { + $namespace = $this->getNamespace(); + } + + if ($this->hasMessages($namespace)) { + return count($this->getMessages($namespace)); } return 0; @@ -259,8 +306,8 @@ * @param string $message * @return void */ - public function direct($message) + public function direct($message, $namespace=NULL) { - return $this->addMessage($message); + return $this->addMessage($message, $namespace); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/Json.php --- a/web/lib/Zend/Controller/Action/Helper/Json.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/Json.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Json.php 24829 2012-05-30 12:31:39Z adamlundrigan $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_Abstract @@ -53,23 +53,24 @@ * @param mixed $data * @param boolean $keepLayouts * @param boolean|array $keepLayouts + * @param boolean $encodeData Provided data is already JSON * NOTE: if boolean, establish $keepLayouts to true|false * if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false * if $keepLayouts and parmas for Zend_Json::encode are required - * then, the array can contains a 'keepLayout'=>true|false + * then, the array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false * that will not be passed to Zend_Json::encode method but will be passed * to Zend_View_Helper_Json * @throws Zend_Controller_Action_Helper_Json * @return string */ - public function encodeJson($data, $keepLayouts = false) + public function encodeJson($data, $keepLayouts = false, $encodeData = true) { /** * @see Zend_View_Helper_Json */ require_once 'Zend/View/Helper/Json.php'; $jsonHelper = new Zend_View_Helper_Json(); - $data = $jsonHelper->json($data, $keepLayouts); + $data = $jsonHelper->json($data, $keepLayouts, $encodeData); if (!$keepLayouts) { /** @@ -87,17 +88,18 @@ * * @param mixed $data * @param boolean|array $keepLayouts + * @param $encodeData Encode $data as JSON? * NOTE: if boolean, establish $keepLayouts to true|false * if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false * if $keepLayouts and parmas for Zend_Json::encode are required - * then, the array can contains a 'keepLayout'=>true|false + * then, the array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false * that will not be passed to Zend_Json::encode method but will be passed * to Zend_View_Helper_Json * @return string|void */ - public function sendJson($data, $keepLayouts = false) + public function sendJson($data, $keepLayouts = false, $encodeData = true) { - $data = $this->encodeJson($data, $keepLayouts); + $data = $this->encodeJson($data, $keepLayouts, $encodeData); $response = $this->getResponse(); $response->setBody($data); @@ -118,13 +120,14 @@ * @param mixed $data * @param boolean $sendNow * @param boolean $keepLayouts + * @param boolean $encodeData Encode $data as JSON? * @return string|void */ - public function direct($data, $sendNow = true, $keepLayouts = false) + public function direct($data, $sendNow = true, $keepLayouts = false, $encodeData = true) { if ($sendNow) { - return $this->sendJson($data, $keepLayouts); + return $this->sendJson($data, $keepLayouts, $encodeData); } - return $this->encodeJson($data, $keepLayouts); + return $this->encodeJson($data, $keepLayouts, $encodeData); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/Redirector.php --- a/web/lib/Zend/Controller/Action/Helper/Redirector.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/Redirector.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Redirector.php 23248 2010-10-26 12:45:52Z matthew $ + * @version $Id: Redirector.php 24843 2012-05-31 18:43:18Z rob $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_Helper_Abstract @@ -100,7 +100,7 @@ } /** - * Retrieve HTTP status code for {@link _redirect()} behaviour + * Set HTTP status code for {@link _redirect()} behaviour * * @param int $code * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface @@ -123,7 +123,7 @@ } /** - * Retrieve exit flag for {@link _redirect()} behaviour + * Set exit flag for {@link _redirect()} behaviour * * @param boolean $flag * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface @@ -146,7 +146,7 @@ } /** - * Retrieve 'prepend base' flag for {@link _redirect()} behaviour + * Set 'prepend base' flag for {@link _redirect()} behaviour * * @param boolean $flag * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface @@ -294,9 +294,9 @@ } } - $params['module'] = $module; - $params['controller'] = $controller; - $params['action'] = $action; + $params[$request->getModuleKey()] = $module; + $params[$request->getControllerKey()] = $controller; + $params[$request->getActionKey()] = $action; $router = $this->getFrontController()->getRouter(); $url = $router->assemble($params, 'default', true); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/Url.php --- a/web/lib/Zend/Controller/Action/Helper/Url.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/Url.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Url.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Url.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Helper/ViewRenderer.php --- a/web/lib/Zend/Controller/Action/Helper/ViewRenderer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Helper/ViewRenderer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewRenderer.php 20261 2010-01-13 18:55:25Z matthew $ + * @version $Id: ViewRenderer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -68,7 +68,7 @@ * @uses Zend_Controller_Action_Helper_Abstract * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract @@ -626,6 +626,9 @@ } elseif (null !== $action) { $vars['action'] = $action; } + + $replacePattern = array('/[^a-z0-9]+$/i', '/^[^a-z0-9]+/i'); + $vars['action'] = preg_replace($replacePattern, '', $vars['action']); $inflector = $this->getInflector(); if ($this->getNoController() || $this->getNeverController()) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/HelperBroker.php --- a/web/lib/Zend/Controller/Action/HelperBroker.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/HelperBroker.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelperBroker.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelperBroker.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_HelperBroker diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/HelperBroker/PriorityStack.php --- a/web/lib/Zend/Controller/Action/HelperBroker/PriorityStack.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/HelperBroker/PriorityStack.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PriorityStack.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PriorityStack.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggregate, ArrayAccess, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Action/Interface.php --- a/web/lib/Zend/Controller/Action/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Action/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Action_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Dispatcher/Abstract.php --- a/web/lib/Zend/Controller/Dispatcher/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Dispatcher/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Controller_Dispatcher_Interface */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Dispatcher_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Dispatcher/Exception.php --- a/web/lib/Zend/Controller/Dispatcher/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Dispatcher/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Dispatcher_Exception extends Zend_Controller_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Dispatcher/Interface.php --- a/web/lib/Zend/Controller/Dispatcher/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Dispatcher/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Dispatcher_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Dispatcher/Standard.php --- a/web/lib/Zend/Controller/Dispatcher/Standard.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Dispatcher/Standard.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Standard.php 22038 2010-04-28 18:54:22Z matthew $ + * @version $Id: Standard.php 24861 2012-06-01 23:40:13Z adamlundrigan $ */ /** Zend_Loader */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abstract @@ -257,6 +257,19 @@ } /** + * If we're in a module or prefixDefaultModule is on, we must add the module name + * prefix to the contents of $className, as getControllerClass does not do that automatically. + * We must keep a separate variable because modules are not strictly PSR-0: We need the no-module-prefix + * class name to do the class->file mapping, but the full class name to insantiate the controller + */ + $moduleClassName = $className; + if (($this->_defaultModule != $this->_curModule) + || $this->getParam('prefixDefaultModule')) + { + $moduleClassName = $this->formatClassName($this->_curModule, $className); + } + + /** * Load the controller class file */ $className = $this->loadClass($className); @@ -265,12 +278,12 @@ * Instantiate controller with request, response, and invocation * arguments; throw exception if it's not an action controller */ - $controller = new $className($request, $this->getResponse(), $this->getParams()); + $controller = new $moduleClassName($request, $this->getResponse(), $this->getParams()); if (!($controller instanceof Zend_Controller_Action_Interface) && !($controller instanceof Zend_Controller_Action)) { require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception( - 'Controller "' . $className . '" is not an instance of Zend_Controller_Action_Interface' + 'Controller "' . $moduleClassName . '" is not an instance of Zend_Controller_Action_Interface' ); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Exception.php --- a/web/lib/Zend/Controller/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Front.php --- a/web/lib/Zend/Controller/Front.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Front.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Front.php 20246 2010-01-12 21:36:08Z dasprid $ + * @version $Id: Front.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Front diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Plugin/Abstract.php --- a/web/lib/Zend/Controller/Plugin/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Plugin/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Plugin_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Plugin/ActionStack.php --- a/web/lib/Zend/Controller/Plugin/ActionStack.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Plugin/ActionStack.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionStack.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActionStack.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Plugin/Broker.php --- a/web/lib/Zend/Controller/Plugin/Broker.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Plugin/Broker.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Broker.php 20255 2010-01-13 13:23:36Z matthew $ + * @version $Id: Broker.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Controller_Plugin_Abstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract @@ -237,7 +237,7 @@ $plugin->routeStartup($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw $e; + throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); } else { $this->getResponse()->setException($e); } @@ -260,7 +260,7 @@ $plugin->routeShutdown($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw $e; + throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); } else { $this->getResponse()->setException($e); } @@ -287,7 +287,7 @@ $plugin->dispatchLoopStartup($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw $e; + throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); } else { $this->getResponse()->setException($e); } @@ -309,9 +309,11 @@ $plugin->preDispatch($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw $e; + throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); } else { $this->getResponse()->setException($e); + // skip rendering of normal dispatch give the error handler a try + $this->getRequest()->setDispatched(false); } } } @@ -331,7 +333,7 @@ $plugin->postDispatch($request); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw $e; + throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); } else { $this->getResponse()->setException($e); } @@ -353,7 +355,7 @@ $plugin->dispatchLoopShutdown(); } catch (Exception $e) { if (Zend_Controller_Front::getInstance()->throwExceptions()) { - throw $e; + throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e); } else { $this->getResponse()->setException($e); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Plugin/ErrorHandler.php --- a/web/lib/Zend/Controller/Plugin/ErrorHandler.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Plugin/ErrorHandler.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ErrorHandler.php 20246 2010-01-12 21:36:08Z dasprid $ + * @version $Id: ErrorHandler.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Controller_Plugin_ErrorHandler extends Zend_Controller_Plugin_Abstract { @@ -193,8 +193,8 @@ /** * Route shutdown hook -- Ccheck for router exceptions - * - * @param Zend_Controller_Request_Abstract $request + * + * @param Zend_Controller_Request_Abstract $request */ public function routeShutdown(Zend_Controller_Request_Abstract $request) { @@ -202,6 +202,17 @@ } /** + * Pre dispatch hook -- check for exceptions and dispatch error handler if + * necessary + * + * @param Zend_Controller_Request_Abstract $request + */ + public function preDispatch(Zend_Controller_Request_Abstract $request) + { + $this->_handleError($request); + } + + /** * Post dispatch hook -- check for exceptions and dispatch error handler if * necessary * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Plugin/PutHandler.php --- a/web/lib/Zend/Controller/Plugin/PutHandler.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Plugin/PutHandler.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PutHandler.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PutHandler.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -35,7 +35,7 @@ * * @package Zend_Controller * @subpackage Zend_Controller_Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Plugin_PutHandler extends Zend_Controller_Plugin_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Request/Abstract.php --- a/web/lib/Zend/Controller/Request/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Request/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Request_Abstract @@ -312,7 +312,7 @@ { $this->_params = $this->_params + (array) $array; - foreach ($this->_params as $key => $value) { + foreach ($array as $key => $value) { if (null === $value) { unset($this->_params[$key]); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Request/Apache404.php --- a/web/lib/Zend/Controller/Request/Apache404.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Request/Apache404.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Apache404.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Apache404.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Controller_Request_Http */ @@ -50,8 +50,8 @@ $requestUri = $_SERVER['HTTP_X_REWRITE_URL']; } elseif (isset($_SERVER['REDIRECT_URL'])) { // Check if using mod_rewrite $requestUri = $_SERVER['REDIRECT_URL']; - if (isset($_SERVER['REDIRECT_QUERYSTRING'])) { - $parseUriGetVars = $_SERVER['REDIRECT_QUERYSTRING']; + if (isset($_SERVER['REDIRECT_QUERY_STRING'])) { + $parseUriGetVars = $_SERVER['REDIRECT_QUERY_STRING']; } } elseif (isset($_SERVER['REQUEST_URI'])) { $requestUri = $_SERVER['REQUEST_URI']; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Request/Exception.php --- a/web/lib/Zend/Controller/Request/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Request/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Request_Exception extends Zend_Controller_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Request/Http.php --- a/web/lib/Zend/Controller/Request/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Request/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 23414 2010-11-20 10:56:11Z bittarman $ + * @version $Id: Http.php 24842 2012-05-31 18:31:28Z rob $ */ /** @see Zend_Controller_Request_Abstract */ @@ -390,7 +390,11 @@ public function setRequestUri($requestUri = null) { if ($requestUri === null) { - if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch + if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { + // IIS with Microsoft Rewrite Module + $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL']; + } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { + // IIS with ISAPI_Rewrite $requestUri = $_SERVER['HTTP_X_REWRITE_URL']; } elseif ( // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem) @@ -545,13 +549,13 @@ * * @return string */ - public function getBaseUrl() + public function getBaseUrl($raw = false) { if (null === $this->_baseUrl) { $this->setBaseUrl(); } - return urldecode($this->_baseUrl); + return (($raw == false) ? urldecode($this->_baseUrl) : $this->_baseUrl); } /** @@ -612,31 +616,33 @@ public function setPathInfo($pathInfo = null) { if ($pathInfo === null) { - $baseUrl = $this->getBaseUrl(); - + $baseUrl = $this->getBaseUrl(); // this actually calls setBaseUrl() & setRequestUri() + $baseUrlRaw = $this->getBaseUrl(false); + $baseUrlEncoded = urlencode($baseUrlRaw); + if (null === ($requestUri = $this->getRequestUri())) { return $this; } - + // Remove the query string from REQUEST_URI if ($pos = strpos($requestUri, '?')) { $requestUri = substr($requestUri, 0, $pos); } - $requestUri = urldecode($requestUri); - - if (null !== $baseUrl - && ((!empty($baseUrl) && 0 === strpos($requestUri, $baseUrl)) - || empty($baseUrl)) - && false === ($pathInfo = substr($requestUri, strlen($baseUrl))) - ){ - // If substr() returns false then PATH_INFO is set to an empty string - $pathInfo = ''; - } elseif (null === $baseUrl - || (!empty($baseUrl) && false === strpos($requestUri, $baseUrl)) - ) { - $pathInfo = $requestUri; + if (!empty($baseUrl) || !empty($baseUrlRaw)) { + if (strpos($requestUri, $baseUrl) === 0) { + $pathInfo = substr($requestUri, strlen($baseUrl)); + } elseif (strpos($requestUri, $baseUrlRaw) === 0) { + $pathInfo = substr($requestUri, strlen($baseUrlRaw)); + } elseif (strpos($requestUri, $baseUrlEncoded) === 0) { + $pathInfo = substr($requestUri, strlen($baseUrlEncoded)); + } else { + $pathInfo = $requestUri; + } + } else { + $pathInfo = $requestUri; } + } $this->_pathInfo = (string) $pathInfo; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Request/HttpTestCase.php --- a/web/lib/Zend/Controller/Request/HttpTestCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Request/HttpTestCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpTestCase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Request/Simple.php --- a/web/lib/Zend/Controller/Request/Simple.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Request/Simple.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Simple.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Controller_Request_Abstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Request_Simple extends Zend_Controller_Request_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Response/Abstract.php --- a/web/lib/Zend/Controller/Response/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Response/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21301 2010-03-02 23:01:19Z yoshida@zend.co.jp $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Response_Abstract @@ -257,7 +257,9 @@ } $key = array_search($headerRaw, $this->_headersRaw); - unset($this->_headersRaw[$key]); + if ($key !== false) { + unset($this->_headersRaw[$key]); + } return $this; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Response/Cli.php --- a/web/lib/Zend/Controller/Response/Cli.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Response/Cli.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cli.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cli.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @uses Zend_Controller_Response_Abstract * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Response_Cli extends Zend_Controller_Response_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Response/Exception.php --- a/web/lib/Zend/Controller/Response/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Response/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ /** * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Response_Exception extends Zend_Controller_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Response/Http.php --- a/web/lib/Zend/Controller/Response/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Response/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Response/HttpTestCase.php --- a/web/lib/Zend/Controller/Response/HttpTestCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Response/HttpTestCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpTestCase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Abstract.php --- a/web/lib/Zend/Controller/Router/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,12 +31,17 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router_Interface { /** + * URI delimiter + */ + const URI_DELIMITER = '/'; + + /** * Front controller instance * @var Zend_Controller_Front */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Exception.php --- a/web/lib/Zend/Controller/Router/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Exception extends Zend_Controller_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Interface.php --- a/web/lib/Zend/Controller/Router/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Router_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Rewrite.php --- a/web/lib/Zend/Controller/Router/Rewrite.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Rewrite.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Rewrite.php 23362 2010-11-18 17:22:41Z bittarman $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Rewrite.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ @@ -381,7 +381,7 @@ // Find the matching route $routeMatched = false; - + foreach (array_reverse($this->_routes, true) as $name => $route) { // TODO: Should be an interface method. Hack for 1.0 BC if (method_exists($route, 'isAbstract') && $route->isAbstract()) { @@ -450,6 +450,11 @@ */ public function assemble($userParams, $name = null, $reset = false, $encode = true) { + if (!is_array($userParams)) { + require_once 'Zend/Controller/Router/Exception.php'; + throw new Zend_Controller_Router_Exception('userParams must be an array'); + } + if ($name == null) { try { $name = $this->getCurrentRouteName(); @@ -458,14 +463,14 @@ } } - // Use UNION (+) in order to preserve numeric keys + // Use UNION (+) in order to preserve numeric keys $params = $userParams + $this->_globalParams; $route = $this->getRoute($name); $url = $route->assemble($params, $reset, $encode); if (!preg_match('|^[a-z]+://|', $url)) { - $url = rtrim($this->getFrontController()->getBaseUrl(), '/') . '/' . $url; + $url = rtrim($this->getFrontController()->getBaseUrl(), self::URI_DELIMITER) . self::URI_DELIMITER . $url; } return $url; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route.php --- a/web/lib/Zend/Controller/Router/Route.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Route.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Route.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ @@ -77,7 +77,7 @@ protected $_translatable = array(); protected $_urlVariable = ':'; - protected $_urlDelimiter = '/'; + protected $_urlDelimiter = self::URI_DELIMITER; protected $_regexDelimiter = '#'; protected $_defaultRegex = null; @@ -294,6 +294,9 @@ foreach ($this->_variables as $var) { if (!array_key_exists($var, $return)) { return false; + } elseif ($return[$var] == '' || $return[$var] === null) { + // Empty variable? Replace with the default value. + $return[$var] = $this->_defaults[$var]; } } @@ -344,7 +347,7 @@ $value = $this->_values[$name]; } elseif (!$reset && !$useDefault && isset($this->_wildcardData[$name])) { $value = $this->_wildcardData[$name]; - } elseif (isset($this->_defaults[$name])) { + } elseif (array_key_exists($name, $this->_defaults)) { $value = $this->_defaults[$name]; } else { require_once 'Zend/Controller/Router/Exception.php'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route/Abstract.php --- a/web/lib/Zend/Controller/Router/Route/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,12 +32,17 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_Router_Route_Interface { /** + * URI delimiter + */ + const URI_DELIMITER = '/'; + + /** * Wether this route is abstract or not * * @var boolean diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route/Chain.php --- a/web/lib/Zend/Controller/Router/Route/Chain.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route/Chain.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Chain.php 23187 2010-10-20 18:42:37Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Chain.php 25249 2013-02-06 09:54:24Z frosch $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Abstract @@ -39,7 +39,8 @@ /** * Instantiates route based on passed Zend_Config structure * - * @param Zend_Config $config Configuration object + * @param Zend_Config $config Configuration object + * @return Zend_Controller_Router_Route_Chain */ public static function getInstance(Zend_Config $config) { @@ -54,7 +55,7 @@ * @param string $separator * @return Zend_Controller_Router_Route_Chain */ - public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/') + public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = self::URI_DELIMITER) { $this->_routes[] = $route; $this->_separators[] = $separator; @@ -68,18 +69,21 @@ * Assigns and returns an array of defaults on a successful match. * * @param Zend_Controller_Request_Http $request Request to get the path info from + * @param null $partial * @return array|false An array of assigned values or a false on a mismatch */ public function match($request, $partial = null) { - $path = trim($request->getPathInfo(), '/'); - $subPath = $path; - $values = array(); + $path = trim($request->getPathInfo(), self::URI_DELIMITER); + $subPath = $path; + $values = array(); + $numRoutes = count($this->_routes); + $matchedPath = null; foreach ($this->_routes as $key => $route) { - if ($key > 0 - && $matchedPath !== null - && $subPath !== '' + if ($key > 0 + && $matchedPath !== null + && $subPath !== '' && $subPath !== false ) { $separator = substr($subPath, 0, strlen($this->_separators[$key])); @@ -99,7 +103,7 @@ $match = $request; } - $res = $route->match($match, true); + $res = $route->match($match, true, ($key == $numRoutes - 1)); if ($res === false) { return false; } @@ -126,7 +130,9 @@ /** * Assembles a URL path defined by this route * - * @param array $data An array of variable and value pairs used as parameters + * @param array $data An array of variable and value pairs used as parameters + * @param bool $reset + * @param bool $encode * @return string Route path with user submitted parameters */ public function assemble($data = array(), $reset = false, $encode = false) @@ -169,5 +175,42 @@ } } } + + /** + * Return a single parameter of route's defaults + * + * @param string $name Array key of the parameter + * @return string Previously set default + */ + public function getDefault($name) + { + $default = null; + foreach ($this->_routes as $route) { + if (method_exists($route, 'getDefault')) { + $current = $route->getDefault($name); + if (null !== $current) { + $default = $current; + } + } + } -} + return $default; + } + + /** + * Return an array of defaults + * + * @return array Route defaults + */ + public function getDefaults() + { + $defaults = array(); + foreach ($this->_routes as $route) { + if (method_exists($route, 'getDefaults')) { + $defaults = array_merge($defaults, $route->getDefaults()); + } + } + + return $defaults; + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route/Hostname.php --- a/web/lib/Zend/Controller/Router/Route/Hostname.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route/Hostname.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Hostname.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Hostname.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ @@ -302,7 +302,6 @@ } } - $hostname = implode('.', $host); $url = $scheme . '://' . $url; return $url; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route/Interface.php --- a/web/lib/Zend/Controller/Router/Route/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Controller_Router_Route_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route/Module.php --- a/web/lib/Zend/Controller/Router/Route/Module.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route/Module.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Module.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Module.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,18 +30,13 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_Abstract { /** - * URI delimiter - */ - const URI_DELIMITER = '/'; - - /** * Default values for the route (ie. module, controller, action, params) * @var array */ @@ -237,29 +232,29 @@ if (is_array($value)) { foreach ($value as $arrayValue) { $arrayValue = ($encode) ? urlencode($arrayValue) : $arrayValue; - $url .= '/' . $key; - $url .= '/' . $arrayValue; + $url .= self::URI_DELIMITER . $key; + $url .= self::URI_DELIMITER . $arrayValue; } } else { if ($encode) $value = urlencode($value); - $url .= '/' . $key; - $url .= '/' . $value; + $url .= self::URI_DELIMITER . $key; + $url .= self::URI_DELIMITER . $value; } } if (!empty($url) || $action !== $this->_defaults[$this->_actionKey]) { if ($encode) $action = urlencode($action); - $url = '/' . $action . $url; + $url = self::URI_DELIMITER . $action . $url; } if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) { if ($encode) $controller = urlencode($controller); - $url = '/' . $controller . $url; + $url = self::URI_DELIMITER . $controller . $url; } if (isset($module)) { if ($encode) $module = urlencode($module); - $url = '/' . $module . $url; + $url = self::URI_DELIMITER . $module . $url; } return ltrim($url, self::URI_DELIMITER); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route/Regex.php --- a/web/lib/Zend/Controller/Router/Route/Regex.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route/Regex.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Regex.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Regex.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Abstract @@ -74,7 +74,7 @@ public function match($path, $partial = false) { if (!$partial) { - $path = trim(urldecode($path), '/'); + $path = trim(urldecode($path), self::URI_DELIMITER); $regex = '#^' . $this->_regex . '$#i'; } else { $regex = '#^' . $this->_regex . '#i'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Controller/Router/Route/Static.php --- a/web/lib/Zend/Controller/Router/Route/Static.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Controller/Router/Route/Static.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Static.php 23210 2010-10-21 16:10:55Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Static.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_Abstract @@ -62,7 +62,7 @@ */ public function __construct($route, $defaults = array()) { - $this->_route = trim($route, '/'); + $this->_route = trim($route, self::URI_DELIMITER); $this->_defaults = (array) $defaults; } @@ -83,7 +83,7 @@ return $this->_defaults; } } else { - if (trim($path, '/') == $this->_route) { + if (trim($path, self::URI_DELIMITER) == $this->_route) { return $this->_defaults; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt.php --- a/web/lib/Zend/Crypt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crypt.php 23089 2010-10-12 17:05:31Z padraic $ + * @version $Id: Crypt.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/DiffieHellman.php --- a/web/lib/Zend/Crypt/DiffieHellman.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/DiffieHellman.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage DiffieHellman - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DiffieHellman.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: DiffieHellman.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_DiffieHellman diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/DiffieHellman/Exception.php --- a/web/lib/Zend/Crypt/DiffieHellman/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/DiffieHellman/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage DiffieHellman - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_DiffieHellman_Exception extends Zend_Crypt_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Exception.php --- a/web/lib/Zend/Crypt/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Hmac.php --- a/web/lib/Zend/Crypt/Hmac.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Hmac.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Hmac - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hmac.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hmac.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @todo Check if mhash() is a required alternative (will be PECL-only soon) * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Hmac extends Zend_Crypt diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Hmac/Exception.php --- a/web/lib/Zend/Crypt/Hmac/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Hmac/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Hmac - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Hmac_Exception extends Zend_Crypt_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Math.php --- a/web/lib/Zend/Crypt/Math.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Math.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Math.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Math.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math extends Zend_Crypt_Math_BigInteger diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Math/BigInteger.php --- a/web/lib/Zend/Crypt/Math/BigInteger.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Math/BigInteger.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BigInteger.php 23439 2010-11-23 21:10:14Z alexander $ + * @version $Id: BigInteger.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Math/BigInteger/Bcmath.php --- a/web/lib/Zend/Crypt/Math/BigInteger/Bcmath.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Math/BigInteger/Bcmath.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bcmath.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Bcmath.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Math/BigInteger/Exception.php --- a/web/lib/Zend/Crypt/Math/BigInteger/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Math/BigInteger/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger_Exception extends Zend_Crypt_Math_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Math/BigInteger/Gmp.php --- a/web/lib/Zend/Crypt/Math/BigInteger/Gmp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Math/BigInteger/Gmp.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gmp.php 23439 2010-11-23 21:10:14Z alexander $ + * @version $Id: Gmp.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Math/BigInteger/Interface.php --- a/web/lib/Zend/Crypt/Math/BigInteger/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Math/BigInteger/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Crypt_Math_BigInteger_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Math/Exception.php --- a/web/lib/Zend/Crypt/Math/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Math/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Math_Exception extends Zend_Crypt_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Rsa.php --- a/web/lib/Zend/Crypt/Rsa.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Rsa.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rsa.php 23439 2010-11-23 21:10:14Z alexander $ + * @version $Id: Rsa.php 24808 2012-05-17 19:56:09Z rob $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa @@ -71,7 +71,7 @@ { if (!extension_loaded('openssl')) { require_once 'Zend/Crypt/Rsa/Exception.php'; - throw new Zend_Crypt_Rsa_Exception('Zend_Crypt_Rsa requires openssl extention to be loaded.'); + throw new Zend_Crypt_Rsa_Exception('Zend_Crypt_Rsa requires openssl extension to be loaded.'); } // Set _hashAlgorithm property when we are sure, that openssl extension is loaded @@ -201,6 +201,13 @@ return $decrypted; } + /** + * @param array $configargs + * + * @throws Zend_Crypt_Rsa_Exception + * + * @return ArrayObject + */ public function generateKeys(array $configargs = null) { $config = null; @@ -215,6 +222,10 @@ $privateKey = null; $publicKey = null; $resource = openssl_pkey_new($config); + if (!$resource) { + require_once 'Zend/Crypt/Rsa/Exception.php'; + throw new Zend_Crypt_Rsa_Exception('Failed to generate a new private key'); + } // above fails on PHP 5.3 openssl_pkey_export($resource, $private, $passPhrase); $privateKey = new Zend_Crypt_Rsa_Key_Private($private, $passPhrase); @@ -312,6 +323,9 @@ protected function _parseConfigArgs(array $config = null) { $configs = array(); + if (isset($config['private_key_bits'])) { + $configs['private_key_bits'] = $config['private_key_bits']; + } if (isset($config['privateKeyBits'])) { $configs['private_key_bits'] = $config['privateKeyBits']; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Rsa/Exception.php --- a/web/lib/Zend/Crypt/Rsa/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Rsa/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Exception extends Zend_Crypt_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Rsa/Key.php --- a/web/lib/Zend/Crypt/Rsa/Key.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Rsa/Key.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Key.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Key.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Key implements Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Rsa/Key/Private.php --- a/web/lib/Zend/Crypt/Rsa/Key/Private.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Rsa/Key/Private.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Private.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Private.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Crypt/Rsa/Key/Public.php --- a/web/lib/Zend/Crypt/Rsa/Key/Public.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Crypt/Rsa/Key/Public.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Public.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Public.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Crypt_Rsa_Key_Public extends Zend_Crypt_Rsa_Key diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Currency.php --- a/web/lib/Zend/Currency.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Currency.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Currency.php 22708 2010-07-28 07:25:16Z thomas $ + * @version $Id: Currency.php 24855 2012-06-01 00:12:25Z adamlundrigan $ */ /** @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Currency @@ -91,6 +91,11 @@ */ public function __construct($options = null, $locale = null) { + $calloptions = $options; + if (is_array($options) && isset($options['display'])) { + $this->_options['display'] = $options['display']; + } + if (is_array($options)) { $this->setLocale($locale); $this->setFormat($options); @@ -120,10 +125,13 @@ } // Get the format - if (!empty($this->_options['symbol'])) { - $this->_options['display'] = self::USE_SYMBOL; - } else if (!empty($this->_options['currency'])) { - $this->_options['display'] = self::USE_SHORTNAME; + if ((is_array($calloptions) && !isset($calloptions['display'])) + || (!is_array($calloptions) && $this->_options['display'] == self::NO_SYMBOL)) { + if (!empty($this->_options['symbol'])) { + $this->_options['display'] = self::USE_SYMBOL; + } else if (!empty($this->_options['currency'])) { + $this->_options['display'] = self::USE_SHORTNAME; + } } } @@ -794,7 +802,7 @@ if (!class_exists($service)) { $file = str_replace('_', DIRECTORY_SEPARATOR, $service) . '.php'; if (Zend_Loader::isReadable($file)) { - Zend_Loader::loadClass($class); + Zend_Loader::loadClass($service); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Currency/CurrencyInterface.php --- a/web/lib/Zend/Currency/CurrencyInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Currency/CurrencyInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CurrencyInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: CurrencyInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Currency_CurrencyInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Currency/Exception.php --- a/web/lib/Zend/Currency/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Currency/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Currency_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Date.php --- a/web/lib/Zend/Date.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Date.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 22713 2010-07-29 11:41:56Z thomas $ + * @version $Id: Date.php 24880 2012-06-12 20:35:18Z matthew $ */ /** @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Date extends Zend_Date_DateObject @@ -1201,7 +1201,7 @@ } preg_match('/([+-]\d{2}):{0,1}\d{2}/', $zone, $match); - if (!empty($match) and ($match[count($match) - 1] <= 12) and ($match[count($match) - 1] >= -12)) { + if (!empty($match) and ($match[count($match) - 1] <= 14) and ($match[count($match) - 1] >= -12)) { $zone = "Etc/GMT"; $zone .= ($match[count($match) - 1] < 0) ? "+" : "-"; $zone .= (int) abs($match[count($match) - 1]); @@ -2107,7 +2107,10 @@ break; case self::RFC_2822: - $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4})$/', $date, $match); + $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s' + . '(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]' + . '{1}\d{4}|\w{1,20})$/', $date, $match); + if (!$result) { require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date); @@ -2641,10 +2644,8 @@ $parsed['day'] = 0; } - if (isset($parsed['year'])) { - $parsed['year'] -= 1970; - } else { - $parsed['year'] = 0; + if (!isset($parsed['year'])) { + $parsed['year'] = 1970; } } @@ -2654,7 +2655,7 @@ isset($parsed['second']) ? $parsed['second'] : 0, isset($parsed['month']) ? (1 + $parsed['month']) : 1, isset($parsed['day']) ? (1 + $parsed['day']) : 1, - isset($parsed['year']) ? (1970 + $parsed['year']) : 1970, + $parsed['year'], false), $this->getUnixTimestamp(), false); } catch (Zend_Locale_Exception $e) { if (!is_numeric($date)) { @@ -3238,7 +3239,7 @@ /** * Check if location is supported * - * @param $location array - locations array + * @param array $location locations array * @return $horizon float */ private function _checkLocation($location) @@ -3281,7 +3282,7 @@ * Returns the time of sunrise for this date and a given location as new date object * For a list of cities and correct locations use the class Zend_Date_Cities * - * @param $location array - location of sunrise + * @param array $location location of sunrise * ['horizon'] -> civil, nautic, astronomical, effective (default) * ['longitude'] -> longitude of location * ['latitude'] -> latitude of location @@ -3301,7 +3302,7 @@ * Returns the time of sunset for this date and a given location as new date object * For a list of cities and correct locations use the class Zend_Date_Cities * - * @param $location array - location of sunset + * @param array $location location of sunset * ['horizon'] -> civil, nautic, astronomical, effective (default) * ['longitude'] -> longitude of location * ['latitude'] -> latitude of location @@ -3321,7 +3322,7 @@ * Returns an array with the sunset and sunrise dates for all horizon types * For a list of cities and correct locations use the class Zend_Date_Cities * - * @param $location array - location of suninfo + * @param array $location location of suninfo * ['horizon'] -> civil, nautic, astronomical, effective (default) * ['longitude'] -> longitude of location * ['latitude'] -> latitude of location @@ -3786,7 +3787,7 @@ * Returns the day as new date object * Example: 20.May.1986 -> 20.Jan.1970 00:00:00 * - * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input + * @param Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getDay($locale = null) @@ -3798,9 +3799,9 @@ /** * Returns the calculated day * - * @param $calc string Type of calculation to make - * @param $day string|integer|Zend_Date Day to calculate, when null the actual day is calculated - * @param $locale string|Zend_Locale Locale for parsing input + * @param string $calc Type of calculation to make + * @param Zend_Date $day Day to calculate, when null the actual day is calculated + * @param Zend_Locale $locale Locale for parsing input * @return Zend_Date|integer */ private function _day($calc, $day, $locale) @@ -3929,7 +3930,7 @@ * Weekday is always from 1-7 * Example: 09-Jan-2007 -> 2 = Tuesday -> 02-Jan-1970 (when 02.01.1970 is also Tuesday) * - * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input + * @param Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getWeekday($locale = null) @@ -3947,9 +3948,9 @@ /** * Returns the calculated weekday * - * @param $calc string Type of calculation to make - * @param $weekday string|integer|array|Zend_Date Weekday to calculate, when null the actual weekday is calculated - * @param $locale string|Zend_Locale Locale for parsing input + * @param string $calc Type of calculation to make + * @param Zend_Date $weekday Weekday to calculate, when null the actual weekday is calculated + * @param Zend_Locale $locale Locale for parsing input * @return Zend_Date|integer * @throws Zend_Date_Exception */ @@ -4166,7 +4167,7 @@ * Returns the hour as new date object * Example: 02.Feb.1986 10:30:25 -> 01.Jan.1970 10:00:00 * - * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input + * @param Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getHour($locale = null) @@ -4617,7 +4618,7 @@ * Returns the week as new date object using monday as begining of the week * Example: 12.Jan.2007 -> 08.Jan.1970 00:00:00 * - * @param $locale string|Zend_Locale OPTIONAL Locale for parsing input + * @param Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date */ public function getWeek($locale = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Date/Cities.php --- a/web/lib/Zend/Date/Cities.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Date/Cities.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cities.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cities.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_Cities - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Date_Cities diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Date/DateObject.php --- a/web/lib/Zend/Date/DateObject.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Date/DateObject.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: DateObject.php 22712 2010-07-29 08:24:28Z thomas $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: DateObject.php 24880 2012-06-12 20:35:18Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_DateObject - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Date_DateObject { @@ -312,6 +312,13 @@ } if (abs($timestamp) <= 0x7FFFFFFF) { + // See ZF-11992 + // "o" will sometimes resolve to the previous year (see + // http://php.net/date ; it's part of the ISO 8601 + // standard). However, this is not desired, so replacing + // all occurrences of "o" not preceded by a backslash + // with "Y" + $format = preg_replace('/(? (boolean) Whether to use a persistent connection or not, defaults to false * protocol => (string) The network protocol, defaults to TCPIP * caseFolding => (int) style of case-alteration used for identifiers + * socket => (string) The socket or named pipe that should be used * * @param array|Zend_Config $config An array or instance of Zend_Config having configuration data * @throws Zend_Db_Adapter_Exception @@ -531,6 +532,7 @@ * @param mixed $table The table to insert data into. * @param array $bind Column-value pairs. * @return int The number of affected rows. + * @throws Zend_Db_Adapter_Exception */ public function insert($table, array $bind) { @@ -583,6 +585,7 @@ * @param array $bind Column-value pairs. * @param mixed $where UPDATE WHERE clause(s). * @return int The number of affected rows. + * @throws Zend_Db_Adapter_Exception */ public function update($table, array $bind, $where = '') { @@ -743,7 +746,7 @@ * @param string|Zend_Db_Select $sql An SQL SELECT statement. * @param mixed $bind Data to bind into SELECT placeholders. * @param mixed $fetchMode Override current fetch mode. - * @return array + * @return mixed Array, object, or scalar depending on fetch mode. */ public function fetchRow($sql, $bind = array(), $fetchMode = null) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Db2.php --- a/web/lib/Zend/Db/Adapter/Db2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Db2.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 23199 2010-10-21 14:27:06Z ralph $ + * @version $Id: Db2.php 24593 2012-01-05 20:35:02Z matthew $ * */ @@ -39,7 +39,7 @@ /** * @package Zend_Db - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -161,7 +161,7 @@ $this->_config['driver_options']['i5_naming'] = DB2_I5_NAMING_OFF; } } - + if ($this->_config['host'] !== 'localhost' && !$this->_isI5) { // if the host isn't localhost, use extended connection params $dbname = 'DRIVER={IBM DB2 ODBC DRIVER}' . diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Db2/Exception.php --- a/web/lib/Zend/Db/Adapter/Db2/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Db2/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Db2_Exception extends Zend_Db_Adapter_Exception @@ -38,7 +38,7 @@ protected $code = '00000'; protected $message = 'unknown exception'; - function __construct($message = 'unknown exception', $code = '00000', Exception $e = null) + function __construct($message = 'unknown exception', $code = '00000', Exception $e = null) { parent::__construct($message, $code, $e); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Exception.php --- a/web/lib/Zend/Db/Adapter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Exception extends Zend_Db_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Mysqli.php --- a/web/lib/Zend/Db/Adapter/Mysqli.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Mysqli.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysqli.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mysqli.php 25229 2013-01-18 08:17:21Z frosch $ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract @@ -297,6 +297,12 @@ $port = null; } + if (isset($this->_config['socket'])) { + $socket = $this->_config['socket']; + } else { + $socket = null; + } + $this->_connection = mysqli_init(); if(!empty($this->_config['driver_options'])) { @@ -320,7 +326,8 @@ $this->_config['username'], $this->_config['password'], $this->_config['dbname'], - $port + $port, + $socket ); if ($_isConnected === false || mysqli_connect_errno()) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Mysqli/Exception.php --- a/web/lib/Zend/Db/Adapter/Mysqli/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Mysqli/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Mysqli_Exception extends Zend_Db_Adapter_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Oracle.php --- a/web/lib/Zend/Db/Adapter/Oracle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Oracle.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oracle.php 21108 2010-02-19 22:36:08Z mikaelkael $ + * @version $Id: Oracle.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract @@ -147,8 +147,9 @@ public function isConnected() { return ((bool) (is_resource($this->_connection) - && get_resource_type($this->_connection) == 'oci8 connection')); - } + && (get_resource_type($this->_connection) == 'oci8 connection' + || get_resource_type($this->_connection) == 'oci8 persistent connection'))); + } /** * Force the connection to close. diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Oracle/Exception.php --- a/web/lib/Zend/Db/Adapter/Oracle/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Oracle/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Oracle_Exception extends Zend_Db_Adapter_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Abstract.php --- a/web/lib/Zend/Db/Adapter/Pdo/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Ibm.php --- a/web/lib/Zend/Db/Adapter/Pdo/Ibm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Ibm.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ibm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ibm.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php --- a/web/lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Ibm/Db2.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Db2.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Ibm_Db2 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php --- a/web/lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Ibm/Ids.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ids.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ids.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Ibm_Ids diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Mssql.php --- a/web/lib/Zend/Db/Adapter/Pdo/Mssql.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Mssql.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mssql.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mssql.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Mysql.php --- a/web/lib/Zend/Db/Adapter/Pdo/Mysql.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Mysql.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysql.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mysql.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract @@ -77,6 +77,19 @@ ); /** + * Override _dsn() and ensure that charset is incorporated in mysql + * @see Zend_Db_Adapter_Pdo_Abstract::_dsn() + */ + protected function _dsn() + { + $dsn = parent::_dsn(); + if (isset($this->_config['charset'])) { + $dsn .= ';charset=' . $this->_config['charset']; + } + return $dsn; + } + + /** * Creates a PDO object and connects to the database. * * @return void diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Oci.php --- a/web/lib/Zend/Db/Adapter/Pdo/Oci.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Oci.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oci.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Oci.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Pgsql.php --- a/web/lib/Zend/Db/Adapter/Pdo/Pgsql.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Pgsql.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pgsql.php 22788 2010-08-03 18:29:55Z ramon $ + * @version $Id: Pgsql.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Pdo/Sqlite.php --- a/web/lib/Zend/Db/Adapter/Pdo/Sqlite.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Pdo/Sqlite.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlite.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sqlite.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Sqlsrv.php --- a/web/lib/Zend/Db/Adapter/Sqlsrv.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Sqlsrv.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlsrv.php 21885 2010-04-16 15:13:40Z juokaz $ + * @version $Id: Sqlsrv.php 25077 2012-11-06 20:06:24Z rob $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract @@ -437,10 +437,10 @@ $sql = "exec sp_columns @table_name = " . $this->quoteIdentifier($tableName, true); $stmt = $this->query($sql); $result = $stmt->fetchAll(Zend_Db::FETCH_NUM); - - // ZF-7698 - $stmt->closeCursor(); + // ZF-7698 + $stmt->closeCursor(); + if (count($result) == 0) { return array(); } @@ -622,17 +622,22 @@ } else { $over = preg_replace('/\"[^,]*\".\"([^,]*)\"/i', '"inner_tbl"."$1"', $orderby); } - + // Remove ORDER BY clause from $sql $sql = preg_replace('/\s+ORDER BY(.*)/', '', $sql); - + // Add ORDER BY clause as an argument for ROW_NUMBER() $sql = "SELECT ROW_NUMBER() OVER ($over) AS \"ZEND_DB_ROWNUM\", * FROM ($sql) AS inner_tbl"; - + $start = $offset + 1; - $end = $offset + $count; - $sql = "WITH outer_tbl AS ($sql) SELECT * FROM outer_tbl WHERE \"ZEND_DB_ROWNUM\" BETWEEN $start AND $end"; + if ($count == PHP_INT_MAX) { + $sql = "WITH outer_tbl AS ($sql) SELECT * FROM outer_tbl WHERE \"ZEND_DB_ROWNUM\" >= $start"; + } + else { + $end = $offset + $count; + $sql = "WITH outer_tbl AS ($sql) SELECT * FROM outer_tbl WHERE \"ZEND_DB_ROWNUM\" BETWEEN $start AND $end"; + } } return $sql; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Adapter/Sqlsrv/Exception.php --- a/web/lib/Zend/Db/Adapter/Sqlsrv/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Adapter/Sqlsrv/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20625 2010-01-25 21:03:53Z ralph $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Adapter_Sqlsrv_Exception extends Zend_Db_Adapter_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Exception.php --- a/web/lib/Zend/Db/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Expr.php --- a/web/lib/Zend/Db/Expr.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Expr.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Expr.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Expr.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Db * @subpackage Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Expr diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Profiler.php --- a/web/lib/Zend/Db/Profiler.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Profiler.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Profiler.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Profiler.php 25127 2012-11-16 15:17:42Z rob $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler @@ -225,7 +225,9 @@ } /** - * @param integer $queryId + * Clone a profiler query + * + * @param Zend_Db_Profiler_Query $query * @return integer or null */ public function queryClone(Zend_Db_Profiler_Query $query) @@ -287,12 +289,12 @@ } /** - * Ends a query. Pass it the handle that was returned by queryStart(). + * Ends a query. Pass it the handle that was returned by queryStart(). * This will mark the query as ended and save the time. * * @param integer $queryId * @throws Zend_Db_Profiler_Exception - * @return void + * @return string Inform that a query is stored or ignored. */ public function queryEnd($queryId) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Profiler/Exception.php --- a/web/lib/Zend/Db/Profiler/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Profiler/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler_Exception extends Zend_Db_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Profiler/Firebug.php --- a/web/lib/Zend/Db/Profiler/Firebug.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Profiler/Firebug.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Firebug.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Firebug.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Db_Profiler */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Profiler/Query.php --- a/web/lib/Zend/Db/Profiler/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Profiler/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 23382 2010-11-18 22:50:50Z bittarman $ + * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Select.php --- a/web/lib/Zend/Db/Select.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Select.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 23254 2010-10-26 12:49:23Z matthew $ + * @version $Id: Select.php 24833 2012-05-30 13:29:41Z adamlundrigan $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Select @@ -207,8 +207,8 @@ * The first parameter $name can be a simple string, in which case the * correlation name is generated automatically. If you want to specify * the correlation name, the first parameter must be an associative - * array in which the key is the physical table name, and the value is - * the correlation name. For example, array('table' => 'alias'). + * array in which the key is the correlation name, and the value is + * the physical table name. For example, array('alias' => 'table'). * The correlation name is prepended to all columns fetched for this * table. * @@ -219,8 +219,8 @@ * no correlation name is generated or prepended to the columns named * in the second parameter. * - * @param array|string|Zend_Db_Expr $name The table name or an associative array relating table name to - * correlation name. + * @param array|string|Zend_Db_Expr $name The table name or an associative array + * relating correlation name to table name. * @param array|string|Zend_Db_Expr $cols The columns to select from this table. * @param string $schema The schema name to specify, if any. * @return Zend_Db_Select This Zend_Db_Select object. @@ -880,9 +880,13 @@ $join = $this->_adapter->quoteIdentifier(key($this->_parts[self::FROM]), true); $from = $this->_adapter->quoteIdentifier($this->_uniqueCorrelation($name), true); - $cond1 = $from . '.' . $cond; - $cond2 = $join . '.' . $cond; - $cond = $cond1 . ' = ' . $cond2; + $joinCond = array(); + foreach ((array)$cond as $fieldName) { + $cond1 = $from . '.' . $fieldName; + $cond2 = $join . '.' . $fieldName; + $joinCond[] = $cond1 . ' = ' . $cond2; + } + $cond = implode(' '.self::SQL_AND.' ', $joinCond); return $this->_join($type, $name, $cond, $cols, $schema); } @@ -896,7 +900,8 @@ private function _uniqueCorrelation($name) { if (is_array($name)) { - $c = end($name); + $k = key($name); + $c = is_string($k) ? $k : end($name); } else { // Extract just the last name of a qualified table name $dot = strrpos($name,'.'); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Select/Exception.php --- a/web/lib/Zend/Db/Select/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Select/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement.php --- a/web/lib/Zend/Db/Statement.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Statement.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Statement.php 24790 2012-05-10 12:28:51Z mcleod@spaceweb.nl $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface @@ -176,37 +176,40 @@ */ protected function _stripQuoted($sql) { - // get the character for delimited id quotes, - // this is usually " but in MySQL is ` - $d = $this->_adapter->quoteIdentifier('a'); - $d = $d[0]; - - // get the value used as an escaped delimited id quote, - // e.g. \" or "" or \` - $de = $this->_adapter->quoteIdentifier($d); - $de = substr($de, 1, 2); - $de = str_replace('\\', '\\\\', $de); // get the character for value quoting // this should be ' $q = $this->_adapter->quote('a'); - $q = $q[0]; - + $q = $q[0]; // get the value used as an escaped quote, // e.g. \' or '' $qe = $this->_adapter->quote($q); $qe = substr($qe, 1, 2); - $qe = str_replace('\\', '\\\\', $qe); - + $qe = preg_quote($qe); + $escapeChar = substr($qe,0,1); + // remove 'foo\'bar' + if (!empty($q)) { + $escapeChar = preg_quote($escapeChar); + // this segfaults only after 65,000 characters instead of 9,000 + $sql = preg_replace("/$q([^$q{$escapeChar}]*|($qe)*)*$q/s", '', $sql); + } + // get a version of the SQL statement with all quoted // values and delimited identifiers stripped out // remove "foo\"bar" - $sql = preg_replace("/$q($qe|\\\\{2}|[^$q])*$q/", '', $sql); - // remove 'foo\'bar' - if (!empty($q)) { - $sql = preg_replace("/$q($qe|[^$q])*$q/", '', $sql); - } + $sql = preg_replace("/\"(\\\\\"|[^\"])*\"/Us", '', $sql); + // get the character for delimited id quotes, + // this is usually " but in MySQL is ` + $d = $this->_adapter->quoteIdentifier('a'); + $d = $d[0]; + // get the value used as an escaped delimited id quote, + // e.g. \" or "" or \` + $de = $this->_adapter->quoteIdentifier($d); + $de = substr($de, 1, 2); + $de = preg_quote($de); + // Note: $de and $d where never used..., now they are: + $sql = preg_replace("/$d($de|\\\\{2}|[^$d])*$d/Us", '', $sql); return $sql; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Db2.php --- a/web/lib/Zend/Db/Statement/Db2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Db2.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Db2.php 24625 2012-02-22 21:53:40Z adamlundrigan $ */ /** @@ -30,7 +30,7 @@ * * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Db2 extends Zend_Db_Statement @@ -96,7 +96,7 @@ $datatype = DB2_CHAR; } - if (!db2_bind_param($this->_stmt, $position, "variable", $type, $datatype)) { + if (!db2_bind_param($this->_stmt, $parameter, "variable", $type, $datatype)) { /** * @see Zend_Db_Statement_Db2_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Db2/Exception.php --- a/web/lib/Zend/Db/Statement/Db2/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Db2/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Exception.php --- a/web/lib/Zend/Db/Statement/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20513 2010-01-22 07:55:48Z ralph $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Exception extends Zend_Db_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Interface.php --- a/web/lib/Zend/Db/Statement/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Db_Statement_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Mysqli.php --- a/web/lib/Zend/Db/Statement/Mysqli.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Mysqli.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysqli.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mysqli.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Mysqli/Exception.php --- a/web/lib/Zend/Db/Statement/Mysqli/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Mysqli/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Oracle.php --- a/web/lib/Zend/Db/Statement/Oracle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Oracle.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oracle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Oracle.php 24863 2012-06-02 00:22:47Z adamlundrigan $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Oracle extends Zend_Db_Statement @@ -87,7 +87,7 @@ protected function _prepare($sql) { $connection = $this->_adapter->getConnection(); - $this->_stmt = oci_parse($connection, $sql); + $this->_stmt = @oci_parse($connection, $sql); if (!$this->_stmt) { /** * @see Zend_Db_Statement_Oracle_Exception @@ -240,7 +240,7 @@ } $error = false; foreach (array_keys($params) as $name) { - if (!@oci_bind_by_name($this->_stmt, $name, $params[$name], -1)) { + if (!$this->bindParam($name, $params[$name], null, -1)) { $error = true; break; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Oracle/Exception.php --- a/web/lib/Zend/Db/Statement/Oracle/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Oracle/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Pdo.php --- a/web/lib/Zend/Db/Statement/Pdo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Pdo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pdo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggregate diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Pdo/Ibm.php --- a/web/lib/Zend/Db/Statement/Pdo/Ibm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Pdo/Ibm.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ibm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ibm.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Pdo/Oci.php --- a/web/lib/Zend/Db/Statement/Pdo/Oci.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Pdo/Oci.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oci.php 21104 2010-02-19 21:26:36Z mikaelkael $ + * @version $Id: Oci.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Pdo_Oci extends Zend_Db_Statement_Pdo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Sqlsrv.php --- a/web/lib/Zend/Db/Statement/Sqlsrv.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Sqlsrv.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlsrv.php 21887 2010-04-16 18:28:10Z juokaz $ + * @version $Id: Sqlsrv.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement @@ -376,11 +376,11 @@ require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } - - // reset column keys - $this->_keys = null; + + // reset column keys + $this->_keys = null; - return true; + return true; } /** @@ -411,8 +411,8 @@ return $num_rows; } - - /** + + /** * Returns an array containing all of the result set rows. * * @param int $style OPTIONAL Fetch mode. diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Statement/Sqlsrv/Exception.php --- a/web/lib/Zend/Db/Statement/Sqlsrv/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Statement/Sqlsrv/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Statement_Sqlsrv_Exception extends Zend_Db_Statement_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table.php --- a/web/lib/Zend/Db/Table.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Table.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table extends Zend_Db_Table_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Abstract.php --- a/web/lib/Zend/Db/Table/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21078 2010-02-18 18:07:16Z tech13 $ + * @version $Id: Abstract.php 24958 2012-06-15 13:44:04Z adamlundrigan $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Abstract @@ -70,6 +70,7 @@ const ON_UPDATE = 'onUpdate'; const CASCADE = 'cascade'; + const CASCADE_RECURSE = 'cascadeRecurse'; const RESTRICT = 'restrict'; const SET_NULL = 'setNull'; @@ -744,6 +745,7 @@ * Initialize database adapter. * * @return void + * @throws Zend_Db_Table_Exception */ protected function _setupDatabaseAdapter() { @@ -807,12 +809,23 @@ //get db configuration $dbConfig = $this->_db->getConfig(); + $port = isset($dbConfig['options']['port']) + ? ':'.$dbConfig['options']['port'] + : (isset($dbConfig['port']) + ? ':'.$dbConfig['port'] + : null); + + $host = isset($dbConfig['options']['host']) + ? ':'.$dbConfig['options']['host'] + : (isset($dbConfig['host']) + ? ':'.$dbConfig['host'] + : null); + // Define the cache identifier where the metadata are saved $cacheId = md5( // port:host/dbname:schema.table (based on availabilty) - (isset($dbConfig['options']['port']) ? ':'.$dbConfig['options']['port'] : null) - . (isset($dbConfig['options']['host']) ? ':'.$dbConfig['options']['host'] : null) - . '/'.$dbConfig['dbname'].':'.$this->_schema.'.'.$this->_name - ); + $port . $host . '/'. $dbConfig['dbname'] . ':' + . $this->_schema. '.' . $this->_name + ); } // If $this has no metadata cache or metadata cache misses @@ -873,7 +886,7 @@ // then throw an exception. if (empty($this->_primary)) { require_once 'Zend/Db/Table/Exception.php'; - throw new Zend_Db_Table_Exception('A table must have a primary key, but none was found'); + throw new Zend_Db_Table_Exception("A table must have a primary key, but none was found for table '{$this->_name}'"); } } else if (!is_array($this->_primary)) { $this->_primary = array(1 => $this->_primary); @@ -961,8 +974,9 @@ * You can elect to return only a part of this information by supplying its key name, * otherwise all information is returned as an array. * - * @param $key The specific info part to return OPTIONAL + * @param string $key The specific info part to return OPTIONAL * @return mixed + * @throws Zend_Db_Table_Exception */ public function info($key = null) { @@ -1035,14 +1049,24 @@ */ if (is_string($this->_sequence) && !isset($data[$pkIdentity])) { $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence); + $pkSuppliedBySequence = true; } /** * If the primary key can be generated automatically, and no value was * specified in the user-supplied data, then omit it from the tuple. + * + * Note: this checks for sensible values in the supplied primary key + * position of the data. The following values are considered empty: + * null, false, true, '', array() */ - if (array_key_exists($pkIdentity, $data) && $data[$pkIdentity] === null) { - unset($data[$pkIdentity]); + if (!isset($pkSuppliedBySequence) && array_key_exists($pkIdentity, $data)) { + if ($data[$pkIdentity] === null // null + || $data[$pkIdentity] === '' // empty string + || is_bool($data[$pkIdentity]) // boolean + || (is_array($data[$pkIdentity]) && empty($data[$pkIdentity]))) { // empty array + unset($data[$pkIdentity]); + } } /** @@ -1157,6 +1181,22 @@ */ public function delete($where) { + $depTables = $this->getDependentTables(); + if (!empty($depTables)) { + $resultSet = $this->fetchAll($where); + if (count($resultSet) > 0 ) { + foreach ($resultSet as $row) { + /** + * Execute cascading deletes against dependent tables + */ + foreach ($depTables as $tableClass) { + $t = self::getTableFromString($tableClass, $this); + $t->_cascadeDelete($tableClass, $row->getPrimaryKey()); + } + } + } + } + $tableSpec = ($this->_schema ? $this->_schema . '.' : '') . $this->_name; return $this->_db->delete($tableSpec, $where); } @@ -1170,27 +1210,56 @@ */ public function _cascadeDelete($parentTableClassname, array $primaryKey) { + // setup metadata $this->_setupMetadata(); + + // get this class name + $thisClass = get_class($this); + if ($thisClass === 'Zend_Db_Table') { + $thisClass = $this->_definitionConfigName; + } + $rowsAffected = 0; + foreach ($this->_getReferenceMapNormalized() as $map) { if ($map[self::REF_TABLE_CLASS] == $parentTableClassname && isset($map[self::ON_DELETE])) { - switch ($map[self::ON_DELETE]) { - case self::CASCADE: - $where = array(); - for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) { - $col = $this->_db->foldCase($map[self::COLUMNS][$i]); - $refCol = $this->_db->foldCase($map[self::REF_COLUMNS][$i]); - $type = $this->_metadata[$col]['DATA_TYPE']; - $where[] = $this->_db->quoteInto( - $this->_db->quoteIdentifier($col, true) . ' = ?', - $primaryKey[$refCol], $type); + + $where = array(); + + // CASCADE or CASCADE_RECURSE + if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) { + for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) { + $col = $this->_db->foldCase($map[self::COLUMNS][$i]); + $refCol = $this->_db->foldCase($map[self::REF_COLUMNS][$i]); + $type = $this->_metadata[$col]['DATA_TYPE']; + $where[] = $this->_db->quoteInto( + $this->_db->quoteIdentifier($col, true) . ' = ?', + $primaryKey[$refCol], $type); + } + } + + // CASCADE_RECURSE + if ($map[self::ON_DELETE] == self::CASCADE_RECURSE) { + + /** + * Execute cascading deletes against dependent tables + */ + $depTables = $this->getDependentTables(); + if (!empty($depTables)) { + foreach ($depTables as $tableClass) { + $t = self::getTableFromString($tableClass, $this); + foreach ($this->fetchAll($where) as $depRow) { + $rowsAffected += $t->_cascadeDelete($thisClass, $depRow->getPrimaryKey()); + } } - $rowsAffected += $this->delete($where); - break; - default: - // no action - break; + } } + + // CASCADE or CASCADE_RECURSE + if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) { + $rowsAffected += $this->delete($where); + } + } } return $rowsAffected; @@ -1342,10 +1411,11 @@ * * @param string|array|Zend_Db_Table_Select $where OPTIONAL An SQL WHERE clause or Zend_Db_Table_Select object. * @param string|array $order OPTIONAL An SQL ORDER clause. + * @param int $offset OPTIONAL An SQL OFFSET value. * @return Zend_Db_Table_Row_Abstract|null The row results per the * Zend_Db_Adapter fetch mode, or null if no row found. */ - public function fetchRow($where = null, $order = null) + public function fetchRow($where = null, $order = null, $offset = null) { if (!($where instanceof Zend_Db_Table_Select)) { $select = $this->select(); @@ -1358,10 +1428,10 @@ $this->_order($select, $order); } - $select->limit(1); + $select->limit(1, ((is_numeric($offset)) ? (int) $offset : null)); } else { - $select = $where->limit(1); + $select = $where->limit(1, $where->getPart(Zend_Db_Select::LIMIT_OFFSET)); } $rows = $this->_fetch($select); @@ -1507,4 +1577,38 @@ return $data; } + public static function getTableFromString($tableName, Zend_Db_Table_Abstract $referenceTable = null) + { + if ($referenceTable instanceof Zend_Db_Table_Abstract) { + $tableDefinition = $referenceTable->getDefinition(); + + if ($tableDefinition !== null && $tableDefinition->hasTableConfig($tableName)) { + return new Zend_Db_Table($tableName, $tableDefinition); + } + } + + // assume the tableName is the class name + if (!class_exists($tableName)) { + try { + require_once 'Zend/Loader.php'; + Zend_Loader::loadClass($tableName); + } catch (Zend_Exception $e) { + require_once 'Zend/Db/Table/Row/Exception.php'; + throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); + } + } + + $options = array(); + + if ($referenceTable instanceof Zend_Db_Table_Abstract) { + $options['db'] = $referenceTable->getAdapter(); + } + + if (isset($tableDefinition) && $tableDefinition !== null) { + $options[Zend_Db_Table_Abstract::DEFINITION] = $tableDefinition; + } + + return new $tableName($options); + } + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Definition.php --- a/web/lib/Zend/Db/Table/Definition.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Definition.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Definition.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Definition diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Exception.php --- a/web/lib/Zend/Db/Table/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Exception extends Zend_Db_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Row.php --- a/web/lib/Zend/Db/Table/Row.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Row.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Row.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Row.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Row extends Zend_Db_Table_Row_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Row/Abstract.php --- a/web/lib/Zend/Db/Table/Row/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Row/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22229 2010-05-21 20:55:01Z ralph $ + * @version $Id: Abstract.php 24831 2012-05-30 12:52:25Z rob $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggregate @@ -646,7 +646,7 @@ { return new ArrayIterator((array) $this->_data); } - + /** * Returns the column/value data as an array. * @@ -725,6 +725,17 @@ } /** + * Retrieves an associative array of primary keys. + * + * @param bool $useDirty + * @return array + */ + public function getPrimaryKey($useDirty = true) + { + return $this->_getPrimaryKey($useDirty); + } + + /** * Constructs where statement for retrieving row(s). * * @param bool $useDirty @@ -1167,37 +1178,7 @@ */ protected function _getTableFromString($tableName) { - - if ($this->_table instanceof Zend_Db_Table_Abstract) { - $tableDefinition = $this->_table->getDefinition(); - - if ($tableDefinition !== null && $tableDefinition->hasTableConfig($tableName)) { - return new Zend_Db_Table($tableName, $tableDefinition); - } - } - - // assume the tableName is the class name - if (!class_exists($tableName)) { - try { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($tableName); - } catch (Zend_Exception $e) { - require_once 'Zend/Db/Table/Row/Exception.php'; - throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); - } - } - - $options = array(); - - if (($table = $this->_getTable())) { - $options['db'] = $table->getAdapter(); - } - - if (isset($tableDefinition) && $tableDefinition !== null) { - $options[Zend_Db_Table_Abstract::DEFINITION] = $tableDefinition; - } - - return new $tableName($options); + return Zend_Db_Table_Abstract::getTableFromString($tableName, $this->_table); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Row/Exception.php --- a/web/lib/Zend/Db/Table/Row/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Row/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Row_Exception extends Zend_Db_Table_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Rowset.php --- a/web/lib/Zend/Db/Table/Rowset.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Rowset.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rowset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rowset.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Rowset extends Zend_Db_Table_Rowset_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Rowset/Abstract.php --- a/web/lib/Zend/Db/Table/Rowset/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Rowset/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23380 2010-11-18 22:22:28Z ralph $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Countable, ArrayAccess @@ -384,11 +384,11 @@ require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception('No row could be found at position ' . (int) $position, 0, $e); } - + if ($seek == true) { $this->seek($position); } - + return $row; } @@ -408,14 +408,14 @@ } return $this->_data; } - + protected function _loadAndReturnRow($position) { if (!isset($this->_data[$position])) { require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Data for provided position does not exist"); } - + // do we already have a row object for this position? if (empty($this->_rows[$position])) { $this->_rows[$position] = new $this->_rowClass( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Rowset/Exception.php --- a/web/lib/Zend/Db/Table/Rowset/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Rowset/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Rowset_Exception extends Zend_Db_Table_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Select.php --- a/web/lib/Zend/Db/Table/Select.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Select.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Select.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Table_Select extends Zend_Db_Select diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Db/Table/Select/Exception.php --- a/web/lib/Zend/Db/Table/Select/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Db/Table/Select/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Debug.php --- a/web/lib/Zend/Debug.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Debug.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Debug - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Debug.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Debug.php 25095 2012-11-07 20:11:07Z rob $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Debug - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -90,7 +90,12 @@ . PHP_EOL; } else { if(!extension_loaded('xdebug')) { - $output = htmlspecialchars($output, ENT_QUOTES); + $flags = ENT_QUOTES; + // PHP 5.4.0+ + if (defined('ENT_SUBSTITUTE')) { + $flags = ENT_QUOTES | ENT_SUBSTITUTE; + } + $output = htmlspecialchars($output, $flags); } $output = '
' diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo.php --- a/web/lib/Zend/Dojo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -22,9 +22,9 @@ * Enable Dojo components * * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dojo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/BuildLayer.php --- a/web/lib/Zend/Dojo/BuildLayer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/BuildLayer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BuildLayer.php 22280 2010-05-24 20:39:45Z matthew $ + * @version $Id: BuildLayer.php 25024 2012-07-30 15:08:15Z rob $ */ /** * Dojo module layer and custom build profile generation support * * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_BuildLayer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Data.php --- a/web/lib/Zend/Dojo/Data.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Data.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Data.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Data.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @uses Iterator * @uses Countable * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Exception.php --- a/web/lib/Zend/Dojo/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Exception */ @@ -27,7 +27,7 @@ * * @uses Zend_Exception * @package Zend_Dojo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form.php --- a/web/lib/Zend/Dojo/Form.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Form * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Form.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form extends Zend_Form { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/AccordionContainer.php --- a/web/lib/Zend/Dojo/Form/Decorator/AccordionContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/AccordionContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccordionContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_AccordionContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/AccordionPane.php --- a/web/lib/Zend/Dojo/Form/Decorator/AccordionPane.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/AccordionPane.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionPane.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccordionPane.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_AccordionPane extends Zend_Dojo_Form_Decorator_DijitContainer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/BorderContainer.php --- a/web/lib/Zend/Dojo/Form/Decorator/BorderContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/BorderContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BorderContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BorderContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_BorderContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/ContentPane.php --- a/web/lib/Zend/Dojo/Form/Decorator/ContentPane.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/ContentPane.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContentPane.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContentPane.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_ContentPane extends Zend_Dojo_Form_Decorator_DijitContainer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/DijitContainer.php --- a/web/lib/Zend/Dojo/Form/Decorator/DijitContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/DijitContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @uses Zend_Form_Decorator_Abstract * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DijitContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorator_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/DijitElement.php --- a/web/lib/Zend/Dojo/Form/Decorator/DijitElement.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/DijitElement.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitElement.php 20621 2010-01-25 20:25:23Z matthew $ + * @version $Id: DijitElement.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelper { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/DijitForm.php --- a/web/lib/Zend/Dojo/Form/Decorator/DijitForm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/DijitForm.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,9 +31,9 @@ * * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitForm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DijitForm.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_DijitForm extends Zend_Dojo_Form_Decorator_DijitContainer { @@ -56,6 +56,11 @@ $dijitParams = $this->getDijitParams(); $attribs = array_merge($this->getAttribs(), $this->getOptions()); + // Enforce id attribute of form for dojo events + if (!isset($attribs['name']) || !$attribs['name']) { + $element->setName(get_class($element) . '_' . uniqid()); + } + return $view->form($element->getName(), $attribs, $content); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/SplitContainer.php --- a/web/lib/Zend/Dojo/Form/Decorator/SplitContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/SplitContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SplitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SplitContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_SplitContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/StackContainer.php --- a/web/lib/Zend/Dojo/Form/Decorator/StackContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/StackContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StackContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StackContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_StackContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Decorator/TabContainer.php --- a/web/lib/Zend/Dojo/Form/Decorator/TabContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Decorator/TabContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TabContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TabContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Decorator_TabContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/DisplayGroup.php --- a/web/lib/Zend/Dojo/Form/DisplayGroup.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/DisplayGroup.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Form_DisplayGroup * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DisplayGroup.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DisplayGroup.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_DisplayGroup extends Zend_Form_DisplayGroup { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/Button.php --- a/web/lib/Zend/Dojo/Form/Element/Button.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/Button.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Button.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/CheckBox.php --- a/web/lib/Zend/Dojo/Form/Element/CheckBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/CheckBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @uses Zend_Dojo_Form_Element_Dijit * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CheckBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CheckBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/ComboBox.php --- a/web/lib/Zend/Dojo/Form/Element/ComboBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/ComboBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_DijitMulti * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ComboBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ComboBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_ComboBox extends Zend_Dojo_Form_Element_DijitMulti { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/CurrencyTextBox.php --- a/web/lib/Zend/Dojo/Form/Element/CurrencyTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/CurrencyTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_NumberTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CurrencyTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CurrencyTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_CurrencyTextBox extends Zend_Dojo_Form_Element_NumberTextBox { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/DateTextBox.php --- a/web/lib/Zend/Dojo/Form/Element/DateTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/DateTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DateTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DateTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_DateTextBox extends Zend_Dojo_Form_Element_ValidationTextBox { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/Dijit.php --- a/web/lib/Zend/Dojo/Form/Element/Dijit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/Dijit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dijit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dijit.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Dojo_Form_Element_Dijit extends Zend_Form_Element { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/DijitMulti.php --- a/web/lib/Zend/Dojo/Form/Element/DijitMulti.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/DijitMulti.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @uses Zend_Dojo_Form_Element_Dijit * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitMulti.php 22322 2010-05-30 11:12:57Z thomas $ + * @version $Id: DijitMulti.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Dojo_Form_Element_DijitMulti extends Zend_Dojo_Form_Element_Dijit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/Editor.php --- a/web/lib/Zend/Dojo/Form/Element/Editor.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/Editor.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Editor.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Editor.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_Form_Element_Dijit */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_Form_Element_Editor extends Zend_Dojo_Form_Element_Dijit @@ -247,7 +247,7 @@ { $plugin = (string) $plugin; $plugins = $this->getPlugins(); - if (in_array($plugin, $plugins)) { + if (in_array($plugin, $plugins) && $plugin !== '|') { return $this; } @@ -446,11 +446,11 @@ */ public function setMinHeight($minHeight) { - if (!preg_match('/^\d+(em)?$/i', $minHeight)) { + if (!preg_match('/^\d+(em|px|%)?$/i', $minHeight)) { require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception('Invalid minHeight provided; must be integer or CSS measurement'); } - if ('em' != substr($minHeight, -2)) { + if (!preg_match('/(em|px|%)$/', $minHeight)) { $minHeight .= 'em'; } return $this->setDijitParam('minHeight', $minHeight); @@ -596,4 +596,102 @@ } return $this->getDijitParam('updateInterval'); } + + /** + * Add a single editor extra plugin. + * + * @param string $plugin + * @return Zend_Dojo_Form_Element_Editor + */ + public function addExtraPlugin($plugin) + { + $plugin = (string) $plugin; + $extraPlugins = $this->getExtraPlugins(); + if (in_array($plugin, $extraPlugins)) { + return $this; + } + + $extraPlugins[] = (string) $plugin; + $this->setDijitParam('extraPlugins', $extraPlugins); + return $this; + } + + /** + * Add multiple extra plugins. + * + * @param array $extraPlugins + * @return Zend_Dojo_Form_Element_Editor + */ + public function addExtraPlugins(array $plugins) + { + foreach ($plugins as $plugin) { + $this->addExtraPlugin($plugin); + } + return $this; + } + + /** + * Overwrite many extra plugins at once. + * + * @param array $plugins + * @return Zend_Dojo_Form_Element_Editor + */ + public function setExtraPlugins(array $plugins) + { + $this->clearExtraPlugins(); + $this->addExtraPlugins($plugins); + return $this; + } + + /** + * Get all extra plugins. + * + * @return array + */ + public function getExtraPlugins() + { + if (!$this->hasDijitParam('extraPlugins')) { + return array(); + } + return $this->getDijitParam('extraPlugins'); + } + + /** + * Is a given extra plugin registered? + * + * @param string $plugin + * @return bool + */ + public function hasExtraPlugin($plugin) + { + $extraPlugins = $this->getExtraPlugins(); + return in_array((string) $plugin, $extraPlugins); + } + + /** + * Remove a given extra plugin. + * + * @param string $plugin + * @return Zend_Dojo_Form_Element_Editor + */ + public function removeExtraPlugin($plugin) + { + $extraPlugins = $this->getExtraPlugins(); + if (false === ($index = array_search($plugin, $extraPlugins))) { + return $this; + } + unset($extraPlugins[$index]); + $this->setDijitParam('extraPlugins', $extraPlugins); + return $this; + } + + /** + * Clear all extra plugins. + * + * @return Zend_Dojo_Form_Element_Editor + */ + public function clearExtraPlugins() + { + return $this->removeDijitParam('extraPlugins'); + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/FilteringSelect.php --- a/web/lib/Zend/Dojo/Form/Element/FilteringSelect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/FilteringSelect.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_ComboBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FilteringSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FilteringSelect.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_FilteringSelect extends Zend_Dojo_Form_Element_ComboBox { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/HorizontalSlider.php --- a/web/lib/Zend/Dojo/Form/Element/HorizontalSlider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/HorizontalSlider.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_Slider * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HorizontalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HorizontalSlider.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_HorizontalSlider extends Zend_Dojo_Form_Element_Slider { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/NumberSpinner.php --- a/web/lib/Zend/Dojo/Form/Element/NumberSpinner.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/NumberSpinner.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumberSpinner.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumberSpinner.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_NumberSpinner extends Zend_Dojo_Form_Element_ValidationTextBox { @@ -92,7 +92,7 @@ */ public function setLargeDelta($delta) { - $this->setDijitParam('largeDelta', (int) $delta); + $this->setDijitParam('largeDelta', (float) $delta); return $this; } @@ -114,7 +114,7 @@ */ public function setSmallDelta($delta) { - $this->setDijitParam('smallDelta', (int) $delta); + $this->setDijitParam('smallDelta', (float) $delta); return $this; } @@ -187,7 +187,7 @@ if ($this->hasDijitParam('constraints')) { $constraints = $this->getDijitParam('constraints'); } - $constraints['min'] = (int) $value; + $constraints['min'] = (float) $value; $this->setDijitParam('constraints', $constraints); return $this; } @@ -221,7 +221,7 @@ if ($this->hasDijitParam('constraints')) { $constraints = $this->getDijitParam('constraints'); } - $constraints['max'] = (int) $value; + $constraints['max'] = (float) $value; $this->setDijitParam('constraints', $constraints); return $this; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/NumberTextBox.php --- a/web/lib/Zend/Dojo/Form/Element/NumberTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/NumberTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumberTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumberTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_NumberTextBox extends Zend_Dojo_Form_Element_ValidationTextBox { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/PasswordTextBox.php --- a/web/lib/Zend/Dojo/Form/Element/PasswordTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/PasswordTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PasswordTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PasswordTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_PasswordTextBox extends Zend_Dojo_Form_Element_ValidationTextBox { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/RadioButton.php --- a/web/lib/Zend/Dojo/Form/Element/RadioButton.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/RadioButton.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_DijitMulti * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RadioButton.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RadioButton.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_RadioButton extends Zend_Dojo_Form_Element_DijitMulti { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/SimpleTextarea.php --- a/web/lib/Zend/Dojo/Form/Element/SimpleTextarea.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/SimpleTextarea.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimpleTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimpleTextarea.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_SimpleTextarea extends Zend_Dojo_Form_Element_Dijit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/Slider.php --- a/web/lib/Zend/Dojo/Form/Element/Slider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/Slider.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_Dijit * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Slider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Slider.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Dojo_Form_Element_Slider extends Zend_Dojo_Form_Element_Dijit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/SubmitButton.php --- a/web/lib/Zend/Dojo/Form/Element/SubmitButton.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/SubmitButton.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubmitButton.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubmitButton.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_SubmitButton extends Zend_Dojo_Form_Element_Button { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/TextBox.php --- a/web/lib/Zend/Dojo/Form/Element/TextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/TextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_TextBox extends Zend_Dojo_Form_Element_Dijit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/Textarea.php --- a/web/lib/Zend/Dojo/Form/Element/Textarea.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/Textarea.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Textarea.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_Textarea extends Zend_Dojo_Form_Element_Dijit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/TimeTextBox.php --- a/web/lib/Zend/Dojo/Form/Element/TimeTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/TimeTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_DateTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimeTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimeTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_TimeTextBox extends Zend_Dojo_Form_Element_DateTextBox { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/ValidationTextBox.php --- a/web/lib/Zend/Dojo/Form/Element/ValidationTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/ValidationTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_TextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidationTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ValidationTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_ValidationTextBox extends Zend_Dojo_Form_Element_TextBox { @@ -132,6 +132,8 @@ */ public function setConstraints(array $constraints) { + $tmp = $this->getConstraints(); + $constraints = array_merge($tmp, $constraints); array_walk_recursive($constraints, array($this, '_castBoolToString')); $this->setDijitParam('constraints', $constraints); return $this; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/Element/VerticalSlider.php --- a/web/lib/Zend/Dojo/Form/Element/VerticalSlider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/Element/VerticalSlider.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Dojo_Form_Element_Slider * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VerticalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VerticalSlider.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_Element_VerticalSlider extends Zend_Dojo_Form_Element_Slider { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/Form/SubForm.php --- a/web/lib/Zend/Dojo/Form/SubForm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/Form/SubForm.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @uses Zend_Form_SubForm * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubForm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubForm.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_Form_SubForm extends Zend_Form_SubForm { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Exception.php --- a/web/lib/Zend/Dojo/View/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Exception extends Zend_Dojo_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/AccordionContainer.php --- a/web/lib/Zend/Dojo/View/Helper/AccordionContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/AccordionContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccordionContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_AccordionContainer extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/AccordionPane.php --- a/web/lib/Zend/Dojo/View/Helper/AccordionPane.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/AccordionPane.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionPane.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccordionPane.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_AccordionPane extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/BorderContainer.php --- a/web/lib/Zend/Dojo/View/Helper/BorderContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/BorderContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BorderContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BorderContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_BorderContainer extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Button.php --- a/web/lib/Zend/Dojo/View/Helper/Button.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Button.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Button.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_Button extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/CheckBox.php --- a/web/lib/Zend/Dojo/View/Helper/CheckBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/CheckBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CheckBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CheckBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_CheckBox extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/ComboBox.php --- a/web/lib/Zend/Dojo/View/Helper/ComboBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/ComboBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ComboBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ComboBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_ComboBox extends Zend_Dojo_View_Helper_Dijit @@ -100,6 +100,10 @@ return $html; } + // required for correct type casting in declerative mode + if (isset($params['autocomplete'])) { + $params['autocomplete'] = ($params['autocomplete']) ? 'true' : 'false'; + } // do as normal select $attribs = $this->_prepareDijit($attribs, $params, 'element'); return $this->view->formSelect($id, $value, $attribs, $options); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/ContentPane.php --- a/web/lib/Zend/Dojo/View/Helper/ContentPane.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/ContentPane.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContentPane.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContentPane.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_ContentPane extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/CurrencyTextBox.php --- a/web/lib/Zend/Dojo/View/Helper/CurrencyTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/CurrencyTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CurrencyTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CurrencyTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_CurrencyTextBox extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/CustomDijit.php --- a/web/lib/Zend/Dojo/View/Helper/CustomDijit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/CustomDijit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CustomDijit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CustomDijit.php 25024 2012-07-30 15:08:15Z rob $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_CustomDijit extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/DateTextBox.php --- a/web/lib/Zend/Dojo/View/Helper/DateTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/DateTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DateTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DateTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_DateTextBox extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Dijit.php --- a/web/lib/Zend/Dojo/View/Helper/Dijit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Dijit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dijit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dijit.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_View_Helper_HtmlElement */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Abstract * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Dojo_View_Helper_Dijit extends Zend_View_Helper_HtmlElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/DijitContainer.php --- a/web/lib/Zend/Dojo/View/Helper/DijitContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/DijitContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DijitContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Dojo_View_Helper_DijitContainer extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Dojo.php --- a/web/lib/Zend/Dojo/View/Helper/Dojo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Dojo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Dojo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_Dojo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Dojo/Container.php --- a/web/lib/Zend/Dojo/View/Helper/Dojo/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Dojo/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Container.php 23368 2010-11-18 19:56:30Z bittarman $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_Dojo_Container @@ -882,7 +882,7 @@ */ public function addJavascript($js) { - $js = preg_replace('/^\s*(.*?)\s*$/s', '$1', $js); + $js = trim($js); if (!in_array(substr($js, -1), array(';', '}'))) { $js .= ';'; } @@ -1136,7 +1136,7 @@ } $onLoadActions = array(); - // Get Zend specific onLoad actions; these will always be first to + // Get Zend specific onLoad actions; these will always be first to // ensure that dijits are created in the correct order foreach ($this->_getZendLoadActions() as $callback) { $onLoadActions[] = 'dojo.addOnLoad(' . $callback . ');'; @@ -1177,12 +1177,12 @@ /** * Add an onLoad action related to ZF dijit creation * - * This method is public, but prefixed with an underscore to indicate that + * This method is public, but prefixed with an underscore to indicate that * it should not normally be called by userland code. It is pertinent to - * ensuring that the correct order of operations occurs during dijit + * ensuring that the correct order of operations occurs during dijit * creation. - * - * @param string $callback + * + * @param string $callback * @return Zend_Dojo_View_Helper_Dojo_Container */ public function _addZendLoad($callback) @@ -1195,7 +1195,7 @@ /** * Retrieve all ZF dijit callbacks - * + * * @return array */ public function _getZendLoadActions() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Editor.php --- a/web/lib/Zend/Dojo/View/Helper/Editor.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Editor.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Editor.php 20116 2010-01-07 14:18:34Z matthew $ + * @version $Id: Editor.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -32,7 +32,7 @@ * @uses Zend_Dojo_View_Helper_Textarea * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_Editor extends Zend_Dojo_View_Helper_Dijit @@ -57,14 +57,21 @@ 'fontSize' => 'FontChoice', 'formatBlock' => 'FontChoice', 'foreColor' => 'TextColor', - 'hiliteColor' => 'TextColor' + 'hiliteColor' => 'TextColor', + 'enterKeyHandling' => 'EnterKeyHandling', + 'fullScreen' => 'FullScreen', + 'newPage' => 'NewPage', + 'print' => 'Print', + 'tabIndent' => 'TabIndent', + 'toggleDir' => 'ToggleDir', + 'viewSource' => 'ViewSource' ); /** * JSON-encoded parameters * @var array */ - protected $_jsonParams = array('captureEvents', 'events', 'plugins'); + protected $_jsonParams = array('captureEvents', 'events', 'plugins', 'extraPlugins'); /** * dijit.Editor @@ -83,8 +90,8 @@ } } - // Previous versions allowed specifying "degrade" to allow using a - // textarea instead of a div -- but this is insecure. Removing the + // Previous versions allowed specifying "degrade" to allow using a + // textarea instead of a div -- but this is insecure. Removing the // parameter if set to prevent its injection in the dijit. if (isset($params['degrade'])) { unset($params['degrade']); @@ -114,17 +121,18 @@ $attribs = $this->_prepareDijit($attribs, $params, 'textarea'); - $html = '_htmlAttribs($hiddenAttribs) . $this->getClosingBracket(); - $html .= '_htmlAttribs($attribs) . '>' + $html = '_htmlAttribs($attribs) . '>' . $value . "\n"; - // Embed a textarea in a '; + $html .= '_htmlAttribs($hiddenAttribs) . $this->getClosingBracket(); + return $html; } @@ -178,7 +186,11 @@ function() { var form = zend.findParentForm(dojo.byId('$hiddenId')); dojo.connect(form, 'submit', function(e) { - dojo.byId('$hiddenId').value = dijit.byId('$editorId').getValue(false); + var value = dijit.byId('$editorId').getValue(false); + if(dojo.isFF) { + value = value.replace(/
/, ''); + } + dojo.byId('$hiddenId').value = value; }); } EOJ; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/FilteringSelect.php --- a/web/lib/Zend/Dojo/View/Helper/FilteringSelect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/FilteringSelect.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FilteringSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FilteringSelect.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_ComboBox */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_ComboBox * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_FilteringSelect extends Zend_Dojo_View_Helper_ComboBox diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Form.php --- a/web/lib/Zend/Dojo/View/Helper/Form.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Form.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Form.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_Form extends Zend_Dojo_View_Helper_Dijit @@ -70,10 +70,6 @@ $attribs['id'] = $id; } - if (false === $content) { - $content = ''; - } - $attribs = $this->_prepareDijit($attribs, array(), 'layout'); return $this->getFormHelper()->form($id, $attribs, $content); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/HorizontalSlider.php --- a/web/lib/Zend/Dojo/View/Helper/HorizontalSlider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/HorizontalSlider.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HorizontalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HorizontalSlider.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Slider */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Slider * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_HorizontalSlider extends Zend_Dojo_View_Helper_Slider diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/NumberSpinner.php --- a/web/lib/Zend/Dojo/View/Helper/NumberSpinner.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/NumberSpinner.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumberSpinner.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumberSpinner.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_NumberSpinner extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/NumberTextBox.php --- a/web/lib/Zend/Dojo/View/Helper/NumberTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/NumberTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumberTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumberTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_NumberTextBox extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/PasswordTextBox.php --- a/web/lib/Zend/Dojo/View/Helper/PasswordTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/PasswordTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PasswordTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PasswordTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_ValidationTextBox */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_PasswordTextBox extends Zend_Dojo_View_Helper_ValidationTextBox diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/RadioButton.php --- a/web/lib/Zend/Dojo/View/Helper/RadioButton.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/RadioButton.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RadioButton.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RadioButton.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_RadioButton extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/SimpleTextarea.php --- a/web/lib/Zend/Dojo/View/Helper/SimpleTextarea.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/SimpleTextarea.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimpleTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimpleTextarea.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,9 +29,9 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimpleTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimpleTextarea.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dojo_View_Helper_SimpleTextarea extends Zend_Dojo_View_Helper_Dijit { @@ -65,7 +65,6 @@ $attribs['id'] = $id; } $attribs['name'] = $id; - $attribs['type'] = $this->_elementType; $attribs = $this->_prepareDijit($attribs, $params, 'textarea'); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Slider.php --- a/web/lib/Zend/Dojo/View/Helper/Slider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Slider.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Slider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Slider.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Dojo_View_Helper_Slider extends Zend_Dojo_View_Helper_Dijit @@ -77,7 +77,7 @@ } $content = ''; - $params['value'] = $value; + $attribs['value'] = $value; if (!array_key_exists('onChange', $attribs)) { $attribs['onChange'] = "dojo.byId('" . $id . "').value = arguments[0];"; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/SplitContainer.php --- a/web/lib/Zend/Dojo/View/Helper/SplitContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/SplitContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SplitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SplitContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_SplitContainer extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/StackContainer.php --- a/web/lib/Zend/Dojo/View/Helper/StackContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/StackContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StackContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StackContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_StackContainer extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/SubmitButton.php --- a/web/lib/Zend/Dojo/View/Helper/SubmitButton.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/SubmitButton.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubmitButton.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubmitButton.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Button */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Button * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_SubmitButton extends Zend_Dojo_View_Helper_Button diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/TabContainer.php --- a/web/lib/Zend/Dojo/View/Helper/TabContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/TabContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TabContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TabContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_TabContainer extends Zend_Dojo_View_Helper_DijitContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/TextBox.php --- a/web/lib/Zend/Dojo/View/Helper/TextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/TextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_TextBox extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/Textarea.php --- a/web/lib/Zend/Dojo/View/Helper/Textarea.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/Textarea.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Textarea.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_Textarea extends Zend_Dojo_View_Helper_Dijit @@ -67,7 +67,6 @@ $attribs['id'] = $id; } $attribs['name'] = $id; - $attribs['type'] = $this->_elementType; $attribs = $this->_prepareDijit($attribs, $params, 'textarea'); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/TimeTextBox.php --- a/web/lib/Zend/Dojo/View/Helper/TimeTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/TimeTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimeTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimeTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_TimeTextBox extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/ValidationTextBox.php --- a/web/lib/Zend/Dojo/View/Helper/ValidationTextBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/ValidationTextBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidationTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ValidationTextBox.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_ValidationTextBox extends Zend_Dojo_View_Helper_Dijit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dojo/View/Helper/VerticalSlider.php --- a/web/lib/Zend/Dojo/View/Helper/VerticalSlider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dojo/View/Helper/VerticalSlider.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VerticalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VerticalSlider.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Dojo_View_Helper_Slider */ @@ -29,7 +29,7 @@ * @uses Zend_Dojo_View_Helper_Slider * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dojo_View_Helper_VerticalSlider extends Zend_Dojo_View_Helper_Slider diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dom/Exception.php --- a/web/lib/Zend/Dom/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dom/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Dom - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Exception */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Dom - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dom_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dom/Query.php --- a/web/lib/Zend/Dom/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dom/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Dom - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 23062 2010-10-08 14:05:45Z matthew $ + * @version $Id: Query.php 25033 2012-08-17 19:50:08Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @package Zend_Dom * @subpackage Query - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Dom_Query @@ -90,8 +90,8 @@ /** * Set document encoding - * - * @param string $encoding + * + * @param string $encoding * @return Zend_Dom_Query */ public function setEncoding($encoding) @@ -102,7 +102,7 @@ /** * Get document encoding - * + * * @return null|string */ public function getEncoding() @@ -124,6 +124,10 @@ } // breaking XML declaration to make syntax highlighting work if ('<' . '?xml' == substr(trim($document), 0, 5)) { + if (preg_match('/]*xmlns="([^"]+)"[^>]*>/i', $document, $matches)) { + $this->_xpathNamespaces[] = $matches[1]; + return $this->setDocumentXhtml($document, $encoding); + } return $this->setDocumentXml($document, $encoding); } if (strstr($document, 'DTD XHTML')) { @@ -205,7 +209,7 @@ /** * Get any DOMDocument errors found - * + * * @return false|array */ public function getDocumentErrors() @@ -241,6 +245,7 @@ $encoding = $this->getEncoding(); libxml_use_internal_errors(true); + libxml_disable_entity_loader(true); if (null === $encoding) { $domDoc = new DOMDocument('1.0'); } else { @@ -250,6 +255,14 @@ switch ($type) { case self::DOC_XML: $success = $domDoc->loadXML($document); + foreach ($domDoc->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/Dom/Exception.php'; + throw new Zend_Dom_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } break; case self::DOC_HTML: case self::DOC_XHTML: @@ -262,6 +275,7 @@ $this->_documentErrors = $errors; libxml_clear_errors(); } + libxml_disable_entity_loader(false); libxml_use_internal_errors(false); if (!$success) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dom/Query/Css2Xpath.php --- a/web/lib/Zend/Dom/Query/Css2Xpath.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dom/Query/Css2Xpath.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Dom - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,9 +23,9 @@ * * @package Zend_Dom * @subpackage Query - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Css2Xpath.php 22044 2010-04-28 19:58:29Z matthew $ + * @version $Id: Css2Xpath.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dom_Query_Css2Xpath { @@ -121,8 +121,8 @@ // Classes $expression = preg_replace( - '|\.([a-z][a-z0-9_-]*)|i', - "[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]", + '|\.([a-z][a-z0-9_-]*)|i', + "[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]", $expression ); @@ -134,8 +134,8 @@ /** * Callback for creating equality expressions - * - * @param array $matches + * + * @param array $matches * @return string */ protected static function _createEqualityExpression($matches) @@ -145,25 +145,25 @@ /** * Callback for creating expressions to match one or more attribute values - * - * @param array $matches + * + * @param array $matches * @return string */ protected static function _normalizeSpaceAttribute($matches) { - return "[contains(concat(' ', normalize-space(@" . strtolower($matches[1]) . "), ' '), ' " + return "[contains(concat(' ', normalize-space(@" . strtolower($matches[1]) . "), ' '), ' " . $matches[2] . " ')]"; } /** * Callback for creating a strict "contains" expression - * - * @param array $matches + * + * @param array $matches * @return string */ protected static function _createContainsExpression($matches) { - return "[contains(@" . strtolower($matches[1]) . ", '" + return "[contains(@" . strtolower($matches[1]) . ", '" . $matches[2] . "')]"; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Dom/Query/Result.php --- a/web/lib/Zend/Dom/Query/Result.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Dom/Query/Result.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Dom - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,9 +24,9 @@ * @package Zend_Dom * @subpackage Query * @uses Iterator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dom_Query_Result implements Iterator,Countable { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/Event.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/Event.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,225 @@ +setName($name); + } + + if (null !== $target) { + $this->setTarget($target); + } + + if (null !== $params) { + $this->setParams($params); + } + } + + /** + * Get event name + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Get the event target + * + * This may be either an object, or the name of a static method. + * + * @return string|object + */ + public function getTarget() + { + return $this->target; + } + + /** + * Set parameters + * + * Overwrites parameters + * + * @param array|ArrayAccess|object $params + * @return Event + */ + public function setParams($params) + { + if (!is_array($params) && !is_object($params)) { + require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; + throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( + 'Event parameters must be an array or object; received "%s"', + (is_object($params) ? get_class($params) : gettype($params)) + )); + } + + $this->params = $params; + return $this; + } + + /** + * Get all parameters + * + * @return array|object|ArrayAccess + */ + public function getParams() + { + return $this->params; + } + + /** + * Get an individual parameter + * + * If the parameter does not exist, the $default value will be returned. + * + * @param string|int $name + * @param mixed $default + * @return mixed + */ + public function getParam($name, $default = null) + { + // Check in params that are arrays or implement array access + if (is_array($this->params) || $this->params instanceof ArrayAccess) { + if (!isset($this->params[$name])) { + return $default; + } + + return $this->params[$name]; + } + + // Check in normal objects + if (!isset($this->params->{$name})) { + return $default; + } + return $this->params->{$name}; + } + + /** + * Set the event name + * + * @param string $name + * @return Zend_EventManager_Event + */ + public function setName($name) + { + $this->name = (string) $name; + return $this; + } + + /** + * Set the event target/context + * + * @param null|string|object $target + * @return Zend_EventManager_Event + */ + public function setTarget($target) + { + $this->target = $target; + return $this; + } + + /** + * Set an individual parameter to a value + * + * @param string|int $name + * @param mixed $value + * @return Zend_EventManager_Event + */ + public function setParam($name, $value) + { + if (is_array($this->params) || $this->params instanceof ArrayAccess) { + // Arrays or objects implementing array access + $this->params[$name] = $value; + } else { + // Objects + $this->params->{$name} = $value; + } + return $this; + } + + /** + * Stop further event propagation + * + * @param bool $flag + * @return void + */ + public function stopPropagation($flag = true) + { + $this->stopPropagation = (bool) $flag; + } + + /** + * Is propagation stopped? + * + * @return bool + */ + public function propagationIsStopped() + { + return $this->stopPropagation; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/EventCollection.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/EventCollection.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,109 @@ +setIdentifiers($identifiers); + } + + /** + * Set the event class to utilize + * + * @param string $class + * @return Zend_EventManager_EventManager + */ + public function setEventClass($class) + { + $this->eventClass = $class; + return $this; + } + + /** + * Set static collections container + * + * @param Zend_EventManager_StaticEventCollection $collections + * @return void + */ + public function setSharedCollections(Zend_EventManager_SharedEventCollection $collections) + { + $this->sharedCollections = $collections; + return $this; + } + + /** + * Remove any shared collections + * + * Sets {@link $sharedCollections} to boolean false to disable ability + * to lazy-load static event manager instance. + * + * @return void + */ + public function unsetSharedCollections() + { + $this->sharedCollections = false; + } + + /** + * Get static collections container + * + * @return false|Zend_EventManager_SharedEventCollection + */ + public function getSharedCollections() + { + if (null === $this->sharedCollections) { + $this->setSharedCollections(Zend_EventManager_StaticEventManager::getInstance()); + } + return $this->sharedCollections; + } + + /** + * Get the identifier(s) for this Zend_EventManager_EventManager + * + * @return array + */ + public function getIdentifiers() + { + return $this->identifiers; + } + + /** + * Set the identifiers (overrides any currently set identifiers) + * + * @param string|int|array|Traversable $identifiers + * @return Zend_EventManager_EventManager + */ + public function setIdentifiers($identifiers) + { + if (is_array($identifiers) || $identifiers instanceof Traversable) { + $this->identifiers = array_unique((array) $identifiers); + } elseif ($identifiers !== null) { + $this->identifiers = array($identifiers); + } + return $this; + } + + /** + * Add some identifier(s) (appends to any currently set identifiers) + * + * @param string|int|array|Traversable $identifiers + * @return Zend_EventManager_EventManager + */ + public function addIdentifiers($identifiers) + { + if (is_array($identifiers) || $identifiers instanceof Traversable) { + $this->identifiers = array_unique($this->identifiers + (array) $identifiers); + } elseif ($identifiers !== null) { + $this->identifiers = array_unique(array_merge($this->identifiers, array($identifiers))); + } + return $this; + } + + /** + * Trigger all listeners for a given event + * + * Can emulate triggerUntil() if the last argument provided is a callback. + * + * @param string $event + * @param string|object $target Object calling emit, or symbol describing target (such as static method name) + * @param array|ArrayAccess $argv Array of arguments; typically, should be associative + * @param null|callback $callback + * @return Zend_EventManager_ResponseCollection All listener return values + */ + public function trigger($event, $target = null, $argv = array(), $callback = null) + { + if ($event instanceof Zend_EventManager_EventDescription) { + $e = $event; + $event = $e->getName(); + $callback = $target; + } elseif ($target instanceof Zend_EventManager_EventDescription) { + $e = $target; + $e->setName($event); + $callback = $argv; + } elseif ($argv instanceof Zend_EventManager_EventDescription) { + $e = $argv; + $e->setName($event); + $e->setTarget($target); + } else { + $e = new $this->eventClass(); + $e->setName($event); + $e->setTarget($target); + $e->setParams($argv); + } + + if ($callback && !is_callable($callback)) { + require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided'); + } + + return $this->triggerListeners($event, $e, $callback); + } + + /** + * Trigger listeners until return value of one causes a callback to + * evaluate to true + * + * Triggers listeners until the provided callback evaluates the return + * value of one as true, or until all listeners have been executed. + * + * @param string $event + * @param string|object $target Object calling emit, or symbol describing target (such as static method name) + * @param array|ArrayAccess $argv Array of arguments; typically, should be associative + * @param Callable $callback + * @throws Zend_Stdlib_Exception_InvalidCallbackException if invalid callback provided + */ + public function triggerUntil($event, $target, $argv = null, $callback = null) + { + if ($event instanceof Zend_EventManager_EventDescription) { + $e = $event; + $event = $e->getName(); + $callback = $target; + } elseif ($target instanceof Zend_EventManager_EventDescription) { + $e = $target; + $e->setName($event); + $callback = $argv; + } elseif ($argv instanceof Zend_EventManager_EventDescription) { + $e = $argv; + $e->setName($event); + $e->setTarget($target); + } else { + $e = new $this->eventClass(); + $e->setName($event); + $e->setTarget($target); + $e->setParams($argv); + } + + if (!is_callable($callback)) { + require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided'); + } + + return $this->triggerListeners($event, $e, $callback); + } + + /** + * Attach a listener to an event + * + * The first argument is the event, and the next argument describes a + * callback that will respond to that event. A CallbackHandler instance + * describing the event listener combination will be returned. + * + * The last argument indicates a priority at which the event should be + * executed. By default, this value is 1; however, you may set it for any + * integer value. Higher values have higher priority (i.e., execute first). + * + * You can specify "*" for the event name. In such cases, the listener will + * be triggered for every event. + * + * @param string|array|Zend_EventManager_ListenerAggregate $event An event or array of event names. If a ListenerAggregate, proxies to {@link attachAggregate()}. + * @param callback|int $callback If string $event provided, expects PHP callback; for a ListenerAggregate $event, this will be the priority + * @param int $priority If provided, the priority at which to register the callback + * @return Zend_Stdlib_CallbackHandler|mixed CallbackHandler if attaching callback (to allow later unsubscribe); mixed if attaching aggregate + */ + public function attach($event, $callback = null, $priority = 1) + { + // Proxy ListenerAggregate arguments to attachAggregate() + if ($event instanceof Zend_EventManager_ListenerAggregate) { + return $this->attachAggregate($event, $callback); + } + + // Null callback is invalid + if (null === $callback) { + require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; + throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( + '%s: expects a callback; none provided', + __METHOD__ + )); + } + + // Array of events should be registered individually, and return an array of all listeners + if (is_array($event)) { + $listeners = array(); + foreach ($event as $name) { + $listeners[] = $this->attach($name, $callback, $priority); + } + return $listeners; + } + + // If we don't have a priority queue for the event yet, create one + if (empty($this->events[$event])) { + $this->events[$event] = new Zend_Stdlib_PriorityQueue(); + } + + // Create a callback handler, setting the event and priority in its metadata + $listener = new Zend_Stdlib_CallbackHandler($callback, array('event' => $event, 'priority' => $priority)); + + // Inject the callback handler into the queue + $this->events[$event]->insert($listener, $priority); + return $listener; + } + + /** + * Attach a listener aggregate + * + * Listener aggregates accept an EventCollection instance, and call attach() + * one or more times, typically to attach to multiple events using local + * methods. + * + * @param Zend_EventManager_ListenerAggregate $aggregate + * @param int $priority If provided, a suggested priority for the aggregate to use + * @return mixed return value of {@link Zend_EventManager_ListenerAggregate::attach()} + */ + public function attachAggregate(Zend_EventManager_ListenerAggregate $aggregate, $priority = 1) + { + return $aggregate->attach($this, $priority); + } + + /** + * Unsubscribe a listener from an event + * + * @param Zend_Stdlib_CallbackHandler|Zend_EventManager_ListenerAggregate $listener + * @return bool Returns true if event and listener found, and unsubscribed; returns false if either event or listener not found + * @throws Zend_EventManager_Exception_InvalidArgumentException if invalid listener provided + */ + public function detach($listener) + { + if ($listener instanceof Zend_EventManager_ListenerAggregate) { + return $this->detachAggregate($listener); + } + + if (!$listener instanceof Zend_Stdlib_CallbackHandler) { + require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; + throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( + '%s: expected a Zend_EventManager_ListenerAggregate or Zend_Stdlib_CallbackHandler; received "%s"', + __METHOD__, + (is_object($listener) ? get_class($listener) : gettype($listener)) + )); + } + + $event = $listener->getMetadatum('event'); + if (!$event || empty($this->events[$event])) { + return false; + } + $return = $this->events[$event]->remove($listener); + if (!$return) { + return false; + } + if (!count($this->events[$event])) { + unset($this->events[$event]); + } + return true; + } + + /** + * Detach a listener aggregate + * + * Listener aggregates accept an EventCollection instance, and call detach() + * of all previously attached listeners. + * + * @param Zend_EventManager_ListenerAggregate $aggregate + * @return mixed return value of {@link Zend_EventManager_ListenerAggregate::detach()} + */ + public function detachAggregate(Zend_EventManager_ListenerAggregate $aggregate) + { + return $aggregate->detach($this); + } + + /** + * Retrieve all registered events + * + * @return array + */ + public function getEvents() + { + return array_keys($this->events); + } + + /** + * Retrieve all listeners for a given event + * + * @param string $event + * @return Zend_Stdlib_PriorityQueue + */ + public function getListeners($event) + { + if (!array_key_exists($event, $this->events)) { + return new Zend_Stdlib_PriorityQueue(); + } + return $this->events[$event]; + } + + /** + * Clear all listeners for a given event + * + * @param string $event + * @return void + */ + public function clearListeners($event) + { + if (!empty($this->events[$event])) { + unset($this->events[$event]); + } + } + + /** + * Prepare arguments + * + * Use this method if you want to be able to modify arguments from within a + * listener. It returns an ArrayObject of the arguments, which may then be + * passed to trigger() or triggerUntil(). + * + * @param array $args + * @return ArrayObject + */ + public function prepareArgs(array $args) + { + return new ArrayObject($args); + } + + /** + * Trigger listeners + * + * Actual functionality for triggering listeners, to which both trigger() and triggerUntil() + * delegate. + * + * @param string $event Event name + * @param EventDescription $e + * @param null|callback $callback + * @return ResponseCollection + */ + protected function triggerListeners($event, Zend_EventManager_EventDescription $e, $callback = null) + { + $responses = new Zend_EventManager_ResponseCollection; + $listeners = $this->getListeners($event); + + // Add shared/wildcard listeners to the list of listeners, + // but don't modify the listeners object + $sharedListeners = $this->getSharedListeners($event); + $sharedWildcardListeners = $this->getSharedListeners('*'); + $wildcardListeners = $this->getListeners('*'); + if (count($sharedListeners) || count($sharedWildcardListeners) || count($wildcardListeners)) { + $listeners = clone $listeners; + } + + // Shared listeners on this specific event + $this->insertListeners($listeners, $sharedListeners); + + // Shared wildcard listeners + $this->insertListeners($listeners, $sharedWildcardListeners); + + // Add wildcard listeners + $this->insertListeners($listeners, $wildcardListeners); + + if ($listeners->isEmpty()) { + return $responses; + } + + foreach ($listeners as $listener) { + // Trigger the listener's callback, and push its result onto the + // response collection + $responses->push(call_user_func($listener->getCallback(), $e)); + + // If the event was asked to stop propagating, do so + if ($e->propagationIsStopped()) { + $responses->setStopped(true); + break; + } + + // If the result causes our validation callback to return true, + // stop propagation + if ($callback && call_user_func($callback, $responses->last())) { + $responses->setStopped(true); + break; + } + } + + return $responses; + } + + /** + * Get list of all listeners attached to the shared collection for + * identifiers registered by this instance + * + * @param string $event + * @return array + */ + protected function getSharedListeners($event) + { + if (!$sharedCollections = $this->getSharedCollections()) { + return array(); + } + + $identifiers = $this->getIdentifiers(); + $sharedListeners = array(); + + foreach ($identifiers as $id) { + if (!$listeners = $sharedCollections->getListeners($id, $event)) { + continue; + } + + if (!is_array($listeners) && !($listeners instanceof Traversable)) { + continue; + } + + foreach ($listeners as $listener) { + if (!$listener instanceof Zend_Stdlib_CallbackHandler) { + continue; + } + $sharedListeners[] = $listener; + } + } + + return $sharedListeners; + } + + /** + * Add listeners to the master queue of listeners + * + * Used to inject shared listeners and wildcard listeners. + * + * @param Zend_Stdlib_PriorityQueue $masterListeners + * @param Zend_Stdlib_PriorityQueue $listeners + * @return void + */ + protected function insertListeners($masterListeners, $listeners) + { + if (!count($listeners)) { + return; + } + + foreach ($listeners as $listener) { + $priority = $listener->getMetadatum('priority'); + if (null === $priority) { + $priority = 1; + } elseif (is_array($priority)) { + // If we have an array, likely using PriorityQueue. Grab first + // element of the array, as that's the actual priority. + $priority = array_shift($priority); + } + $masterListeners->insert($listener, $priority); + } + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/EventManagerAware.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/EventManagerAware.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,40 @@ +setExtractFlags(self::EXTR_BOTH); + + // Iterate and remove any matches + $removed = false; + $items = array(); + $this->rewind(); + while (!$this->isEmpty()) { + $item = $this->extract(); + if ($item['data'] === $datum) { + $removed = true; + continue; + } + $items[] = $item; + } + + // Repopulate + foreach ($items as $item) { + $this->insert($item['data'], $item['priority']); + } + + $this->setExtractFlags(self::EXTR_DATA); + return $removed; + } + + /** + * Iterate the next filter in the chain + * + * Iterates and calls the next filter in the chain. + * + * @param mixed $context + * @param array $params + * @param Zend_EventManager_Filter_FilterIterator $chain + * @return void + */ + public function next($context = null, array $params = array(), $chain = null) + { + if (empty($context) || $chain->isEmpty()) { + return; + } + + $next = $this->extract(); + if (!$next instanceof Zend_Stdlib_CallbackHandler) { + return; + } + + $return = call_user_func($next->getCallback(), $context, $params, $chain); + return $return; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/FilterChain.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/FilterChain.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,138 @@ +filters = new Zend_EventManager_Filter_FilterIterator(); + } + + /** + * Apply the filters + * + * Begins iteration of the filters. + * + * @param mixed $context Object under observation + * @param mixed $argv Associative array of arguments + * @return mixed + */ + public function run($context, array $argv = array()) + { + $chain = clone $this->getFilters(); + + if ($chain->isEmpty()) { + return; + } + + $next = $chain->extract(); + if (!$next instanceof Zend_Stdlib_CallbackHandler) { + return; + } + + return call_user_func($next->getCallback(), $context, $argv, $chain); + } + + /** + * Connect a filter to the chain + * + * @param callback $callback PHP Callback + * @param int $priority Priority in the queue at which to execute; defaults to 1 (higher numbers == higher priority) + * @return Zend_Stdlib_CallbackHandler (to allow later unsubscribe) + */ + public function attach($callback, $priority = 1) + { + if (empty($callback)) { + require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + throw new Zend_Stdlib_Exception_InvalidCallbackException('No callback provided'); + } + $filter = new Zend_Stdlib_CallbackHandler($callback, array('priority' => $priority)); + $this->filters->insert($filter, $priority); + return $filter; + } + + /** + * Detach a filter from the chain + * + * @param Zend_Stdlib_CallbackHandler $filter + * @return bool Returns true if filter found and unsubscribed; returns false otherwise + */ + public function detach(Zend_Stdlib_CallbackHandler $filter) + { + return $this->filters->remove($filter); + } + + /** + * Retrieve all filters + * + * @return Zend_EventManager_Filter_FilterIterator + */ + public function getFilters() + { + return $this->filters; + } + + /** + * Clear all filters + * + * @return void + */ + public function clearFilters() + { + $this->filters = new Zend_EventManager_Filter_FilterIterator(); + } + + /** + * Return current responses + * + * Only available while the chain is still being iterated. Returns the + * current ResponseCollection. + * + * @return null|Zend_EventManager_ResponseCollection + */ + public function getResponses() + { + return $this->responses; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/GlobalEventManager.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/GlobalEventManager.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,149 @@ +trigger($event, $context, $argv); + } + + /** + * Trigger listeenrs until return value of one causes a callback to evaluate + * to true. + * + * @param string $event + * @param string|object $context + * @param array|object $argv + * @param callback $callback + * @return Zend_EventManager_ResponseCollection + */ + public static function triggerUntil($event, $context, $argv, $callback) + { + return self::getEventCollection()->triggerUntil($event, $context, $argv, $callback); + } + + /** + * Attach a listener to an event + * + * @param string $event + * @param callback $callback + * @param int $priority + * @return Zend_Stdlib_CallbackHandler + */ + public static function attach($event, $callback, $priority = 1) + { + return self::getEventCollection()->attach($event, $callback, $priority); + } + + /** + * Detach a callback from a listener + * + * @param Zend_Stdlib_CallbackHandler $listener + * @return bool + */ + public static function detach(Zend_Stdlib_CallbackHandler $listener) + { + return self::getEventCollection()->detach($listener); + } + + /** + * Retrieve list of events this object manages + * + * @return array + */ + public static function getEvents() + { + return self::getEventCollection()->getEvents(); + } + + /** + * Retrieve all listeners for a given event + * + * @param string $event + * @return Zend_Stdlib_PriorityQueue|array + */ + public static function getListeners($event) + { + return self::getEventCollection()->getListeners($event); + } + + /** + * Clear all listeners for a given event + * + * @param string $event + * @return void + */ + public static function clearListeners($event) + { + return self::getEventCollection()->clearListeners($event); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/ListenerAggregate.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/ListenerAggregate.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,53 @@ + true, + self::IT_MODE_KEEP => true, + ); + + if (!isset($expected[$mode])) { + throw new InvalidArgumentException(sprintf('Invalid iterator mode specified ("%s")', $mode)); + } + + $this->mode = $mode; + } + + /** + * Return last element in the stack + * + * @return mixed + */ + public function bottom() + { + $this->rewind(); + $value = array_pop($this->stack); + array_push($this->stack, $value); + return $value; + } + + /** + * Countable: return count of items in the stack + * + * @return int + */ + public function count() + { + return $this->count; + } + + /** + * Iterator: return current item in the stack + * + * @return mixed + */ + public function current() + { + if (!$this->stack) { + $this->rewind(); + } + return current($this->stack); + } + + /** + * Get iteration mode + * + * @return int + */ + public function getIteratorMode() + { + return $this->mode; + } + + /** + * Is the stack empty? + * + * @return bool + */ + public function isEmpty() + { + return ($this->count === 0); + } + + /** + * Iterator: return key of current item in the stack + * + * @return mixed + */ + public function key() + { + if (!$this->stack) { + $this->rewind(); + } + return key($this->stack); + } + + /** + * Iterator: advance pointer to next item in the stack + * + * @return void + */ + public function next() + { + if (!$this->stack) { + $this->rewind(); + } + return next($this->stack); + } + + /** + * ArrayAccess: does an item exist at the specified offset? + * + * @param mixed $index + * @return bool + */ + public function offsetExists($index) + { + return array_key_exists($index, $this->data); + } + + /** + * ArrayAccess: get the item at the specified offset + * + * @param mixed $index + * @return mixed + * @throws OutOfRangeException + */ + public function offsetGet($index) + { + if (!$this->offsetExists($index)) { + throw OutOfRangeException(sprintf('Invalid index ("%s") specified', $index)); + } + return $this->data[$index]; + } + + /** + * ArrayAccess: add an item at the specified offset + * + * @param mixed $index + * @param mixed $newval + * @return void + */ + public function offsetSet($index, $newval) + { + $this->data[$index] = $newval; + $this->stack = false; + $this->count++; + } + + /** + * ArrayAccess: unset the item at the specified offset + * + * @param mixed $index + * @return void + * @throws OutOfRangeException + */ + public function offsetUnset($index) + { + if (!$this->offsetExists($index)) { + throw OutOfRangeException(sprintf('Invalid index ("%s") specified', $index)); + } + unset($this->data[$index]); + $this->stack = false; + $this->count--; + } + + /** + * Pop a node from the end of the stack + * + * @return mixed + * @throws RuntimeException + */ + public function pop() + { + $val = array_pop($this->data); + $this->stack = false; + $this->count--; + return $val; + } + + /** + * Move the iterator to the previous node + * + * @todo Does this need to be implemented? + * @return void + */ + public function prev() + { + } + + /** + * Push an element to the list + * + * @param mixed $value + * @return void + */ + public function push($value) + { + array_push($this->data, $value); + $this->count++; + $this->stack = false; + } + + /** + * Iterator: rewind to beginning of stack + * + * @return void + */ + public function rewind() + { + if (is_array($this->stack)) { + return reset($this->stack); + } + $this->stack = array_reverse($this->data, true); + } + + /** + * Serialize the storage + * + * @return string + */ + public function serialize() + { + return serialize($this->data); + } + + /** + * Shifts a node from the beginning of the list + * + * @return mixed + * @throws RuntimeException + */ + public function shift() + { + $val = array_shift($this->data); + $this->stack = false; + $this->count--; + return $val; + } + + /** + * Peek at the top node of the stack + * + * @return mixed + */ + public function top() + { + $this->rewind(); + $value = array_shift($this->stack); + array_unshift($this->stack, $value); + return $value; + } + + /** + * Unserialize the storage + * + * @param string + * @return void + */ + public function unserialize($serialized) + { + $this->data = unserialize($serialized); + $this->stack = false; + } + + /** + * Unshift a node onto the beginning of the list + * + * @param mixed $value + * @return void + */ + public function unshift($value) + { + array_unshift($this->data, $value); + $this->count++; + $this->stack = false; + } + + /** + * Iterator: is the current pointer valid? + * + * @return bool + */ + public function valid() + { + $key = key($this->stack); + $var = ($key !== null && $key !== false); + return $var; + } + } +} + +/** + * Collection of signal handler return values + * + * @category Zend + * @package Zend_EventManager + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_EventManager_ResponseCollection extends SplStack +{ + protected $stopped = false; + + /** + * Did the last response provided trigger a short circuit of the stack? + * + * @return bool + */ + public function stopped() + { + return $this->stopped; + } + + /** + * Mark the collection as stopped (or its opposite) + * + * @param bool $flag + * @return Zend_EventManager_ResponseCollection + */ + public function setStopped($flag) + { + $this->stopped = (bool) $flag; + return $this; + } + + /** + * Convenient access to the first handler return value. + * + * @return mixed The first handler return value + */ + public function first() + { + return parent::bottom(); + } + + /** + * Convenient access to the last handler return value. + * + * If the collection is empty, returns null. Otherwise, returns value + * returned by last handler. + * + * @return mixed The last handler return value + */ + public function last() + { + if (count($this) === 0) { + return null; + } + return parent::top(); + } + + /** + * Check if any of the responses match the given value. + * + * @param mixed $value The value to look for among responses + */ + public function contains($value) + { + foreach ($this as $response) { + if ($response === $value) { + return true; + } + } + return false; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/SharedEventCollection.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/SharedEventCollection.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,32 @@ + + * SharedEventManager::getInstance()->connect( + * array('My\Resource\AbstractResource', 'My\Resource\EntityResource'), + * 'getOne', + * function ($e) use ($cache) { + * if (!$id = $e->getParam('id', false)) { + * return; + * } + * if (!$data = $cache->load(get_class($resource) . '::getOne::' . $id )) { + * return; + * } + * return $data; + * } + * ); + * + * + * @param string|array $id Identifier(s) for event emitting component(s) + * @param string $event + * @param callback $callback PHP Callback + * @param int $priority Priority at which listener should execute + * @return void + */ + public function attach($id, $event, $callback, $priority = 1) + { + $ids = (array) $id; + foreach ($ids as $id) { + if (!array_key_exists($id, $this->identifiers)) { + $this->identifiers[$id] = new Zend_EventManager_EventManager(); + } + $this->identifiers[$id]->attach($event, $callback, $priority); + } + } + + /** + * Detach a listener from an event offered by a given resource + * + * @param string|int $id + * @param Zend_Stdlib_CallbackHandler $listener + * @return bool Returns true if event and listener found, and unsubscribed; returns false if either event or listener not found + */ + public function detach($id, Zend_Stdlib_CallbackHandler $listener) + { + if (!array_key_exists($id, $this->identifiers)) { + return false; + } + return $this->identifiers[$id]->detach($listener); + } + + /** + * Retrieve all registered events for a given resource + * + * @param string|int $id + * @return array + */ + public function getEvents($id) + { + if (!array_key_exists($id, $this->identifiers)) { + return false; + } + return $this->identifiers[$id]->getEvents(); + } + + /** + * Retrieve all listeners for a given identifier and event + * + * @param string|int $id + * @param string|int $event + * @return false|Zend_Stdlib_PriorityQueue + */ + public function getListeners($id, $event) + { + if (!array_key_exists($id, $this->identifiers)) { + return false; + } + return $this->identifiers[$id]->getListeners($event); + } + + /** + * Clear all listeners for a given identifier, optionally for a specific event + * + * @param string|int $id + * @param null|string $event + * @return bool + */ + public function clearListeners($id, $event = null) + { + if (!array_key_exists($id, $this->identifiers)) { + return false; + } + + if (null === $event) { + unset($this->identifiers[$id]); + return true; + } + + return $this->identifiers[$id]->clearListeners($event); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/EventManager/StaticEventManager.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/EventManager/StaticEventManager.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,80 @@ +getPrevious())) { - return $e->__toString() - . "\n\nNext " + return $e->__toString() + . "\n\nNext " . parent::__toString(); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed.php --- a/web/lib/Zend/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 25160 2012-12-18 15:17:16Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed @@ -191,7 +191,8 @@ public static function importString($string) { // Load the feed as an XML DOMDocument object - $libxml_errflag = libxml_use_internal_errors(true); + $libxml_errflag = libxml_use_internal_errors(true); + $libxml_entity_loader = libxml_disable_entity_loader(true); $doc = new DOMDocument; if (trim($string) == '') { require_once 'Zend/Feed/Exception.php'; @@ -199,9 +200,9 @@ . ' is an Empty string or comes from an empty HTTP response'); } $status = $doc->loadXML($string); + libxml_disable_entity_loader($libxml_entity_loader); libxml_use_internal_errors($libxml_errflag); - if (!$status) { // prevent the class to generate an undefined variable notice (ZF-2590) // Build error message diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Abstract.php --- a/web/lib/Zend/Feed/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 25160 2012-12-18 15:17:16Z matthew $ */ @@ -37,7 +37,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Abstract extends Zend_Feed_Element implements Iterator, Countable @@ -81,9 +81,9 @@ * @see Zend_Feed_Exception */ require_once 'Zend/Feed/Exception.php'; - throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); + throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus() . '; request: ' . $client->getLastRequest() . "\nresponse: " . $response->asString()); } - $this->_element = $response->getBody(); + $this->_element = $this->_importFeedFromString($response->getBody()); $this->__wakeup(); } elseif ($string !== null) { // Retrieve the feed from $string @@ -256,4 +256,49 @@ * @return void */ abstract public function send(); + + /** + * Import a feed from a string + * + * Protects against XXE attack vectors. + * + * @param string $feed + * @return string + * @throws Zend_Feed_Exception on detection of an XXE vector + */ + protected function _importFeedFromString($feed) + { + // Load the feed as an XML DOMDocument object + $libxml_errflag = libxml_use_internal_errors(true); + $libxml_entity_loader = libxml_disable_entity_loader(true); + $doc = new DOMDocument; + if (trim($feed) == '') { + require_once 'Zend/Feed/Exception.php'; + throw new Zend_Feed_Exception('Remote feed being imported' + . ' is an Empty string or comes from an empty HTTP response'); + } + $status = $doc->loadXML($feed); + libxml_disable_entity_loader($libxml_entity_loader); + libxml_use_internal_errors($libxml_errflag); + + if (!$status) { + // prevent the class to generate an undefined variable notice (ZF-2590) + // Build error message + $error = libxml_get_last_error(); + if ($error && $error->message) { + $errormsg = "DOMDocument cannot parse XML: {$error->message}"; + } else { + $errormsg = "DOMDocument cannot parse XML"; + } + + + /** + * @see Zend_Feed_Exception + */ + require_once 'Zend/Feed/Exception.php'; + throw new Zend_Feed_Exception($errormsg); + } + + return $doc->saveXML($doc->documentElement); + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Atom.php --- a/web/lib/Zend/Feed/Atom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Atom.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Atom.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -44,7 +44,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Atom extends Zend_Feed_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Builder.php --- a/web/lib/Zend/Feed/Builder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Builder.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Builder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Builder.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -44,7 +44,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Builder implements Zend_Feed_Builder_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Builder/Entry.php --- a/web/lib/Zend/Feed/Builder/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Builder/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Builder_Entry extends ArrayObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Builder/Exception.php --- a/web/lib/Zend/Feed/Builder/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Builder/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Builder_Exception extends Zend_Feed_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Builder/Header.php --- a/web/lib/Zend/Feed/Builder/Header.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Builder/Header.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Header.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Header.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Builder_Header extends ArrayObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Builder/Header/Itunes.php --- a/web/lib/Zend/Feed/Builder/Header/Itunes.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Builder/Header/Itunes.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Itunes.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Itunes.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Builder_Header_Itunes extends ArrayObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Builder/Interface.php --- a/web/lib/Zend/Feed/Builder/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Builder/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Feed_Builder_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Element.php --- a/web/lib/Zend/Feed/Element.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Element.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: Element.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Element implements ArrayAccess diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Entry/Abstract.php --- a/web/lib/Zend/Feed/Entry/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Entry/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Entry_Abstract extends Zend_Feed_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Entry/Atom.php --- a/web/lib/Zend/Feed/Entry/Atom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Entry/Atom.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Atom.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Entry/Rss.php --- a/web/lib/Zend/Feed/Entry/Rss.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Entry/Rss.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rss.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rss.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Entry_Rss extends Zend_Feed_Entry_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Exception.php --- a/web/lib/Zend/Feed/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub.php --- a/web/lib/Zend/Feed/Pubsubhubbub.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pubsubhubbub.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Pubsubhubbub.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ /** * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub @@ -57,7 +57,7 @@ */ const VERIFICATION_MODE_SYNC = 'sync'; const VERIFICATION_MODE_ASYNC = 'async'; - + /** * Subscription States */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/CallbackAbstract.php --- a/web/lib/Zend/Feed/Pubsubhubbub/CallbackAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/CallbackAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Callback - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallbackAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: CallbackAbstract.php 24842 2012-05-31 18:31:28Z rob $ */ /** @@ -34,14 +34,14 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Callback - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract implements Zend_Feed_Pubsubhubbub_CallbackInterface { /** - * An instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used + * An instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used * to background save any verification tokens associated with a subscription * or other. * @@ -219,7 +219,9 @@ protected function _detectCallbackUrl() { $callbackUrl = ''; - if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { + if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { + $callbackUrl = $_SERVER['HTTP_X_ORIGINAL_URL']; + } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { $callbackUrl = $_SERVER['HTTP_X_REWRITE_URL']; } elseif (isset($_SERVER['REQUEST_URI'])) { $callbackUrl = $_SERVER['REQUEST_URI']; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/CallbackInterface.php --- a/web/lib/Zend/Feed/Pubsubhubbub/CallbackInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/CallbackInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Callback - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallbackInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: CallbackInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Callback - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Feed_Pubsubhubbub_CallbackInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/Exception.php --- a/web/lib/Zend/Feed/Pubsubhubbub/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/HttpResponse.php --- a/web/lib/Zend/Feed/Pubsubhubbub/HttpResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/HttpResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpResponse.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: HttpResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub_HttpResponse diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php --- a/web/lib/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModelAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: ModelAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Db_Table */ require_once 'Zend/Db/Table.php'; -/** +/** * @see Zend_Registry * Seems to fix the file not being included by Zend_Db_Table... */ @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub_Model_ModelAbstract @@ -43,12 +43,12 @@ * @var Zend_Db_Table */ protected $_db = null; - + /** * Constructor - * - * @param array $data - * @param Zend_Db_Table_Abstract $tableGateway + * + * @param array $data + * @param Zend_Db_Table_Abstract $tableGateway * @return void */ public function __construct(Zend_Db_Table_Abstract $tableGateway = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/Model/Subscription.php --- a/web/lib/Zend/Feed/Pubsubhubbub/Model/Subscription.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/Model/Subscription.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Entity - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subscription.php 22507 2010-06-30 19:11:27Z ramon $ + * @version $Id: Subscription.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Feed_Pubsubhubbub_Model_ModelAbstract */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Entity - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub_Model_Subscription diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php --- a/web/lib/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,21 +15,21 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Entity - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubscriptionInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: SubscriptionInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Entity - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface { - + /** * Save subscription to RDMBS * @@ -37,23 +37,23 @@ * @return bool */ public function setSubscription(array $data); - + /** * Get subscription by ID/key - * - * @param string $key + * + * @param string $key * @return array */ public function getSubscription($key); /** * Determine if a subscription matching the key exists - * - * @param string $key + * + * @param string $key * @return bool */ public function hasSubscription($key); - + /** * Delete a subscription * @@ -61,5 +61,5 @@ * @return bool */ public function deleteSubscription($key); - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/Publisher.php --- a/web/lib/Zend/Feed/Pubsubhubbub/Publisher.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/Publisher.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Publisher.php 23075 2010-10-10 21:31:30Z padraic $ + * @version $Id: Publisher.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub_Publisher diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/Subscriber.php --- a/web/lib/Zend/Feed/Pubsubhubbub/Subscriber.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/Subscriber.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subscriber.php 23170 2010-10-19 18:29:24Z mabe $ + * @version $Id: Subscriber.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub_Subscriber @@ -122,7 +122,7 @@ * @var array */ protected $_authentications = array(); - + /** * Tells the Subscriber to append any subscription identifier to the path * of the base Callback URL. E.g. an identifier "subkey1" would be added @@ -393,12 +393,12 @@ $this->_hubUrls = array_unique($this->_hubUrls); return $this->_hubUrls; } - + /** * Add authentication credentials for a given URL - * - * @param string $url - * @param array $authentication + * + * @param string $url + * @param array $authentication * @return Zend_Feed_Pubsubhubbub_Subscriber */ public function addAuthentication($url, array $authentication) @@ -412,11 +412,11 @@ $this->_authentications[$url] = $authentication; return $this; } - + /** * Add authentication credentials for hub URLs - * - * @param array $authentications + * + * @param array $authentications * @return Zend_Feed_Pubsubhubbub_Subscriber */ public function addAuthentications(array $authentications) @@ -426,21 +426,21 @@ } return $this; } - + /** * Get all hub URL authentication credentials - * + * * @return array */ public function getAuthentications() { return $this->_authentications; } - + /** * Set flag indicating whether or not to use a path parameter - * - * @param bool $bool + * + * @param bool $bool * @return Zend_Feed_Pubsubhubbub_Subscriber */ public function usePathParameter($bool = true) @@ -538,7 +538,7 @@ } /** - * Gets an instance of Zend_Feed_Pubsubhubbub_Storage_StorageInterface used + * Gets an instance of Zend_Feed_Pubsubhubbub_Storage_StorageInterface used * to background save any verification tokens associated with a subscription * or other. * @@ -745,7 +745,7 @@ foreach ($optParams as $name => $value) { $params[$name] = $value; } - + // store subscription to storage $now = new Zend_Date; $expires = null; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php --- a/web/lib/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Callback.php 23069 2010-10-10 10:57:42Z padraic $ + * @version $Id: Callback.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Feed_Pubsubhubbub - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Pubsubhubbub_Subscriber_Callback @@ -49,7 +49,7 @@ * @var string */ protected $_feedUpdate = null; - + /** * Holds a manually set subscription key (i.e. identifies a unique * subscription) which is typical when it is not passed in the query string @@ -59,14 +59,14 @@ * @var string */ protected $_subscriptionKey = null; - + /** * After verification, this is set to the verified subscription's data. * * @var array */ protected $_currentSubscriptionData = null; - + /** * Set a subscription key to use for the current callback request manually. * Required if usePathParameter is enabled for the Subscriber. @@ -155,9 +155,9 @@ return false; } $required = array( - 'hub_mode', + 'hub_mode', 'hub_topic', - 'hub_challenge', + 'hub_challenge', 'hub_verify_token', ); foreach ($required as $key) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader.php --- a/web/lib/Zend/Feed/Reader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reader.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Reader.php 25275 2013-03-06 09:55:33Z frosch $ */ /** @@ -42,7 +42,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader @@ -240,7 +240,7 @@ $etag = $cache->load($cacheId.'_etag'); } if ($lastModified === null) { - $lastModified = $cache->load($cacheId.'_lastmodified');; + $lastModified = $cache->load($cacheId.'_lastmodified'); } if ($etag) { $client->setHeaders('If-None-Match', $etag); @@ -266,6 +266,10 @@ $cache->save($response->getHeader('Last-Modified'), $cacheId.'_lastmodified'); } } + if (empty($responseXml)) { + require_once 'Zend/Feed/Exception.php'; + throw new Zend_Feed_Exception('Feed failed to load, got empty response body'); + } return self::importString($responseXml); } elseif ($cache) { $data = $cache->load($cacheId); @@ -279,6 +283,10 @@ } $responseXml = $response->getBody(); $cache->save($responseXml, $cacheId); + if (empty($responseXml)) { + require_once 'Zend/Feed/Exception.php'; + throw new Zend_Feed_Exception('Feed failed to load, got empty response body'); + } return self::importString($responseXml); } else { $response = $client->request('GET'); @@ -286,7 +294,12 @@ require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); } - $reader = self::importString($response->getBody()); + $responseXml = $response->getBody(); + if (empty($responseXml)) { + require_once 'Zend/Feed/Exception.php'; + throw new Zend_Feed_Exception('Feed failed to load, got empty response body'); + } + $reader = self::importString($responseXml); $reader->setOriginalSourceUri($uri); return $reader; } @@ -321,8 +334,18 @@ public static function importString($string) { $libxml_errflag = libxml_use_internal_errors(true); + $oldValue = libxml_disable_entity_loader(true); $dom = new DOMDocument; $status = $dom->loadXML($string); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/Feed/Exception.php'; + throw new Zend_Feed_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + libxml_disable_entity_loader($oldValue); libxml_use_internal_errors($libxml_errflag); if (!$status) { @@ -393,8 +416,10 @@ } $responseHtml = $response->getBody(); $libxml_errflag = libxml_use_internal_errors(true); + $oldValue = libxml_disable_entity_loader(true); $dom = new DOMDocument; $status = $dom->loadHTML($responseHtml); + libxml_disable_entity_loader($oldValue); libxml_use_internal_errors($libxml_errflag); if (!$status) { // Build error message @@ -418,7 +443,9 @@ * Detect the feed type of the provided feed * * @param Zend_Feed_Abstract|DOMDocument|string $feed + * @param bool $specOnly * @return string + * @throws Zend_Feed_Exception */ public static function detectType($feed, $specOnly = false) { @@ -428,8 +455,18 @@ $dom = $feed; } elseif(is_string($feed) && !empty($feed)) { @ini_set('track_errors', 1); + $oldValue = libxml_disable_entity_loader(true); $dom = new DOMDocument; $status = @$dom->loadXML($feed); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/Feed/Exception.php'; + throw new Zend_Feed_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + libxml_disable_entity_loader($oldValue); @ini_restore('track_errors'); if (!$status) { if (!isset($php_errormsg)) { @@ -510,7 +547,7 @@ if ($xpath->query('//atom:feed')->length) { return self::TYPE_ATOM_10; } - + if ($xpath->query('//atom:entry')->length) { if ($specOnly == true) { return self::TYPE_ATOM_10; @@ -698,7 +735,7 @@ self::registerExtension('Thread'); self::registerExtension('Podcast'); } - + /** * Utility method to apply array_unique operation to a multidimensional * array. @@ -717,5 +754,5 @@ } return $array; } - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Collection.php --- a/web/lib/Zend/Feed/Reader/Collection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Collection.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Collection.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Collection.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Collection extends ArrayObject { - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Collection/Author.php --- a/web/lib/Zend/Feed/Reader/Collection/Author.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Collection/Author.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,11 +14,11 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Author.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Reader_Collection_CollectionAbstract */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Collection_Author diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Collection/Category.php --- a/web/lib/Zend/Feed/Reader/Collection/Category.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Collection/Category.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,11 +14,11 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Category.php 20953 2010-02-06 17:55:34Z padraic $ + * @version $Id: Category.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Reader_Collection_CollectionAbstract */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Collection_Category diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Collection/CollectionAbstract.php --- a/web/lib/Zend/Feed/Reader/Collection/CollectionAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Collection/CollectionAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CollectionAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CollectionAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Reader_Collection_CollectionAbstract extends ArrayObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Entry/Atom.php --- a/web/lib/Zend/Feed/Reader/Entry/Atom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Entry/Atom.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Atom.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Entry_Atom extends Zend_Feed_Reader_EntryAbstract implements Zend_Feed_Reader_EntryInterface @@ -74,7 +74,7 @@ $threadClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Thread_Entry'); $this->_extensions['Thread_Entry'] = new $threadClass($entry, $entryKey, $type); - + $threadClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Entry'); $this->_extensions['DublinCore_Entry'] = new $threadClass($entry, $entryKey, $type); } @@ -344,7 +344,7 @@ return $this->_data['commentfeedlink']; } - + /** * Get category data as a Zend_Feed_Reader_Collection_Category object * @@ -357,7 +357,7 @@ } $categoryCollection = $this->getExtension('Atom')->getCategories(); - + if (count($categoryCollection) == 0) { $categoryCollection = $this->getExtension('DublinCore')->getCategories(); } @@ -366,7 +366,7 @@ return $this->_data['categories']; } - + /** * Get source feed metadata from the entry * @@ -382,7 +382,7 @@ $this->_data['source'] = $source; - return $this->_data['source']; + return $this->_data['source']; } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Entry/Rss.php --- a/web/lib/Zend/Feed/Reader/Entry/Rss.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Entry/Rss.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rss.php 22300 2010-05-26 10:13:34Z padraic $ + * @version $Id: Rss.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -77,7 +77,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Entry_Rss extends Zend_Feed_Reader_EntryAbstract implements Zend_Feed_Reader_EntryInterface @@ -159,7 +159,7 @@ if (array_key_exists('authors', $this->_data)) { return $this->_data['authors']; } - + $authors = array(); $authors_dc = $this->getExtension('DublinCore')->getAuthors(); if (!empty($authors_dc)) { @@ -169,7 +169,7 @@ ); } } - + if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) { $list = $this->_xpath->query($this->_xpathQueryRss . '//author'); @@ -189,7 +189,7 @@ $data['name'] = $matches[1]; } $authors[] = $data; - } + } } } @@ -472,7 +472,7 @@ return $this->_data['links']; } - + /** * Get all categories * @@ -503,7 +503,7 @@ } else { $categoryCollection = $this->getExtension('DublinCore')->getCategories(); } - + if (count($categoryCollection) == 0) { $categoryCollection = $this->getExtension('Atom')->getCategories(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/EntryAbstract.php --- a/web/lib/Zend/Feed/Reader/EntryAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/EntryAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EntryAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EntryAbstract.php 25275 2013-03-06 09:55:33Z frosch $ */ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Reader_EntryAbstract @@ -72,9 +72,9 @@ /** * Constructor * - * @param DOMElement $entry - * @param int $entryKey - * @param string $type + * @param DOMElement $entry + * @param int $entryKey + * @param string|null $type * @return void */ public function __construct(DOMElement $entry, $entryKey, $type = null) @@ -85,7 +85,9 @@ if ($type !== null) { $this->_data['type'] = $type; } else { - $this->_data['type'] = Zend_Feed_Reader::detectType($feed); + $this->_data['type'] = Zend_Feed_Reader::detectType( + $this->_domDocument + ); } $this->_loadExtensions(); } @@ -212,8 +214,10 @@ } } require_once 'Zend/Feed/Exception.php'; - throw new Zend_Feed_Exception('Method: ' . $method - . 'does not exist and could not be located on a registered Extension'); + throw new Zend_Feed_Exception( + 'Method: ' . $method + . 'does not exist and could not be located on a registered Extension' + ); } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/EntryInterface.php --- a/web/lib/Zend/Feed/Reader/EntryInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/EntryInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EntryInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EntryInterface.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Feed_Reader_EntryInterface @@ -133,7 +133,7 @@ * @return string */ public function getCommentFeedLink(); - + /** * Get all categories * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Atom/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/Atom/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Atom/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 23170 2010-10-19 18:29:24Z mabe $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -52,7 +52,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Atom_Entry @@ -127,9 +127,9 @@ if (array_key_exists('content', $this->_data)) { return $this->_data['content']; } - + $content = null; - + $el = $this->getXpath()->query($this->getXpathPrefix() . '/atom:content'); if($el->length > 0) { $el = $el->item(0); @@ -158,7 +158,7 @@ break; } } - + //var_dump($content); exit; if (!$content) { @@ -169,7 +169,7 @@ return $this->_data['content']; } - + /** * Parse out XHTML to remove the namespacing */ @@ -510,7 +510,7 @@ return $this->_data['commentfeedlink']; } - + /** * Get all categories * @@ -551,7 +551,7 @@ return $this->_data['categories']; } - + /** * Get source feed metadata from the entry * @@ -562,7 +562,7 @@ if (array_key_exists('source', $this->_data)) { return $this->_data['source']; } - + $source = null; // TODO: Investigate why _getAtomType() fails here. Is it even needed? if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10) { @@ -572,9 +572,9 @@ $source = new Zend_Feed_Reader_Feed_Atom_Source($element, $this->getXpathPrefix()); } } - + $this->_data['source'] = $source; - return $this->_data['source']; + return $this->_data['source']; } /** @@ -607,7 +607,7 @@ $emailNode = $element->getElementsByTagName('email'); $nameNode = $element->getElementsByTagName('name'); $uriNode = $element->getElementsByTagName('uri'); - + if ($emailNode->length && strlen($emailNode->item(0)->nodeValue) > 0) { $author['email'] = $emailNode->item(0)->nodeValue; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Atom/Feed.php --- a/web/lib/Zend/Feed/Reader/Extension/Atom/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Atom/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 23170 2010-10-19 18:29:24Z mabe $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Atom_Feed @@ -315,7 +315,7 @@ return $this->_data['image']; } - + /** * Get the feed image * @@ -420,7 +420,7 @@ return $this->_data['hubs']; } $hubs = array(); - + $list = $this->_xpath->query($this->getXpathPrefix() . '//atom:link[@rel="hub"]/@href'); @@ -458,7 +458,7 @@ return $this->_data['title']; } - + /** * Get all categories * @@ -513,7 +513,7 @@ $emailNode = $element->getElementsByTagName('email'); $nameNode = $element->getElementsByTagName('name'); $uriNode = $element->getElementsByTagName('uri'); - + if ($emailNode->length && strlen($emailNode->item(0)->nodeValue) > 0) { $author['email'] = $emailNode->item(0)->nodeValue; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Content/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/Content/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Content/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 22300 2010-05-26 10:13:34Z padraic $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Content_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_CreativeCommons_Entry extends Zend_Feed_Reader_Extension_EntryAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php --- a/web/lib/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_CreativeCommons_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/DublinCore/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/DublinCore/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/DublinCore/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_DublinCore_Entry @@ -102,7 +102,7 @@ return $this->_data['authors']; } - + /** * Get categories (subjects under DC) * @@ -113,13 +113,13 @@ if (array_key_exists('categories', $this->_data)) { return $this->_data['categories']; } - + $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc11:subject'); if (!$list->length) { $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc10:subject'); } - + if ($list->length) { $categoryCollection = new Zend_Feed_Reader_Collection_Category; foreach ($list as $category) { @@ -132,11 +132,11 @@ } else { $categoryCollection = new Zend_Feed_Reader_Collection_Category; } - + $this->_data['categories'] = $categoryCollection; - return $this->_data['categories']; + return $this->_data['categories']; } - + /** * Get the entry content diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/DublinCore/Feed.php --- a/web/lib/Zend/Feed/Reader/Extension/DublinCore/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/DublinCore/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_DublinCore_Feed @@ -84,7 +84,7 @@ $list = $this->_xpath->query('//dc10:publisher'); } } - + if ($list->length) { foreach ($list as $author) { $authors[] = array( @@ -261,7 +261,7 @@ return $this->_data['date']; } - + /** * Get categories (subjects under DC) * @@ -272,13 +272,13 @@ if (array_key_exists('categories', $this->_data)) { return $this->_data['categories']; } - + $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc11:subject'); if (!$list->length) { $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc10:subject'); } - + if ($list->length) { $categoryCollection = new Zend_Feed_Reader_Collection_Category; foreach ($list as $category) { @@ -291,9 +291,9 @@ } else { $categoryCollection = new Zend_Feed_Reader_Collection_Category; } - + $this->_data['categories'] = $categoryCollection; - return $this->_data['categories']; + return $this->_data['categories']; } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/EntryAbstract.php --- a/web/lib/Zend/Feed/Reader/Extension/EntryAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/EntryAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EntryAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: EntryAbstract.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Reader_Extension_EntryAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/FeedAbstract.php --- a/web/lib/Zend/Feed/Reader/Extension/FeedAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/FeedAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedAbstract.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -38,7 +38,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Reader_Extension_FeedAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Podcast/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/Podcast/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Podcast/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Podcast_Entry extends Zend_Feed_Reader_Extension_EntryAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Podcast/Feed.php --- a/web/lib/Zend/Feed/Reader/Extension/Podcast/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Podcast/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Podcast_Feed extends Zend_Feed_Reader_Extension_FeedAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Slash/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/Slash/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Slash/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Slash_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Syndication/Feed.php --- a/web/lib/Zend/Feed/Reader/Extension/Syndication/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Syndication/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Syndication_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/Thread/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/Thread/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/Thread/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_Thread_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php --- a/web/lib/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Extension_WellFormedWeb_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Feed/Atom.php --- a/web/lib/Zend/Feed/Reader/Feed/Atom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Feed/Atom.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Atom.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Atom.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Feed_Atom extends Zend_Feed_Reader_FeedAbstract @@ -362,7 +362,7 @@ return $this->_data['hubs']; } - + /** * Get all categories * @@ -375,7 +375,7 @@ } $categoryCollection = $this->getExtension('Atom')->getCategories(); - + if (count($categoryCollection) == 0) { $categoryCollection = $this->getExtension('DublinCore')->getCategories(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Feed/Atom/Source.php --- a/web/lib/Zend/Feed/Reader/Feed/Atom/Source.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Feed/Atom/Source.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Source.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Source.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Feed_Atom_Source extends Zend_Feed_Reader_Feed_Atom @@ -49,7 +49,7 @@ $this->_data['type'] = $type; $this->_registerNamespaces(); $this->_loadExtensions(); - + $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Atom_Feed'); $this->_extensions['Atom_Feed'] = new $atomClass($this->_domDocument, $this->_data['type'], $this->_xpath); $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Feed'); @@ -58,12 +58,12 @@ $extension->setXpathPrefix(rtrim($xpathPrefix, '/') . '/atom:source'); } } - + /** * Since this is not an Entry carrier but a vehicle for Feed metadata, any * applicable Entry methods are stubbed out and do nothing. */ - + /** * @return void */ @@ -73,7 +73,7 @@ * @return void */ public function current() {} - + /** * @return void */ @@ -88,12 +88,12 @@ * @return void */ public function rewind() {} - + /** * @return void */ public function valid() {} - + /** * @return void */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/Feed/Rss.php --- a/web/lib/Zend/Feed/Reader/Feed/Rss.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/Feed/Rss.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rss.php 23170 2010-10-19 18:29:24Z mabe $ + * @version $Id: Rss.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_Feed_Rss extends Zend_Feed_Reader_FeedAbstract @@ -105,7 +105,7 @@ if (array_key_exists('authors', $this->_data)) { return $this->_data['authors']; } - + $authors = array(); $authors_dc = $this->getExtension('DublinCore')->getAuthors(); if (!empty($authors_dc)) { @@ -139,7 +139,7 @@ $data['name'] = $matches[1]; } $authors[] = $data; - } + } } } @@ -652,7 +652,7 @@ return $this->_data['hubs']; } - + /** * Get all categories * @@ -683,7 +683,7 @@ } else { $categoryCollection = $this->getExtension('DublinCore')->getCategories(); } - + if (count($categoryCollection) == 0) { $categoryCollection = $this->getExtension('Atom')->getCategories(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/FeedAbstract.php --- a/web/lib/Zend/Feed/Reader/FeedAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/FeedAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedAbstract.php 22092 2010-05-04 12:50:51Z padraic $ + * @version $Id: FeedAbstract.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Reader_FeedAbstract implements Zend_Feed_Reader_FeedInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/FeedInterface.php --- a/web/lib/Zend/Feed/Reader/FeedInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/FeedInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedInterface.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Feed_Reader_FeedInterface extends Iterator, Countable @@ -111,7 +111,7 @@ * @return string|null */ public function getTitle(); - + /** * Get all categories * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Reader/FeedSet.php --- a/web/lib/Zend/Feed/Reader/FeedSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Reader/FeedSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedSet.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: FeedSet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Feed_Reader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Reader_FeedSet extends ArrayObject @@ -81,7 +81,7 @@ )); } } - + /** * Attempt to turn a relative URI into an absolute URI */ @@ -103,7 +103,7 @@ } return $link; } - + /** * Canonicalize relative path */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Rss.php --- a/web/lib/Zend/Feed/Rss.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Rss.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rss.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rss.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Rss extends Zend_Feed_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer.php --- a/web/lib/Zend/Feed/Writer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,33 +14,33 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Writer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer { - /** - * Namespace constants - */ - const NAMESPACE_ATOM_03 = 'http://purl.org/atom/ns#'; + /** + * Namespace constants + */ + const NAMESPACE_ATOM_03 = 'http://purl.org/atom/ns#'; const NAMESPACE_ATOM_10 = 'http://www.w3.org/2005/Atom'; const NAMESPACE_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'; const NAMESPACE_RSS_090 = 'http://my.netscape.com/rdf/simple/0.9/'; const NAMESPACE_RSS_10 = 'http://purl.org/rss/1.0/'; /** - * Feed type constants - */ - const TYPE_ANY = 'any'; - const TYPE_ATOM_03 = 'atom-03'; + * Feed type constants + */ + const TYPE_ANY = 'any'; + const TYPE_ATOM_03 = 'atom-03'; const TYPE_ATOM_10 = 'atom-10'; const TYPE_ATOM_ANY = 'atom'; const TYPE_RSS_090 = 'rss-090'; @@ -53,7 +53,7 @@ const TYPE_RSS_10 = 'rss-10'; const TYPE_RSS_20 = 'rss-20'; const TYPE_RSS_ANY = 'rss'; - + /** * PluginLoader instance used by component * @@ -81,7 +81,7 @@ 'entryRenderer' => array(), 'feedRenderer' => array(), ); - + /** * Set plugin loader for use with Extensions * @@ -257,7 +257,7 @@ self::registerExtension('Threading'); self::registerExtension('ITunes'); } - + public static function lcfirst($str) { $str[0] = strtolower($str[0]); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Deleted.php --- a/web/lib/Zend/Feed/Writer/Deleted.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Deleted.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,17 +14,17 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deleted.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Deleted.php 25160 2012-12-18 15:17:16Z matthew $ */ require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Deleted @@ -36,7 +36,7 @@ * @var array */ protected $_data = array(); - + /** * Holds the value "atom" or "rss" depending on the feed type set when * when last exported. @@ -44,7 +44,7 @@ * @var string */ protected $_type = null; - + /** * Set the feed character encoding * @@ -71,7 +71,7 @@ } return $this->_data['encoding']; } - + /** * Unset a specific data point * @@ -83,7 +83,7 @@ unset($this->_data[$name]); } } - + /** * Set the current feed type being exported to "rss" or "atom". This allows * other objects to gracefully choose whether to execute or not, depending @@ -95,7 +95,7 @@ { $this->_type = $type; } - + /** * Retrieve the current or last feed type exported. * @@ -105,7 +105,7 @@ { return $this->_type; } - + public function setReference($reference) { if (empty($reference) || !is_string($reference)) { @@ -114,7 +114,7 @@ } $this->_data['reference'] = $reference; } - + public function getReference() { if (!array_key_exists('reference', $this->_data)) { @@ -122,23 +122,23 @@ } return $this->_data['reference']; } - + public function setWhen($date = null) { $zdate = null; if ($date === null) { $zdate = new Zend_Date; - } elseif (ctype_digit($date) && strlen($date) == 10) { - $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } elseif ($date instanceof Zend_Date) { $zdate = $date; + } elseif (ctype_digit((string)$date)) { + $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); } $this->_data['when'] = $zdate; } - + public function getWhen() { if (!array_key_exists('when', $this->_data)) { @@ -146,12 +146,12 @@ } return $this->_data['when']; } - + public function setBy(array $by) { $author = array(); - if (!array_key_exists('name', $by) - || empty($by['name']) + if (!array_key_exists('name', $by) + || empty($by['name']) || !is_string($by['name']) ) { require_once 'Zend/Feed/Exception.php'; @@ -166,8 +166,8 @@ $author['email'] = $by['email']; } if (isset($by['uri'])) { - if (empty($by['uri']) - || !is_string($by['uri']) + if (empty($by['uri']) + || !is_string($by['uri']) || !Zend_Uri::check($by['uri']) ) { require_once 'Zend/Feed/Exception.php'; @@ -177,7 +177,7 @@ } $this->_data['by'] = $author; } - + public function getBy() { if (!array_key_exists('by', $this->_data)) { @@ -185,12 +185,12 @@ } return $this->_data['by']; } - + public function setComment($comment) { $this->_data['comment'] = $comment; } - + public function getComment() { if (!array_key_exists('comment', $this->_data)) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Entry.php --- a/web/lib/Zend/Feed/Writer/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Entry.php 25160 2012-12-18 15:17:16Z matthew $ */ /** @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Entry @@ -46,14 +46,14 @@ * @var array */ protected $_data = array(); - + /** * Registered extensions * * @var array */ protected $_extensions = array(); - + /** * Holds the value "atom" or "rss" depending on the feed type set when * when last exported. @@ -61,7 +61,7 @@ * @var string */ protected $_type = null; - + /** * Constructor: Primarily triggers the registration of core extensions and * loads those appropriate to this data container. @@ -84,8 +84,8 @@ { $author = array(); if (is_array($name)) { - if (!array_key_exists('name', $name) - || empty($name['name']) + if (!array_key_exists('name', $name) + || empty($name['name']) || !is_string($name['name']) ) { require_once 'Zend/Feed/Exception.php'; @@ -100,8 +100,8 @@ $author['email'] = $name['email']; } if (isset($name['uri'])) { - if (empty($name['uri']) - || !is_string($name['uri']) + if (empty($name['uri']) + || !is_string($name['uri']) || !Zend_Uri::check($name['uri']) ) { require_once 'Zend/Feed/Exception.php'; @@ -114,7 +114,7 @@ * Array notation (above) is preferred and will be the sole supported input from ZF 2.0 */ } else { - if (empty($name['name']) || !is_string($name['name'])) { + if (empty($name) || !is_string($name)) { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value'); } @@ -148,7 +148,7 @@ $this->addAuthor($author); } } - + /** * Set the feed character encoding * @@ -214,10 +214,10 @@ $zdate = null; if ($date === null) { $zdate = new Zend_Date; - } elseif (ctype_digit($date) && strlen($date) == 10) { - $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } elseif ($date instanceof Zend_Date) { $zdate = $date; + } elseif (ctype_digit((string)$date)) { + $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); @@ -235,10 +235,10 @@ $zdate = null; if ($date === null) { $zdate = new Zend_Date; - } elseif (ctype_digit($date) && strlen($date) == 10) { - $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } elseif ($date instanceof Zend_Date) { $zdate = $date; + } elseif (ctype_digit((string)$date)) { + $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); @@ -295,7 +295,7 @@ */ public function setCommentCount($count) { - if (empty($count) || !is_numeric($count) || (int) $count < 0) { + if ( !is_numeric($count) || (int) $count < 0) { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "count" must be a non-empty integer number'); } @@ -337,7 +337,7 @@ } $this->_data['commentFeedLinks'][] = $link; } - + /** * Set a links to an XML feed for any comments associated with this entry. * Each link is an array with keys "uri" and "type", where type is one of: @@ -456,7 +456,7 @@ } return $this->_data['id']; } - + /** * Get a link to the HTML source * @@ -536,12 +536,12 @@ } return $this->_data['commentFeedLinks']; } - + /** * Add a entry category * * @param string $category - */ + */ public function addCategory(array $category) { if (!isset($category['term'])) { @@ -551,7 +551,7 @@ . ' readable category name'); } if (isset($category['scheme'])) { - if (empty($category['scheme']) + if (empty($category['scheme']) || !is_string($category['scheme']) || !Zend_Uri::check($category['scheme']) ) { @@ -565,7 +565,7 @@ } $this->_data['categories'][] = $category; } - + /** * Set an array of entry categories * @@ -577,7 +577,7 @@ $this->addCategory($category); } } - + /** * Get the entry categories * @@ -590,7 +590,7 @@ } return $this->_data['categories']; } - + /** * Adds an enclosure to the entry. The array parameter may contain the * keys 'uri', 'type' and 'length'. Only 'uri' is required for Atom, though the @@ -611,7 +611,7 @@ } $this->_data['enclosure'] = $enclosure; } - + /** * Retrieve an array of all enclosures to be added to entry. * @@ -624,7 +624,7 @@ } return $this->_data['enclosure']; } - + /** * Unset a specific data point * @@ -636,7 +636,7 @@ unset($this->_data[$name]); } } - + /** * Get registered extensions * @@ -660,7 +660,7 @@ } return null; } - + /** * Set the current feed type being exported to "rss" or "atom". This allows * other objects to gracefully choose whether to execute or not, depending @@ -672,7 +672,7 @@ { $this->_type = $type; } - + /** * Retrieve the current or last feed type exported. * @@ -703,7 +703,7 @@ throw new Zend_Feed_Exception('Method: ' . $method . ' does not exist and could not be located on a registered Extension'); } - + /** * Creates a new Zend_Feed_Writer_Source data container for use. This is NOT * added to the current feed automatically, but is necessary to create a @@ -731,7 +731,7 @@ { $this->_data['source'] = $source; } - + /** * @return Zend_Feed_Writer_Source */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Exception/InvalidMethodException.php --- a/web/lib/Zend/Feed/Writer/Exception/InvalidMethodException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Exception/InvalidMethodException.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InvalidMethodException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InvalidMethodException.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Feed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Exception_InvalidMethodException extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php --- a/web/lib/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20325 2010-01-16 00:17:59Z padraic $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_Atom_Renderer_Feed @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render feed - * + * * @return void */ public function render() @@ -63,23 +63,23 @@ $this->_appendNamespaces(); } } - + /** * Append namespaces to root element of feed - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:atom', - 'http://www.w3.org/2005/Atom'); + 'http://www.w3.org/2005/Atom'); } /** * Set feed link elements - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root) @@ -98,12 +98,12 @@ } $this->_called = true; } - + /** * Set PuSH hubs - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setHubs(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php --- a/web/lib/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_Content_Renderer_Entry @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render entry - * + * * @return void */ public function render() @@ -58,23 +58,23 @@ $this->_appendNamespaces(); } } - + /** * Append namespaces to root element - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:content', - 'http://purl.org/rss/1.0/modules/content/'); + 'http://purl.org/rss/1.0/modules/content/'); } /** * Set entry content - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setContent(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php --- a/web/lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_DublinCore_Renderer_Entry @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render entry - * + * * @return void */ public function render() @@ -58,23 +58,23 @@ $this->_appendNamespaces(); } } - + /** * Append namespaces to entry - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:dc', - 'http://purl.org/dc/elements/1.1/'); + 'http://purl.org/dc/elements/1.1/'); } /** * Set entry author elements - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -88,7 +88,7 @@ if (array_key_exists('name', $data)) { $text = $dom->createTextNode($data['name']); $author->appendChild($text); - $root->appendChild($author); + $root->appendChild($author); } } $this->_called = true; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php --- a/web/lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20325 2010-01-16 00:17:59Z padraic $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_DublinCore_Renderer_Feed @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render feed - * + * * @return void */ public function render() @@ -58,23 +58,23 @@ $this->_appendNamespaces(); } } - + /** * Append namespaces to feed element - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:dc', - 'http://purl.org/dc/elements/1.1/'); + 'http://purl.org/dc/elements/1.1/'); } /** * Set feed authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -88,7 +88,7 @@ if (array_key_exists('name', $data)) { $text = $dom->createTextNode($data['name']); $author->appendChild($text); - $root->appendChild($author); + $root->appendChild($author); } } $this->_called = true; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/ITunes/Entry.php --- a/web/lib/Zend/Feed/Writer/Extension/ITunes/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/ITunes/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_ITunes_Entry @@ -33,18 +33,18 @@ * @var array */ protected $_data = array(); - + /** * Encoding of all text values * * @var string */ protected $_encoding = 'UTF-8'; - + /** * Set feed encoding - * - * @param string $enc + * + * @param string $enc * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function setEncoding($enc) @@ -52,17 +52,17 @@ $this->_encoding = $enc; return $this; } - + /** * Get feed encoding - * + * * @return string */ public function getEncoding() { return $this->_encoding; } - + /** * Set a block value of "yes" or "no". You may also set an empty string. * @@ -83,11 +83,11 @@ } $this->_data['block'] = $value; } - + /** * Add authors to itunes entry - * - * @param array $values + * + * @param array $values * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function addItunesAuthors(array $values) @@ -97,11 +97,11 @@ } return $this; } - + /** * Add author to itunes entry - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function addItunesAuthor($value) @@ -114,14 +114,14 @@ if (!isset($this->_data['authors'])) { $this->_data['authors'] = array(); } - $this->_data['authors'][] = $value; + $this->_data['authors'][] = $value; return $this; } - + /** * Set duration - * - * @param int $value + * + * @param int $value * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function setItunesDuration($value) @@ -138,11 +138,11 @@ $this->_data['duration'] = $value; return $this; } - + /** * Set "explicit" flag - * - * @param bool $value + * + * @param bool $value * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function setItunesExplicit($value) @@ -155,11 +155,11 @@ $this->_data['explicit'] = $value; return $this; } - + /** * Set keywords - * - * @param array $value + * + * @param array $value * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function setItunesKeywords(array $value) @@ -179,11 +179,11 @@ $this->_data['keywords'] = $value; return $this; } - + /** * Set subtitle - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function setItunesSubtitle($value) @@ -196,11 +196,11 @@ $this->_data['subtitle'] = $value; return $this; } - + /** * Set summary - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Entry */ public function setItunesSummary($value) @@ -213,12 +213,12 @@ $this->_data['summary'] = $value; return $this; } - + /** * Overloading to itunes specific setters - * - * @param string $method - * @param array $params + * + * @param string $method + * @param array $params * @return mixed */ public function __call($method, array $params) @@ -232,7 +232,7 @@ 'invalid method: ' . $method ); } - if (!array_key_exists($point, $this->_data) + if (!array_key_exists($point, $this->_data) || empty($this->_data[$point]) ) { return null; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/ITunes/Feed.php --- a/web/lib/Zend/Feed/Writer/Extension/ITunes/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/ITunes/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 25107 2012-11-07 20:42:00Z rob $ */ - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_ITunes_Feed @@ -33,18 +33,18 @@ * @var array */ protected $_data = array(); - + /** * Encoding of all text values * * @var string */ protected $_encoding = 'UTF-8'; - + /** * Set feed encoding - * - * @param string $enc + * + * @param string $enc * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setEncoding($enc) @@ -52,17 +52,17 @@ $this->_encoding = $enc; return $this; } - + /** * Get feed encoding - * + * * @return string */ public function getEncoding() { return $this->_encoding; } - + /** * Set a block value of "yes" or "no". You may also set an empty string. * @@ -84,11 +84,11 @@ $this->_data['block'] = $value; return $this; } - + /** * Add feed authors - * - * @param array $values + * + * @param array $values * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function addItunesAuthors(array $values) @@ -98,11 +98,11 @@ } return $this; } - + /** * Add feed author - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function addItunesAuthor($value) @@ -115,14 +115,14 @@ if (!isset($this->_data['authors'])) { $this->_data['authors'] = array(); } - $this->_data['authors'][] = $value; + $this->_data['authors'][] = $value; return $this; } - + /** * Set feed categories - * - * @param array $values + * + * @param array $values * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesCategories(array $values) @@ -152,16 +152,16 @@ . ' contain a maximum of 255 characters each'); } $this->_data['categories'][$key][] = $val; - } + } } } return $this; } - + /** * Set feed image (icon) - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesImage($value) @@ -180,11 +180,11 @@ $this->_data['image'] = $value; return $this; } - + /** * Set feed cumulative duration - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesDuration($value) @@ -201,11 +201,11 @@ $this->_data['duration'] = $value; return $this; } - + /** * Set "explicit" flag - * - * @param bool $value + * + * @param string $value Valid values: "yes", "no" or "clean" * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesExplicit($value) @@ -218,11 +218,11 @@ $this->_data['explicit'] = $value; return $this; } - + /** * Set feed keywords - * - * @param array $value + * + * @param array $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesKeywords(array $value) @@ -242,11 +242,11 @@ $this->_data['keywords'] = $value; return $this; } - + /** * Set new feed URL - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesNewFeedUrl($value) @@ -259,25 +259,25 @@ $this->_data['newFeedUrl'] = $value; return $this; } - + /** * Add feed owners - * - * @param array $values + * + * @param array $values * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function addItunesOwners(array $values) { foreach ($values as $value) { - $this->addItunesOwner($value); + $this->addItunesOwner($value); } return $this; } - + /** * Add feed owner - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function addItunesOwner(array $value) @@ -300,11 +300,11 @@ $this->_data['owners'][] = $value; return $this; } - + /** * Set feed subtitle - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesSubtitle($value) @@ -317,11 +317,11 @@ $this->_data['subtitle'] = $value; return $this; } - + /** * Set feed summary - * - * @param string $value + * + * @param string $value * @return Zend_Feed_Writer_Extension_ITunes_Feed */ public function setItunesSummary($value) @@ -334,12 +334,12 @@ $this->_data['summary'] = $value; return $this; } - + /** * Overloading: proxy to internal setters - * - * @param string $method - * @param array $params + * + * @param string $method + * @param array $params * @return mixed */ public function __call($method, array $params) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php --- a/web/lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_ITunes_Renderer_Entry @@ -41,10 +41,10 @@ * @var bool */ protected $_called = false; - + /** * Render entry - * + * * @return void */ public function render() @@ -60,23 +60,23 @@ $this->_appendNamespaces(); } } - + /** * Append namespaces to entry root - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:itunes', - 'http://www.itunes.com/dtds/podcast-1.0.dtd'); + 'http://www.itunes.com/dtds/podcast-1.0.dtd'); } /** * Set entry authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -93,12 +93,12 @@ $this->_called = true; } } - + /** * Set itunes block - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setBlock(DOMDocument $dom, DOMElement $root) @@ -113,12 +113,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set entry duration - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDuration(DOMDocument $dom, DOMElement $root) @@ -133,12 +133,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set explicit flag - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setExplicit(DOMDocument $dom, DOMElement $root) @@ -153,12 +153,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set entry keywords - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setKeywords(DOMDocument $dom, DOMElement $root) @@ -173,12 +173,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set entry subtitle - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setSubtitle(DOMDocument $dom, DOMElement $root) @@ -193,12 +193,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set entry summary - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setSummary(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php --- a/web/lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,26 +14,26 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_ITunes_Renderer_Feed extends Zend_Feed_Writer_Extension_RendererAbstract { - + /** * Set to TRUE if a rendering method actually renders something. This * is used to prevent premature appending of a XML namespace declaration @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render feed - * + * * @return void */ public function render() @@ -65,23 +65,23 @@ $this->_appendNamespaces(); } } - + /** * Append feed namespaces - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:itunes', - 'http://www.itunes.com/dtds/podcast-1.0.dtd'); + 'http://www.itunes.com/dtds/podcast-1.0.dtd'); } /** * Set feed authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -98,12 +98,12 @@ } $this->_called = true; } - + /** * Set feed itunes block - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setBlock(DOMDocument $dom, DOMElement $root) @@ -118,12 +118,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set feed categories - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCategories(DOMDocument $dom, DOMElement $root) @@ -150,12 +150,12 @@ } $this->_called = true; } - + /** * Set feed image (icon) - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setImage(DOMDocument $dom, DOMElement $root) @@ -169,12 +169,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set feed cumulative duration - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDuration(DOMDocument $dom, DOMElement $root) @@ -189,12 +189,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set explicit flag - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setExplicit(DOMDocument $dom, DOMElement $root) @@ -209,12 +209,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set feed keywords - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setKeywords(DOMDocument $dom, DOMElement $root) @@ -229,12 +229,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set feed's new URL - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setNewFeedUrl(DOMDocument $dom, DOMElement $root) @@ -249,12 +249,12 @@ $root->appendChild($el); $this->_called = true; } - + /** - * Set feed owners - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set feed owners + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setOwners(DOMDocument $dom, DOMElement $root) @@ -277,12 +277,12 @@ } $this->_called = true; } - + /** * Set feed subtitle - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setSubtitle(DOMDocument $dom, DOMElement $root) @@ -297,12 +297,12 @@ $root->appendChild($el); $this->_called = true; } - + /** * Set feed summary - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setSummary(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/RendererAbstract.php --- a/web/lib/Zend/Feed/Writer/Extension/RendererAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/RendererAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,21 +13,21 @@ * to padraic dot brady at yahoo dot com so we can send you a copy immediately. * * @category Zend - * @package Zend_Feed_Writer_Entry_Rss - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @package Zend_Feed_Writer + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: RendererAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererInterface */ require_once 'Zend/Feed/Writer/Extension/RendererInterface.php'; - + /** * @category Zend - * @package Zend_Feed_Writer_Entry_Rss - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @package Zend_Feed_Writer + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Feed_Writer_Extension_RendererAbstract @@ -37,32 +37,32 @@ * @var DOMDocument */ protected $_dom = null; - + /** * @var mixed */ protected $_entry = null; - + /** * @var DOMElement */ protected $_base = null; - + /** * @var mixed */ protected $_container = null; - + /** * @var string */ protected $_type = null; - + /** * @var DOMElement */ protected $_rootElement = null; - + /** * Encoding of all text values * @@ -72,19 +72,19 @@ /** * Constructor - * - * @param mixed $container + * + * @param mixed $container * @return void */ public function __construct($container) { $this->_container = $container; } - + /** * Set feed encoding - * - * @param string $enc + * + * @param string $enc * @return Zend_Feed_Writer_Extension_RendererAbstract */ public function setEncoding($enc) @@ -92,22 +92,22 @@ $this->_encoding = $enc; return $this; } - + /** * Get feed encoding - * + * * @return void */ public function getEncoding() { return $this->_encoding; } - + /** * Set DOMDocument and DOMElement on which to operate - * - * @param DOMDocument $dom - * @param DOMElement $base + * + * @param DOMDocument $dom + * @param DOMElement $base * @return Zend_Feed_Writer_Extension_RendererAbstract */ public function setDomDocument(DOMDocument $dom, DOMElement $base) @@ -116,21 +116,21 @@ $this->_base = $base; return $this; } - + /** * Get data container being rendered - * + * * @return mixed */ public function getDataContainer() { return $this->_container; } - + /** * Set feed type - * - * @param string $type + * + * @param string $type * @return Zend_Feed_Writer_Extension_RendererAbstract */ public function setType($type) @@ -138,21 +138,21 @@ $this->_type = $type; return $this; } - + /** * Get feedtype - * + * * @return string */ public function getType() { return $this->_type; } - + /** - * Set root element of document - * - * @param DOMElement $root + * Set root element of document + * + * @param DOMElement $root * @return Zend_Feed_Writer_Extension_RendererAbstract */ public function setRootElement(DOMElement $root) @@ -160,20 +160,20 @@ $this->_rootElement = $root; return $this; } - + /** * Get root element - * + * * @return DOMElement */ public function getRootElement() { return $this->_rootElement; } - + /** * Append namespaces to feed - * + * * @return void */ abstract protected function _appendNamespaces(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/RendererInterface.php --- a/web/lib/Zend/Feed/Writer/Extension/RendererInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/RendererInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: RendererInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Feed_Writer_Extension_RendererInterface @@ -30,30 +30,30 @@ /** * Constructor * - * @param mixed $container + * @param mixed $container * @return void */ public function __construct($container); - + /** * Set DOMDocument and DOMElement on which to operate - * - * @param DOMDocument $dom - * @param DOMElement $base + * + * @param DOMDocument $dom + * @param DOMElement $base * @return void */ public function setDomDocument(DOMDocument $dom, DOMElement $base); - + /** * Render - * + * * @return void */ public function render(); - + /** * Retrieve container - * + * * @return mixed */ public function getDataContainer(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php --- a/web/lib/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 23077 2010-10-10 23:06:49Z padraic $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_Slash_Renderer_Entry @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render entry - * + * * @return void */ public function render() @@ -58,23 +58,23 @@ $this->_appendNamespaces(); } } - + /** * Append entry namespaces - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:slash', - 'http://purl.org/rss/1.0/modules/slash/'); + 'http://purl.org/rss/1.0/modules/slash/'); } /** * Set entry comment count - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCommentCount(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php --- a/web/lib/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_Threading_Renderer_Entry @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render entry - * + * * @return void */ public function render() @@ -60,23 +60,23 @@ $this->_appendNamespaces(); } } - + /** * Append entry namespaces - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:thr', - 'http://purl.org/syndication/thread/1.0'); + 'http://purl.org/syndication/thread/1.0'); } - + /** * Set comment link - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCommentLink(DOMDocument $dom, DOMElement $root) @@ -96,12 +96,12 @@ $root->appendChild($clink); $this->_called = true; } - + /** * Set comment feed links - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root) @@ -126,9 +126,9 @@ /** * Set entry comment count - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCommentCount(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php --- a/web/lib/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20325 2010-01-16 00:17:59Z padraic $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Extension_WellFormedWeb_Renderer_Entry @@ -42,10 +42,10 @@ * @var bool */ protected $_called = false; - + /** * Render entry - * + * * @return void */ public function render() @@ -58,23 +58,23 @@ $this->_appendNamespaces(); } } - + /** * Append entry namespaces - * + * * @return void */ protected function _appendNamespaces() { $this->getRootElement()->setAttribute('xmlns:wfw', - 'http://wellformedweb.org/CommentAPI/'); + 'http://wellformedweb.org/CommentAPI/'); } - + /** * Set entry comment feed links - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Feed.php --- a/web/lib/Zend/Feed/Writer/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20518 2010-01-22 14:00:30Z padraic $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -59,7 +59,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Feed extends Zend_Feed_Writer_Feed_FeedAbstract @@ -107,7 +107,7 @@ { $this->_entries[] = $deleted; } - + /** * Creates a new Zend_Feed_Writer_Deleted data container for use. This is NOT * added to the current feed automatically, but is necessary to create a @@ -205,7 +205,7 @@ return count($this->_entries); } - /** + /** * Return the current entry * * @return Zend_Feed_Reader_Entry_Interface @@ -225,7 +225,7 @@ return $this->_entriesKey; } - /** + /** * Move the feed pointer forward * * @return void @@ -258,7 +258,8 @@ /** * Attempt to build and return the feed resulting from the data set * - * @param $type The feed type "rss" or "atom" to export as + * @param string $type The feed type "rss" or "atom" to export as + * @param bool $ignoreExceptions * @return string */ public function export($type, $ignoreExceptions = false) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Feed/FeedAbstract.php --- a/web/lib/Zend/Feed/Writer/Feed/FeedAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Feed/FeedAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedAbstract.php 23090 2010-10-12 17:28:16Z padraic $ + * @version $Id: FeedAbstract.php 25160 2012-12-18 15:17:16Z matthew $ */ /** @@ -55,7 +55,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Feed_FeedAbstract @@ -66,7 +66,7 @@ * @var array */ protected $_data = array(); - + /** * Holds the value "atom" or "rss" depending on the feed type set when * when last exported. @@ -74,7 +74,7 @@ * @var string */ protected $_type = null; - + /** * Constructor: Primarily triggers the registration of core extensions and * loads those appropriate to this data container. @@ -117,7 +117,7 @@ $author['uri'] = $name['uri']; } } else { - if (empty($name['name']) || !is_string($name['name'])) { + if (empty($name) || !is_string($name)) { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value'); } @@ -176,10 +176,10 @@ $zdate = null; if ($date === null) { $zdate = new Zend_Date; - } elseif (ctype_digit($date) && strlen($date) == 10) { - $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } elseif ($date instanceof Zend_Date) { $zdate = $date; + } elseif (ctype_digit((string)$date)) { + $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); @@ -197,10 +197,10 @@ $zdate = null; if ($date === null) { $zdate = new Zend_Date; - } elseif (ctype_digit($date) && strlen($date) == 10) { - $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } elseif ($date instanceof Zend_Date) { $zdate = $date; + } elseif (ctype_digit((string)$date)) { + $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); @@ -218,10 +218,10 @@ $zdate = null; if ($date === null) { $zdate = new Zend_Date; - } elseif (ctype_digit($date) && strlen($date) == 10) { - $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } elseif ($date instanceof Zend_Date) { $zdate = $date; + } elseif (ctype_digit((string)$date)) { + $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); @@ -310,7 +310,7 @@ } $this->_data['id'] = $id; } - + /** * Validate a URI using the tag scheme (RFC 4151) * @@ -359,9 +359,9 @@ throw new Zend_Feed_Exception('Invalid parameter: parameter \'uri\'' . ' must be a non-empty string and valid URI/IRI'); } - $this->_data['image'] = $data; + $this->_data['image'] = $data; } - + /** * Set a feed icon (URI at minimum). Parameter is a single array with the * required key 'uri'. Only 'uri' is required and used for Atom rendering. @@ -377,7 +377,7 @@ throw new Zend_Feed_Exception('Invalid parameter: parameter \'uri\'' . ' must be a non-empty string and valid URI/IRI'); } - $this->_data['icon'] = $data; + $this->_data['icon'] = $data; } /** @@ -453,7 +453,7 @@ } $this->_data['encoding'] = $encoding; } - + /** * Set the feed's base URL * @@ -468,7 +468,7 @@ } $this->_data['baseUrl'] = $url; } - + /** * Add a Pubsubhubbub hub endpoint URL * @@ -486,7 +486,7 @@ } $this->_data['hubs'][] = $url; } - + /** * Add Pubsubhubbub hub endpoint URLs * @@ -498,12 +498,12 @@ $this->addHub($url); } } - + /** * Add a feed category * * @param string $category - */ + */ public function addCategory(array $category) { if (!isset($category['term'])) { @@ -513,7 +513,7 @@ . ' readable category name'); } if (isset($category['scheme'])) { - if (empty($category['scheme']) + if (empty($category['scheme']) || !is_string($category['scheme']) || !Zend_Uri::check($category['scheme']) ) { @@ -527,7 +527,7 @@ } $this->_data['categories'][] = $category; } - + /** * Set an array of feed categories * @@ -671,7 +671,7 @@ } return $this->_data['image']; } - + /** * Get the feed icon URI * @@ -749,7 +749,7 @@ } return $this->_data['encoding']; } - + /** * Get the feed's base url * @@ -762,7 +762,7 @@ } return $this->_data['baseUrl']; } - + /** * Get the URLs used as Pubsubhubbub hubs endpoints * @@ -775,7 +775,7 @@ } return $this->_data['hubs']; } - + /** * Get the feed categories * @@ -798,7 +798,7 @@ { $this->_data = array(); } - + /** * Set the current feed type being exported to "rss" or "atom". This allows * other objects to gracefully choose whether to execute or not, depending @@ -810,7 +810,7 @@ { $this->_type = $type; } - + /** * Retrieve the current or last feed type exported. * @@ -820,7 +820,7 @@ { return $this->_type; } - + /** * Unset a specific data point * @@ -832,7 +832,7 @@ unset($this->_data[$name]); } } - + /** * Method overloading: call given method on first extension implementing it * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/Entry/Atom.php --- a/web/lib/Zend/Feed/Writer/Renderer/Entry/Atom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/Entry/Atom.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Atom.php 22758 2010-08-01 19:23:27Z padraic $ + * @version $Id: Atom.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Entry_Atom @@ -38,8 +38,8 @@ { /** * Constructor - * - * @param Zend_Feed_Writer_Entry $container + * + * @param Zend_Feed_Writer_Entry $container * @return void */ public function __construct (Zend_Feed_Writer_Entry $container) @@ -49,7 +49,7 @@ /** * Render atom entry - * + * * @return Zend_Feed_Writer_Renderer_Entry_Atom */ public function render() @@ -58,7 +58,7 @@ $this->_dom->formatOutput = true; $entry = $this->_dom->createElementNS(Zend_Feed_Writer::NAMESPACE_ATOM_10, 'entry'); $this->_dom->appendChild($entry); - + $this->_setSource($this->_dom, $entry); $this->_setTitle($this->_dom, $entry); $this->_setDescription($this->_dom, $entry); @@ -77,15 +77,15 @@ $ext->setDomDocument($this->getDomDocument(), $entry); $ext->render(); } - + return $this; } - + /** * Set entry title - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setTitle(DOMDocument $dom, DOMElement $root) @@ -108,12 +108,12 @@ $cdata = $dom->createCDATASection($this->getDataContainer()->getTitle()); $title->appendChild($cdata); } - + /** * Set entry description - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDescription(DOMDocument $dom, DOMElement $root) @@ -129,12 +129,12 @@ ); $subtitle->appendChild($cdata); } - + /** * Set date entry was modified - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateModified(DOMDocument $dom, DOMElement $root) @@ -159,12 +159,12 @@ ); $updated->appendChild($text); } - + /** * Set date entry was created - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateCreated(DOMDocument $dom, DOMElement $root) @@ -179,12 +179,12 @@ ); $el->appendChild($text); } - + /** - * Set entry authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry authors + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -218,12 +218,12 @@ } } } - + /** * Set entry enclosure - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setEnclosure(DOMDocument $dom, DOMElement $root) @@ -243,7 +243,7 @@ $enclosure->setAttribute('href', $data['uri']); $root->appendChild($enclosure); } - + protected function _setLink(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getLink()) { @@ -255,12 +255,12 @@ $link->setAttribute('type', 'text/html'); $link->setAttribute('href', $this->getDataContainer()->getLink()); } - + /** - * Set entry identifier - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry identifier + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setId(DOMDocument $dom, DOMElement $root) @@ -297,7 +297,7 @@ $text = $dom->createTextNode($this->getDataContainer()->getId()); $id->appendChild($text); } - + /** * Validate a URI using the tag scheme (RFC 4151) * @@ -329,12 +329,12 @@ } return false; } - + /** - * Set entry content - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry content + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setContent(DOMDocument $dom, DOMElement $root) @@ -364,7 +364,7 @@ $element->appendChild($xhtml); $root->appendChild($element); } - + /** * Load a HTML string and attempt to normalise to XML */ @@ -386,19 +386,19 @@ $xhtml = $content; } $xhtml = preg_replace(array( - "/(<[\/]?)([a-zA-Z]+)/" + "/(<[\/]?)([a-zA-Z]+)/" ), '$1xhtml:$2', $xhtml); $dom = new DOMDocument('1.0', $this->getEncoding()); $dom->loadXML('' . $xhtml . ''); return $dom->documentElement; } - + /** - * Set entry cateories - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry cateories + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCategories(DOMDocument $dom, DOMElement $root) @@ -421,12 +421,12 @@ $root->appendChild($category); } } - + /** * Append Source element (Atom 1.0 Feed Metadata) * - * @param DOMDocument $dom - * @param DOMElement $root + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setSource(DOMDocument $dom, DOMElement $root) @@ -439,6 +439,6 @@ $renderer->setType($this->getType()); $element = $renderer->render()->getElement(); $imported = $dom->importNode($element, true); - $root->appendChild($imported); + $root->appendChild($imported); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php --- a/web/lib/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deleted.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Deleted.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Entry_Atom_Deleted @@ -36,8 +36,8 @@ { /** * Constructor - * - * @param Zend_Feed_Writer_Deleted $container + * + * @param Zend_Feed_Writer_Deleted $container * @return void */ public function __construct (Zend_Feed_Writer_Deleted $container) @@ -47,7 +47,7 @@ /** * Render atom entry - * + * * @return Zend_Feed_Writer_Renderer_Entry_Atom */ public function render() @@ -56,21 +56,21 @@ $this->_dom->formatOutput = true; $entry = $this->_dom->createElement('at:deleted-entry'); $this->_dom->appendChild($entry); - + $entry->setAttribute('ref', $this->_container->getReference()); $entry->setAttribute('when', $this->_container->getWhen()->get(Zend_Date::ISO_8601)); - + $this->_setBy($this->_dom, $entry); $this->_setComment($this->_dom, $entry); - + return $this; } - + /** * Set tombstone comment - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setComment(DOMDocument $dom, DOMElement $root) @@ -84,12 +84,12 @@ $cdata = $dom->createCDATASection($this->getDataContainer()->getComment()); $c->appendChild($cdata); } - + /** - * Set entry authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry authors + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setBy(DOMDocument $dom, DOMElement $root) @@ -117,5 +117,5 @@ $uri->appendChild($text); } } - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/Entry/Rss.php --- a/web/lib/Zend/Feed/Writer/Renderer/Entry/Rss.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/Entry/Rss.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rss.php 22064 2010-04-30 14:02:38Z padraic $ + * @version $Id: Rss.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Entry_Rss @@ -36,18 +36,18 @@ { /** * Constructor - * - * @param Zend_Feed_Writer_Entry $container + * + * @param Zend_Feed_Writer_Entry $container * @return void */ public function __construct (Zend_Feed_Writer_Entry $container) { parent::__construct($container); } - + /** * Render RSS entry - * + * * @return Zend_Feed_Writer_Renderer_Entry_Rss */ public function render() @@ -57,7 +57,7 @@ $this->_dom->substituteEntities = false; $entry = $this->_dom->createElement('item'); $this->_dom->appendChild($entry); - + $this->_setTitle($this->_dom, $entry); $this->_setDescription($this->_dom, $entry); $this->_setDateCreated($this->_dom, $entry); @@ -77,12 +77,12 @@ return $this; } - + /** * Set entry title - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setTitle(DOMDocument $dom, DOMElement $root) @@ -106,12 +106,12 @@ $text = $dom->createTextNode($this->getDataContainer()->getTitle()); $title->appendChild($text); } - + /** * Set entry description - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDescription(DOMDocument $dom, DOMElement $root) @@ -139,12 +139,12 @@ $text = $dom->createCDATASection($this->getDataContainer()->getDescription()); $subtitle->appendChild($text); } - + /** * Set date entry was last modified - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateModified(DOMDocument $dom, DOMElement $root) @@ -160,12 +160,12 @@ ); $updated->appendChild($text); } - + /** * Set date entry was created - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateCreated(DOMDocument $dom, DOMElement $root) @@ -179,12 +179,12 @@ ); } } - + /** * Set entry authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -204,12 +204,12 @@ $root->appendChild($author); } } - + /** * Set entry enclosure - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setEnclosure(DOMDocument $dom, DOMElement $root) @@ -255,12 +255,12 @@ $enclosure->setAttribute('url', $data['uri']); $root->appendChild($enclosure); } - + /** * Set link to entry - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setLink(DOMDocument $dom, DOMElement $root) @@ -273,12 +273,12 @@ $text = $dom->createTextNode($this->getDataContainer()->getLink()); $link->appendChild($text); } - + /** * Set entry identifier - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setId(DOMDocument $dom, DOMElement $root) @@ -300,12 +300,12 @@ $id->setAttribute('isPermaLink', 'false'); } } - + /** * Set link to entry comments - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCommentLink(DOMDocument $dom, DOMElement $root) @@ -319,12 +319,12 @@ $clink->appendChild($text); $root->appendChild($clink); } - + /** * Set entry categories - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCategories(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/Feed/Atom.php --- a/web/lib/Zend/Feed/Writer/Renderer/Feed/Atom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/Feed/Atom.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Atom.php 23090 2010-10-12 17:28:16Z padraic $ + * @version $Id: Atom.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Feed_Writer_Feed */ @@ -42,7 +42,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Feed_Atom @@ -51,8 +51,8 @@ { /** * Constructor - * - * @param Zend_Feed_Writer_Feed $container + * + * @param Zend_Feed_Writer_Feed $container * @return void */ public function __construct (Zend_Feed_Writer_Feed $container) @@ -62,7 +62,7 @@ /** * Render Atom feed - * + * * @return Zend_Feed_Writer_Renderer_Feed_Atom */ public function render() @@ -93,14 +93,14 @@ $this->_setCopyright($this->_dom, $root); $this->_setCategories($this->_dom, $root); $this->_setHubs($this->_dom, $root); - + foreach ($this->_extensions as $ext) { $ext->setType($this->getType()); $ext->setRootElement($this->getRootElement()); $ext->setDomDocument($this->getDomDocument(), $root); $ext->render(); } - + foreach ($this->_container as $entry) { if ($this->getDataContainer()->getEncoding()) { $entry->setEncoding($this->getDataContainer()->getEncoding()); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php --- a/web/lib/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AtomAbstract.php 23090 2010-10-12 17:28:16Z padraic $ + * @version $Id: AtomAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Feed_Writer_Feed */ @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract @@ -45,8 +45,8 @@ { /** * Constructor - * - * @param Zend_Feed_Writer_Feed $container + * + * @param Zend_Feed_Writer_Feed $container * @return void */ public function __construct ($container) @@ -56,9 +56,9 @@ /** * Set feed language - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setLanguage(DOMDocument $dom, DOMElement $root) @@ -71,9 +71,9 @@ /** * Set feed title - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setTitle(DOMDocument $dom, DOMElement $root) @@ -100,9 +100,9 @@ /** * Set feed description - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDescription(DOMDocument $dom, DOMElement $root) @@ -119,9 +119,9 @@ /** * Set date feed was last modified - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateModified(DOMDocument $dom, DOMElement $root) @@ -149,9 +149,9 @@ /** * Set feed generator string - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setGenerator(DOMDocument $dom, DOMElement $root) @@ -176,9 +176,9 @@ /** * Set link to feed - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setLink(DOMDocument $dom, DOMElement $root) @@ -195,9 +195,9 @@ /** * Set feed links - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root) @@ -227,12 +227,12 @@ $flink->setAttribute('href', $href); } } - + /** - * Set feed authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set feed authors + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -270,9 +270,9 @@ /** * Set feed identifier - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setId(DOMDocument $dom, DOMElement $root) @@ -302,12 +302,12 @@ $text = $dom->createTextNode($this->getDataContainer()->getId()); $id->appendChild($text); } - + /** * Set feed copyright - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCopyright(DOMDocument $dom, DOMElement $root) @@ -324,9 +324,9 @@ /** * Set feed level logo (image) - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setImage(DOMDocument $dom, DOMElement $root) @@ -340,12 +340,12 @@ $text = $dom->createTextNode($image['uri']); $img->appendChild($text); } - + /** * Set feed level icon (image) - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setIcon(DOMDocument $dom, DOMElement $root) @@ -359,12 +359,12 @@ $text = $dom->createTextNode($image['uri']); $img->appendChild($text); } - + /** - * Set date feed was created - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set date feed was created + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateCreated(DOMDocument $dom, DOMElement $root) @@ -378,12 +378,12 @@ ); } } - + /** * Set base URL to feed links - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setBaseUrl(DOMDocument $dom, DOMElement $root) @@ -394,12 +394,12 @@ } $root->setAttribute('xml:base', $baseUrl); } - + /** - * Set hubs to which this feed pushes - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set hubs to which this feed pushes + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setHubs(DOMDocument $dom, DOMElement $root) @@ -415,12 +415,12 @@ $root->appendChild($hub); } } - + /** - * Set feed cateories - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set feed cateories + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCategories(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php --- a/web/lib/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,17 +14,17 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Source.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Source.php 24593 2012-01-05 20:35:02Z matthew $ */ - + require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Feed_Atom_Source @@ -34,18 +34,18 @@ /** * Constructor - * - * @param Zend_Feed_Writer_Feed_Source $container + * + * @param Zend_Feed_Writer_Feed_Source $container * @return void */ public function __construct (Zend_Feed_Writer_Source $container) { parent::__construct($container); } - + /** * Render Atom Feed Metadata (Source element) - * + * * @return Zend_Feed_Writer_Renderer_Feed_Atom */ public function render() @@ -71,7 +71,7 @@ $this->_setAuthors($this->_dom, $root); $this->_setCopyright($this->_dom, $root); $this->_setCategories($this->_dom, $root); - + foreach ($this->_extensions as $ext) { $ext->setType($this->getType()); $ext->setRootElement($this->getRootElement()); @@ -80,12 +80,12 @@ } return $this; } - + /** * Set feed generator string - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setGenerator(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/Feed/Rss.php --- a/web/lib/Zend/Feed/Writer/Renderer/Feed/Rss.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/Feed/Rss.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rss.php 22107 2010-05-05 13:42:20Z padraic $ + * @version $Id: Rss.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Feed_Writer_Feed */ @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Feed_Rss @@ -46,8 +46,8 @@ { /** * Constructor - * - * @param Zend_Feed_Writer_Feed $container + * + * @param Zend_Feed_Writer_Feed $container * @return void */ public function __construct (Zend_Feed_Writer_Feed $container) @@ -57,7 +57,7 @@ /** * Render RSS feed - * + * * @return Zend_Feed_Writer_Renderer_Feed_Rss */ public function render() @@ -71,7 +71,7 @@ $rss = $this->_dom->createElement('rss'); $this->setRootElement($rss); $rss->setAttribute('version', '2.0'); - + $channel = $this->_dom->createElement('channel'); $rss->appendChild($channel); $this->_dom->appendChild($rss); @@ -88,14 +88,14 @@ $this->_setAuthors($this->_dom, $channel); $this->_setCopyright($this->_dom, $channel); $this->_setCategories($this->_dom, $channel); - + foreach ($this->_extensions as $ext) { $ext->setType($this->getType()); $ext->setRootElement($this->getRootElement()); $ext->setDomDocument($this->getDomDocument(), $channel); $ext->render(); } - + foreach ($this->_container as $entry) { if ($this->getDataContainer()->getEncoding()) { $entry->setEncoding($this->getDataContainer()->getEncoding()); @@ -120,9 +120,9 @@ /** * Set feed language - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setLanguage(DOMDocument $dom, DOMElement $root) @@ -138,9 +138,9 @@ /** * Set feed title - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setTitle(DOMDocument $dom, DOMElement $root) @@ -166,9 +166,9 @@ /** * Set feed description - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDescription(DOMDocument $dom, DOMElement $root) @@ -193,9 +193,9 @@ /** * Set date feed was last modified - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateModified(DOMDocument $dom, DOMElement $root) @@ -214,9 +214,9 @@ /** * Set feed generator string - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setGenerator(DOMDocument $dom, DOMElement $root) @@ -242,9 +242,9 @@ /** * Set link to feed - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setLink(DOMDocument $dom, DOMElement $root) @@ -270,12 +270,12 @@ $link->setAttribute('isPermaLink', 'false'); } } - + /** * Set feed authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -295,12 +295,12 @@ $root->appendChild($author); } } - + /** * Set feed copyright - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCopyright(DOMDocument $dom, DOMElement $root) @@ -317,9 +317,9 @@ /** * Set feed channel image - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setImage(DOMDocument $dom, DOMElement $root) @@ -422,12 +422,12 @@ $img->appendChild($desc); } } - + /** * Set date feed was created - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateCreated(DOMDocument $dom, DOMElement $root) @@ -444,9 +444,9 @@ /** * Set date feed last build date - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setLastBuildDate(DOMDocument $dom, DOMElement $root) @@ -462,12 +462,12 @@ ); $lastBuildDate->appendChild($text); } - + /** * Set base URL to feed links - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setBaseUrl(DOMDocument $dom, DOMElement $root) @@ -478,12 +478,12 @@ } $root->setAttribute('xml:base', $baseUrl); } - + /** * Set feed categories - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCategories(DOMDocument $dom, DOMElement $root) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/RendererAbstract.php --- a/web/lib/Zend/Feed/Writer/Renderer/RendererAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/RendererAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,21 +14,21 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RendererAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ - + /** @see Zend_Feed_Writer */ require_once 'Zend/Feed/Writer.php'; /** @see Zend_Version */ require_once 'Zend/Version.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_RendererAbstract @@ -38,7 +38,7 @@ * @var array */ protected $_extensions = array(); - + /** * @var mixed */ @@ -58,14 +58,14 @@ * @var array */ protected $_exceptions = array(); - + /** * Encoding of all text values * * @var string */ protected $_encoding = 'UTF-8'; - + /** * Holds the value "atom" or "rss" depending on the feed type set when * when last exported. @@ -73,7 +73,7 @@ * @var string */ protected $_type = null; - + /** * @var DOMElement */ @@ -81,8 +81,8 @@ /** * Constructor - * - * @param mixed $container + * + * @param mixed $container * @return void */ public function __construct($container) @@ -91,10 +91,10 @@ $this->setType($container->getType()); $this->_loadExtensions(); } - + /** * Save XML to string - * + * * @return string */ public function saveXml() @@ -104,7 +104,7 @@ /** * Get DOM document - * + * * @return DOMDocument */ public function getDomDocument() @@ -114,7 +114,7 @@ /** * Get document element from DOM - * + * * @return DOMElement */ public function getElement() @@ -124,18 +124,18 @@ /** * Get data container of items being rendered - * + * * @return mixed */ public function getDataContainer() { return $this->_container; } - + /** * Set feed encoding - * - * @param string $enc + * + * @param string $enc * @return Zend_Feed_Writer_Renderer_RendererAbstract */ public function setEncoding($enc) @@ -143,10 +143,10 @@ $this->_encoding = $enc; return $this; } - + /** * Get feed encoding - * + * * @return string */ public function getEncoding() @@ -156,8 +156,8 @@ /** * Indicate whether or not to ignore exceptions - * - * @param bool $bool + * + * @param bool $bool * @return Zend_Feed_Writer_Renderer_RendererAbstract */ public function ignoreExceptions($bool = true) @@ -172,14 +172,14 @@ /** * Get exception list - * + * * @return array */ public function getExceptions() { return $this->_exceptions; } - + /** * Set the current feed type being exported to "rss" or "atom". This allows * other objects to gracefully choose whether to execute or not, depending @@ -191,7 +191,7 @@ { $this->_type = $type; } - + /** * Retrieve the current or last feed type exported. * @@ -201,7 +201,7 @@ { return $this->_type; } - + /** * Sets the absolute root element for the XML feed being generated. This * helps simplify the appending of namespace declarations, but also ensures @@ -214,7 +214,7 @@ { $this->_rootElement = $root; } - + /** * Retrieve the absolute root element for the XML feed being generated. * @@ -224,7 +224,7 @@ { return $this->_rootElement; } - + /** * Load extensions from Zend_Feed_Writer * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Renderer/RendererInterface.php --- a/web/lib/Zend/Feed/Writer/Renderer/RendererInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Renderer/RendererInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,68 +14,68 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RendererInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Feed_Writer_Renderer_RendererInterface { /** * Render feed/entry - * + * * @return void */ public function render(); /** * Save feed and/or entry to XML and return string - * + * * @return string */ public function saveXml(); /** * Get DOM document - * + * * @return DOMDocument */ public function getDomDocument(); /** * Get document element from DOM - * + * * @return DOMElement */ public function getElement(); /** * Get data container containing feed items - * + * * @return mixed */ public function getDataContainer(); /** * Should exceptions be ignored? - * + * * @return mixed */ public function ignoreExceptions(); - + /** * Get list of thrown exceptions - * + * * @return array */ public function getExceptions(); - + /** * Set the current feed type being exported to "rss" or "atom". This allows * other objects to gracefully choose whether to execute or not, depending @@ -84,14 +84,14 @@ * @param string $type */ public function setType($type); - + /** * Retrieve the current or last feed type exported. * * @return string Value will be "rss" or "atom" */ public function getType(); - + /** * Sets the absolute root element for the XML feed being generated. This * helps simplify the appending of namespace declarations, but also ensures @@ -101,7 +101,7 @@ * @param DOMElement $root */ public function setRootElement(DOMElement $root); - + /** * Retrieve the absolute root element for the XML feed being generated. * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Feed/Writer/Source.php --- a/web/lib/Zend/Feed/Writer/Source.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Feed/Writer/Source.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,17 +14,17 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Source.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Source.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; - + /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Source extends Zend_Feed_Writer_Feed_FeedAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/File/ClassFileLocator.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/File/ClassFileLocator.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,173 @@ +getInnerIterator()->current(); + + // If we somehow have something other than an SplFileInfo object, just + // return false + if (!$file instanceof SplFileInfo) { + return false; + } + + // If we have a directory, it's not a file, so return false + if (!$file->isFile()) { + return false; + } + + // If not a PHP file, skip + if ($file->getBasename('.php') == $file->getBasename()) { + return false; + } + + $contents = file_get_contents($file->getRealPath()); + $tokens = token_get_all($contents); + $count = count($tokens); + $i = 0; + while ($i < $count) { + $token = $tokens[$i]; + + if (!is_array($token)) { + // single character token found; skip + $i++; + continue; + } + + list($id, $content, $line) = $token; + + switch ($id) { + case T_NAMESPACE: + // Namespace found; grab it for later + $namespace = ''; + $done = false; + do { + ++$i; + $token = $tokens[$i]; + if (is_string($token)) { + if (';' === $token) { + $done = true; + } + continue; + } + list($type, $content, $line) = $token; + switch ($type) { + case T_STRING: + case T_NS_SEPARATOR: + $namespace .= $content; + break; + } + } while (!$done && $i < $count); + + // Set the namespace of this file in the object + $file->namespace = $namespace; + break; + case T_CLASS: + case T_INTERFACE: + // Abstract class, class, or interface found + + // Get the classname + $class = ''; + do { + ++$i; + $token = $tokens[$i]; + if (is_string($token)) { + continue; + } + list($type, $content, $line) = $token; + switch ($type) { + case T_STRING: + $class = $content; + break; + } + } while (empty($class) && $i < $count); + + // If a classname was found, set it in the object, and + // return boolean true (found) + if (!empty($class)) { + $file->classname = $class; + return true; + } + break; + default: + break; + } + ++$i; + } + + // No class-type tokens found; return false + return false; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/File/Transfer.php --- a/web/lib/Zend/File/Transfer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/File/Transfer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Transfer.php 21201 2010-02-24 22:13:20Z thomas $ + * @version $Id: Transfer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_File_Transfer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/File/Transfer/Adapter/Abstract.php --- a/web/lib/Zend/File/Transfer/Adapter/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/File/Transfer/Adapter/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22371 2010-06-04 20:09:44Z thomas $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_File_Transfer_Adapter_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/File/Transfer/Adapter/Http.php --- a/web/lib/Zend/File/Transfer/Adapter/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/File/Transfer/Adapter/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 22563 2010-07-15 20:42:04Z thomas $ + * @version $Id: Http.php 25087 2012-11-06 21:15:45Z rob $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstract @@ -128,6 +128,10 @@ // Workaround for a PHP error returning empty $_FILES when form data exceeds php settings if (empty($this->_files) && ($content > 0)) { if (is_array($files)) { + if (0 === count($files)) { + return false; + } + $files = current($files); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/File/Transfer/Exception.php --- a/web/lib/Zend/File/Transfer/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/File/Transfer/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_File_Transfer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_File_Transfer_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter.php --- a/web/lib/Zend/Filter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Filter.php 21096 2010-02-19 20:10:54Z thomas $ + * @version $Id: Filter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Alnum.php --- a/web/lib/Zend/Filter/Alnum.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Alnum.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Alnum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Alnum.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Alnum implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Alpha.php --- a/web/lib/Zend/Filter/Alpha.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Alpha.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Alpha.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Alpha.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Alpha implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/BaseName.php --- a/web/lib/Zend/Filter/BaseName.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/BaseName.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseName.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BaseName.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_BaseName implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Boolean.php --- a/web/lib/Zend/Filter/Boolean.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Boolean.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Boolean.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Boolean implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Callback.php --- a/web/lib/Zend/Filter/Callback.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Callback.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Callback.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Callback implements Zend_Filter_Interface @@ -130,7 +130,7 @@ /** * Calls the filter per callback * - * @param $value mixed Options for the set callback + * @param mixed $value Options for the set callback * @return mixed Result from the filter which was callbacked */ public function filter($value) @@ -149,4 +149,4 @@ return call_user_func_array($this->_callback, $options); } -} \ No newline at end of file +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress.php --- a/web/lib/Zend/Filter/Compress.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Compress.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Compress.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Compress implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/Bz2.php --- a/web/lib/Zend/Filter/Compress/Bz2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/Bz2.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bz2.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Bz2.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/CompressAbstract.php --- a/web/lib/Zend/Filter/Compress/CompressAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/CompressAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CompressAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CompressAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Filter_Compress_CompressAbstract implements Zend_Filter_Compress_CompressInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/CompressInterface.php --- a/web/lib/Zend/Filter/Compress/CompressInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/CompressInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CompressInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CompressInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Filter_Compress_CompressInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/Gz.php --- a/web/lib/Zend/Filter/Compress/Gz.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/Gz.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gz.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Gz.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/Lzf.php --- a/web/lib/Zend/Filter/Compress/Lzf.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/Lzf.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lzf.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Lzf.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Compress_Lzf implements Zend_Filter_Compress_CompressInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/Rar.php --- a/web/lib/Zend/Filter/Compress/Rar.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/Rar.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rar.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Rar.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/Tar.php --- a/web/lib/Zend/Filter/Compress/Tar.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/Tar.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tar.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tar.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Compress/Zip.php --- a/web/lib/Zend/Filter/Compress/Zip.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Compress/Zip.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Zip.php 20126 2010-01-07 18:10:58Z ralph $ + * @version $Id: Zip.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract @@ -218,7 +218,7 @@ if (!empty($target) && !is_dir($target)) { $target = dirname($target); } - + if (!empty($target)) { $target = rtrim($target, '/\\') . DIRECTORY_SEPARATOR; } @@ -249,8 +249,8 @@ ); } } - } - + } + $res = @$zip->extractTo($target); if ($res !== true) { require_once 'Zend/Filter/Exception.php'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Decompress.php --- a/web/lib/Zend/Filter/Decompress.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Decompress.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decompress.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Decompress.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Decompress extends Zend_Filter_Compress diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Decrypt.php --- a/web/lib/Zend/Filter/Decrypt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Decrypt.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decrypt.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Decrypt.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Decrypt extends Zend_Filter_Encrypt diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Digits.php --- a/web/lib/Zend/Filter/Digits.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Digits.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Digits.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Digits.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Digits implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Dir.php --- a/web/lib/Zend/Filter/Dir.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Dir.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dir.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Dir implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Encrypt.php --- a/web/lib/Zend/Filter/Encrypt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Encrypt.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Encrypt.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Encrypt.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Encrypt implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Encrypt/Interface.php --- a/web/lib/Zend/Filter/Encrypt/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Encrypt/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Filter_Encrypt_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Encrypt/Mcrypt.php --- a/web/lib/Zend/Filter/Encrypt/Mcrypt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Encrypt/Mcrypt.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mcrypt.php 21212 2010-02-27 17:33:27Z thomas $ + * @version $Id: Mcrypt.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Encrypt/Openssl.php --- a/web/lib/Zend/Filter/Encrypt/Openssl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Encrypt/Openssl.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Openssl.php 21212 2010-02-27 17:33:27Z thomas $ + * @version $Id: Openssl.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Exception.php --- a/web/lib/Zend/Filter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/File/Decrypt.php --- a/web/lib/Zend/Filter/File/Decrypt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/File/Decrypt.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decrypt.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Decrypt.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_File_Decrypt extends Zend_Filter_Decrypt diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/File/Encrypt.php --- a/web/lib/Zend/Filter/File/Encrypt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/File/Encrypt.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Encrypt.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Encrypt.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_File_Encrypt extends Zend_Filter_Encrypt diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/File/LowerCase.php --- a/web/lib/Zend/Filter/File/LowerCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/File/LowerCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LowerCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LowerCase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_File_LowerCase extends Zend_Filter_StringToLower diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/File/Rename.php --- a/web/lib/Zend/Filter/File/Rename.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/File/Rename.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rename.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rename.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_File_Rename implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/File/UpperCase.php --- a/web/lib/Zend/Filter/File/UpperCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/File/UpperCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpperCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UpperCase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_File_UpperCase extends Zend_Filter_StringToUpper diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/HtmlEntities.php --- a/web/lib/Zend/Filter/HtmlEntities.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/HtmlEntities.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlEntities.php 21060 2010-02-15 21:56:07Z thomas $ + * @version $Id: HtmlEntities.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_HtmlEntities implements Zend_Filter_Interface @@ -197,6 +197,20 @@ */ public function filter($value) { - return htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote()); + $filtered = htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote()); + if (strlen((string) $value) && !strlen($filtered)) { + if (!function_exists('iconv')) { + require_once 'Zend/Filter/Exception.php'; + throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors'); + } + $enc = $this->getEncoding(); + $value = iconv('', $enc . '//IGNORE', (string) $value); + $filtered = htmlentities($value, $this->getQuoteStyle(), $enc, $this->getDoubleQuote()); + if (!strlen($filtered)) { + require_once 'Zend/Filter/Exception.php'; + throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors'); + } + } + return $filtered; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Inflector.php --- a/web/lib/Zend/Filter/Inflector.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Inflector.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Inflector.php 21371 2010-03-07 19:56:01Z thomas $ + * @version $Id: Inflector.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Inflector implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Input.php --- a/web/lib/Zend/Filter/Input.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Input.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Input.php 22472 2010-06-20 07:36:16Z thomas $ + * @version $Id: Input.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Input @@ -801,6 +801,9 @@ $this->_data = array(); return; } + + // remember the default not empty message in case we want to temporarily change it + $preserveDefaultNotEmptyMessage = $this->_defaults[self::NOT_EMPTY_MESSAGE]; foreach ($this->_validatorRules as $ruleName => &$validatorRule) { /** @@ -836,7 +839,46 @@ $validatorRule[self::PRESENCE] = $this->_defaults[self::PRESENCE]; } if (!isset($validatorRule[self::ALLOW_EMPTY])) { - $validatorRule[self::ALLOW_EMPTY] = $this->_defaults[self::ALLOW_EMPTY]; + $foundNotEmptyValidator = false; + + foreach ($validatorRule as $rule) { + if ($rule === 'NotEmpty') { + $foundNotEmptyValidator = true; + // field may not be empty, we are ready + break 1; + } + + if (is_array($rule)) { + $keys = array_keys($rule); + $classKey = array_shift($keys); + if (isset($rule[$classKey])) { + $ruleClass = $rule[$classKey]; + if ($ruleClass === 'NotEmpty') { + $foundNotEmptyValidator = true; + // field may not be empty, we are ready + break 1; + } + } + } + + // we must check if it is an object before using instanceof + if (!is_object($rule)) { + // it cannot be a NotEmpty validator, skip this one + continue; + } + + if($rule instanceof Zend_Validate_NotEmpty) { + $foundNotEmptyValidator = true; + // field may not be empty, we are ready + break 1; + } + } + + if (!$foundNotEmptyValidator) { + $validatorRule[self::ALLOW_EMPTY] = $this->_defaults[self::ALLOW_EMPTY]; + } else { + $validatorRule[self::ALLOW_EMPTY] = false; + } } if (!isset($validatorRule[self::MESSAGES])) { @@ -844,6 +886,8 @@ } else if (!is_array($validatorRule[self::MESSAGES])) { $validatorRule[self::MESSAGES] = array($validatorRule[self::MESSAGES]); } else if (array_intersect_key($validatorList, $validatorRule[self::MESSAGES])) { + // this seems pointless... it just re-adds what it already has... + // I can disable all this and not a single unit test fails... // There are now corresponding numeric keys in the validation rule messages array // Treat it as a named messages list for all rule validators $unifiedMessages = $validatorRule[self::MESSAGES]; @@ -876,7 +920,17 @@ } if ($validator instanceof Zend_Validate_NotEmpty) { - $this->_defaults[self::NOT_EMPTY_MESSAGE] = $value; + /** we are changing the defaults here, this is alright if all subsequent validators are also a not empty + * validator, but it goes wrong if one of them is not AND is required!!! + * that is why we restore the default value at the end of this loop + */ + if (is_array($value)) { + $temp = $value; // keep the original value + $this->_defaults[self::NOT_EMPTY_MESSAGE] = array_pop($temp); + unset($temp); + } else { + $this->_defaults[self::NOT_EMPTY_MESSAGE] = $value; + } } } @@ -897,7 +951,12 @@ } else { $this->_validateRule($validatorRule); } + + // reset the default not empty message + $this->_defaults[self::NOT_EMPTY_MESSAGE] = $preserveDefaultNotEmptyMessage; } + + /** * Unset fields in $_data that have been added to other arrays. @@ -972,9 +1031,12 @@ $messages = array(); foreach ($data as $fieldKey => $field) { - $notEmptyValidator = $this->_getValidator('NotEmpty'); - $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldKey)); - + // if there is no Zend_Validate_NotEmpty instance in the rules, we will use the default + if (!($notEmptyValidator = $this->_getNotEmptyValidatorInstance($validatorRule))) { + $notEmptyValidator = $this->_getValidator('NotEmpty'); + $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldKey)); + } + if (!$notEmptyValidator->isValid($field)) { foreach ($notEmptyValidator->getMessages() as $messageKey => $message) { if (!isset($messages[$messageKey])) { @@ -1011,8 +1073,12 @@ $field = array($field); } - $notEmptyValidator = $this->_getValidator('NotEmpty'); - $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldName)); + // if there is no Zend_Validate_NotEmpty instance in the rules, we will use the default + if (!($notEmptyValidator = $this->_getNotEmptyValidatorInstance($validatorRule))) { + $notEmptyValidator = $this->_getValidator('NotEmpty'); + $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldName)); + } + if ($validatorRule[self::ALLOW_EMPTY]) { $validatorChain = $validatorRule[self::VALIDATOR_CHAIN]; } else { @@ -1021,7 +1087,7 @@ $validatorChain->addValidator($validatorRule[self::VALIDATOR_CHAIN]); } - foreach ($field as $value) { + foreach ($field as $key => $value) { if ($validatorRule[self::ALLOW_EMPTY] && !$notEmptyValidator->isValid($value)) { // Field is empty AND it's allowed. Do nothing. continue; @@ -1070,6 +1136,23 @@ } } } + + /** + * Check a validatorRule for the presence of a NotEmpty validator instance. + * The purpose is to preserve things like a custom message, that may have been + * set on the validator outside Zend_Filter_Input. + * @param array $validatorRule + * @return mixed false if none is found, Zend_Validate_NotEmpty instance if found + */ + protected function _getNotEmptyValidatorInstance($validatorRule) { + foreach ($validatorRule as $rule => $value) { + if (is_object($value) and $value instanceof Zend_Validate_NotEmpty) { + return $value; + } + } + + return false; + } /** * @param mixed $classBaseName diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Int.php --- a/web/lib/Zend/Filter/Int.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Int.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Int.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Int.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Int implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Interface.php --- a/web/lib/Zend/Filter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/LocalizedToNormalized.php --- a/web/lib/Zend/Filter/LocalizedToNormalized.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/LocalizedToNormalized.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalizedToNormalized.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocalizedToNormalized.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_LocalizedToNormalized implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/NormalizedToLocalized.php --- a/web/lib/Zend/Filter/NormalizedToLocalized.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/NormalizedToLocalized.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NormalizedToLocalized.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NormalizedToLocalized.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_NormalizedToLocalized implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Null.php --- a/web/lib/Zend/Filter/Null.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Null.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Null implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/PregReplace.php --- a/web/lib/Zend/Filter/PregReplace.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/PregReplace.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PregReplace.php 21085 2010-02-18 21:08:39Z thomas $ + * @version $Id: PregReplace.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_PregReplace implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/RealPath.php --- a/web/lib/Zend/Filter/RealPath.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/RealPath.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RealPath.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RealPath.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_RealPath implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/StringToLower.php --- a/web/lib/Zend/Filter/StringToLower.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/StringToLower.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringToLower.php 22790 2010-08-03 19:16:33Z thomas $ + * @version $Id: StringToLower.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_StringToLower implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/StringToUpper.php --- a/web/lib/Zend/Filter/StringToUpper.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/StringToUpper.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringToUpper.php 22790 2010-08-03 19:16:33Z thomas $ + * @version $Id: StringToUpper.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_StringToUpper implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/StringTrim.php --- a/web/lib/Zend/Filter/StringTrim.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/StringTrim.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringTrim.php 23401 2010-11-19 18:52:08Z ramon $ + * @version $Id: StringTrim.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_StringTrim implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/StripNewlines.php --- a/web/lib/Zend/Filter/StripNewlines.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/StripNewlines.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StripNewlines.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StripNewlines.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_StripNewlines implements Zend_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/StripTags.php --- a/web/lib/Zend/Filter/StripTags.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/StripTags.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StripTags.php 22806 2010-08-08 08:31:28Z thomas $ + * @version $Id: StripTags.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_StripTags implements Zend_Filter_Interface @@ -319,7 +319,7 @@ // If there are non-whitespace characters in the attribute string if (strlen($tagAttributes)) { // Parse iteratively for well-formed attributes - preg_match_all('/(\w+)\s*=\s*(?:(")(.*?)"|(\')(.*?)\')/s', $tagAttributes, $matches); + preg_match_all('/([\w-]+)\s*=\s*(?:(")(.*?)"|(\')(.*?)\')/s', $tagAttributes, $matches); // Initialize valid attribute accumulator $tagAttributes = ''; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/CamelCaseToDash.php --- a/web/lib/Zend/Filter/Word/CamelCaseToDash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/CamelCaseToDash.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CamelCaseToDash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CamelCaseToDash.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_CamelCaseToDash extends Zend_Filter_Word_CamelCaseToSeparator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/CamelCaseToSeparator.php --- a/web/lib/Zend/Filter/Word/CamelCaseToSeparator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/CamelCaseToSeparator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CamelCaseToSeparator.php 21088 2010-02-19 06:47:48Z thomas $ + * @version $Id: CamelCaseToSeparator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_CamelCaseToSeparator extends Zend_Filter_Word_Separator_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/CamelCaseToUnderscore.php --- a/web/lib/Zend/Filter/Word/CamelCaseToUnderscore.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/CamelCaseToUnderscore.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CamelCaseToUnderscore.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CamelCaseToUnderscore.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_CamelCaseToUnderscore extends Zend_Filter_Word_CamelCaseToSeparator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/DashToCamelCase.php --- a/web/lib/Zend/Filter/Word/DashToCamelCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/DashToCamelCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DashToCamelCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DashToCamelCase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_DashToCamelCase extends Zend_Filter_Word_SeparatorToCamelCase diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/DashToSeparator.php --- a/web/lib/Zend/Filter/Word/DashToSeparator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/DashToSeparator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DashToSeparator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DashToSeparator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_DashToSeparator extends Zend_Filter_Word_Separator_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/DashToUnderscore.php --- a/web/lib/Zend/Filter/Word/DashToUnderscore.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/DashToUnderscore.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DashToUnderscore.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DashToUnderscore.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_DashToUnderscore extends Zend_Filter_Word_SeparatorToSeparator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/Separator/Abstract.php --- a/web/lib/Zend/Filter/Word/Separator/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/Separator/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Filter * @uses Zend_Filter_PregReplace - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Filter_Word_Separator_Abstract extends Zend_Filter_PregReplace diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/SeparatorToCamelCase.php --- a/web/lib/Zend/Filter/Word/SeparatorToCamelCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/SeparatorToCamelCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SeparatorToCamelCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SeparatorToCamelCase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_SeparatorToCamelCase extends Zend_Filter_Word_Separator_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/SeparatorToDash.php --- a/web/lib/Zend/Filter/Word/SeparatorToDash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/SeparatorToDash.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SeparatorToDash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SeparatorToDash.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_SeparatorToDash extends Zend_Filter_Word_SeparatorToSeparator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/SeparatorToSeparator.php --- a/web/lib/Zend/Filter/Word/SeparatorToSeparator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/SeparatorToSeparator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SeparatorToSeparator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SeparatorToSeparator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_SeparatorToSeparator extends Zend_Filter_PregReplace diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/UnderscoreToCamelCase.php --- a/web/lib/Zend/Filter/Word/UnderscoreToCamelCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/UnderscoreToCamelCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UnderscoreToCamelCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UnderscoreToCamelCase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_UnderscoreToCamelCase extends Zend_Filter_Word_SeparatorToCamelCase diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/UnderscoreToDash.php --- a/web/lib/Zend/Filter/Word/UnderscoreToDash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/UnderscoreToDash.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UnderscoreToDash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UnderscoreToDash.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_UnderscoreToDash extends Zend_Filter_Word_SeparatorToSeparator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Filter/Word/UnderscoreToSeparator.php --- a/web/lib/Zend/Filter/Word/UnderscoreToSeparator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Filter/Word/UnderscoreToSeparator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UnderscoreToSeparator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UnderscoreToSeparator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Filter_Word_UnderscoreToSeparator extends Zend_Filter_Word_SeparatorToSeparator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form.php --- a/web/lib/Zend/Form.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 23429 2010-11-22 23:06:46Z bittarman $ + * @version $Id: Form.php 25223 2013-01-17 14:44:54Z frosch $ */ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface { @@ -353,6 +353,11 @@ unset($options['attribs']); } + if (isset($options['subForms'])) { + $this->addSubForms($options['subForms']); + unset($options['subForms']); + } + $forbidden = array( 'Options', 'Config', 'PluginLoader', 'SubForms', 'Translator', 'Attrib', 'Default', @@ -495,12 +500,13 @@ $loader->addPrefixPath($prefix, $path); return $this; case null: - $prefix = rtrim($prefix, '_'); + $nsSeparator = (false !== strpos($prefix, '\\'))?'\\':'_'; + $prefix = rtrim($prefix, $nsSeparator); $path = rtrim($path, DIRECTORY_SEPARATOR); foreach (array(self::DECORATOR, self::ELEMENT) as $type) { $cType = ucfirst(strtolower($type)); $pluginPath = $path . DIRECTORY_SEPARATOR . $cType . DIRECTORY_SEPARATOR; - $pluginPrefix = $prefix . '_' . $cType; + $pluginPrefix = $prefix . $nsSeparator . $cType; $loader = $this->getPluginLoader($type); $loader->addPrefixPath($pluginPrefix, $pluginPath); } @@ -1013,6 +1019,7 @@ * @param string|Zend_Form_Element $element * @param string $name * @param array|Zend_Config $options + * @throws Zend_Form_Exception on invalid element * @return Zend_Form */ public function addElement($element, $name = null, $options = null) @@ -1020,20 +1027,9 @@ if (is_string($element)) { if (null === $name) { require_once 'Zend/Form/Exception.php'; - throw new Zend_Form_Exception('Elements specified by string must have an accompanying name'); - } - - if (is_array($this->_elementDecorators)) { - if (null === $options) { - $options = array('decorators' => $this->_elementDecorators); - } elseif ($options instanceof Zend_Config) { - $options = $options->toArray(); - } - if (is_array($options) - && !array_key_exists('decorators', $options) - ) { - $options['decorators'] = $this->_elementDecorators; - } + throw new Zend_Form_Exception( + 'Elements specified by string must have an accompanying name' + ); } $this->_elements[$name] = $this->createElement($element, $name, $options); @@ -1044,12 +1040,23 @@ $prefixPaths = array_merge($prefixPaths, $this->_elementPrefixPaths); } + if (is_array($this->_elementDecorators) + && 0 == count($element->getDecorators()) + ) { + $element->setDecorators($this->_elementDecorators); + } + if (null === $name) { $name = $element->getName(); } $this->_elements[$name] = $element; $this->_elements[$name]->addPrefixPaths($prefixPaths); + } else { + require_once 'Zend/Form/Exception.php'; + throw new Zend_Form_Exception( + 'Element must be specified by string or Zend_Form_Element instance' + ); } $this->_order[$name] = $this->_elements[$name]->getOrder(); @@ -1096,12 +1103,22 @@ if ((null === $options) || !is_array($options)) { $options = array('prefixPath' => $prefixPaths); + + if (is_array($this->_elementDecorators)) { + $options['decorators'] = $this->_elementDecorators; + } } elseif (is_array($options)) { if (array_key_exists('prefixPath', $options)) { $options['prefixPath'] = array_merge($prefixPaths, $options['prefixPath']); } else { $options['prefixPath'] = $prefixPaths; } + + if (is_array($this->_elementDecorators) + && !array_key_exists('decorators', $options) + ) { + $options['decorators'] = $this->_elementDecorators; + } } $class = $this->getPluginLoader(self::ELEMENT)->load($type); @@ -1340,11 +1357,11 @@ { $values = array(); $eBelongTo = null; - + if ($this->isArray()) { $eBelongTo = $this->getElementsBelongTo(); } - + foreach ($this->getElements() as $key => $element) { if (!$element->getIgnore()) { $merge = array(); @@ -1637,12 +1654,8 @@ */ public function addSubForms(array $subForms) { - foreach ($subForms as $key => $spec) { - $name = null; - if (!is_numeric($key)) { - $name = $key; - } - + foreach ($subForms as $key => $spec) { + $name = (string) $key; if ($spec instanceof Zend_Form) { $this->addSubForm($spec, $name); continue; @@ -1656,6 +1669,10 @@ continue; case (1 <= $argc): $subForm = array_shift($spec); + + if (!$subForm instanceof Zend_Form) { + $subForm = new Zend_Form_SubForm($subForm); + } case (2 <= $argc): $name = array_shift($spec); case (3 <= $argc): @@ -1786,7 +1803,11 @@ $group = array(); foreach ($elements as $element) { if($element instanceof Zend_Form_Element) { - $element = $element->getId(); + $elementName = $element->getName(); + if (!isset($this->_elements[$elementName])) { + $this->addElement($element); + } + $element = $elementName; } if (isset($this->_elements[$element])) { @@ -2102,8 +2123,8 @@ * Given an array, an optional arrayPath and a key this method * dissolves the arrayPath and unsets the key within the array * if it exists. - * - * @param array $array + * + * @param array $array * @param string|null $arrayPath * @param string $key * @return array @@ -2113,7 +2134,7 @@ $unset =& $array; $path = trim(strtr((string)$arrayPath, array('[' => '/', ']' => '')), '/'); $segs = ('' !== $path) ? explode('/', $path) : array(); - + foreach ($segs as $seg) { if (!array_key_exists($seg, (array)$unset)) { return $array; @@ -2159,9 +2180,9 @@ * Subitems are inserted based on their order Setting if set, * otherwise they are appended, the resulting numerical index * may differ from the order value. - * + * * @access protected - * @return array + * @return array */ public function getElementsAndSubFormsOrdered() { @@ -2187,8 +2208,8 @@ } /** - * This is a helper function until php 5.3 is widespreaded - * + * This is a helper function until php 5.3 is widespreaded + * * @param array $into * @access protected * @return void @@ -2250,7 +2271,8 @@ } } foreach ($this->getSubForms() as $key => $form) { - if (null !== $translator && !$form->hasTranslator()) { + if (null !== $translator && $this->hasTranslator() + && !$form->hasTranslator()) { $form->setTranslator($translator); } if (isset($data[$key]) && !$form->isArray()) { @@ -2457,10 +2479,21 @@ /** * Are there errors in the form? * + * @deprecated since 1.11.1 - use hasErrors() instead * @return bool */ public function isErrors() { + return $this->hasErrors(); + } + + /** + * Are there errors in the form? + * + * @return bool + */ + public function hasErrors() + { return $this->_errorsExist; } @@ -2480,7 +2513,7 @@ return $this->getSubForm($name)->getErrors(null, true); } } - + foreach ($this->_elements as $key => $element) { $errors[$key] = $element->getErrors(); } @@ -2568,7 +2601,7 @@ /** * Retrieve translated custom error messages * Proxies to {@link _getErrorMessages()}. - * + * * @return array */ public function getCustomMessages() @@ -2985,16 +3018,16 @@ return $this->_translator; } - + /** * Does this form have its own specific translator? - * + * * @return bool */ public function hasTranslator() { return (bool)$this->_translator; - } + } /** * Get global default translator object @@ -3019,14 +3052,14 @@ /** * Is there a default translation object set? - * + * * @return boolean */ public static function hasDefaultTranslator() - { + { return (bool)self::$_translatorDefault; } - + /** * Indicate whether or not translation should be disabled * @@ -3272,7 +3305,7 @@ /** * Load the default decorators * - * @return void + * @return Zend_Form */ public function loadDefaultDecorators() { @@ -3291,7 +3324,7 @@ /** * Remove an element from iteration - * + * * @param string $name Element/group/form name * @return void */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Abstract.php --- a/web/lib/Zend/Form/Decorator/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21146 2010-02-23 14:35:57Z yoshida@zend.co.jp $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Form_Decorator_Abstract implements Zend_Form_Decorator_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Callback.php --- a/web/lib/Zend/Form/Decorator/Callback.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Callback.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -44,9 +44,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Callback.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_Callback extends Zend_Form_Decorator_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Captcha.php --- a/web/lib/Zend/Form/Decorator/Captcha.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Captcha.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Captcha.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Captcha.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_Captcha extends Zend_Form_Decorator_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Captcha/ReCaptcha.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Form/Decorator/Captcha/ReCaptcha.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,128 @@ +getElement(); + if (!$element instanceof Zend_Form_Element_Captcha) { + return $content; + } + + $view = $element->getView(); + if (null === $view) { + return $content; + } + + $id = $element->getId(); + $name = $element->getBelongsTo(); + $placement = $this->getPlacement(); + $separator = $this->getSeparator(); + $challengeName = empty($name) ? 'recaptcha_challenge_field' : $name . '[recaptcha_challenge_field]'; + $responseName = empty($name) ? 'recaptcha_response_field' : $name . '[recaptcha_response_field]'; + $challengeId = $id . '-challenge'; + $responseId = $id . '-response'; + $captcha = $element->getCaptcha(); + $markup = $captcha->render($view, $element); + + // Create hidden fields for holding the final recaptcha values + // Placing "id" in "attribs" to ensure it is not overwritten with the name + $hidden = $view->formHidden(array( + 'name' => $challengeName, + 'attribs' => array('id' => $challengeId), + )); + $hidden .= $view->formHidden(array( + 'name' => $responseName, + 'attribs' => array('id' => $responseId), + )); + + // Create a window.onload event so that we can bind to the form. + // Once bound, add an onsubmit event that will replace the hidden field + // values with those produced by ReCaptcha + // zendBindEvent mediates between Mozilla's addEventListener and + // IE's sole support for addEvent. + $js =<< +function windowOnLoad(fn) { + var old = window.onload; + window.onload = function() { + if (old) { + old(); + } + fn(); + }; +} +function zendBindEvent(el, eventName, eventHandler) { + if (el.addEventListener){ + el.addEventListener(eventName, eventHandler, false); + } else if (el.attachEvent){ + el.attachEvent('on'+eventName, eventHandler); + } +} +windowOnLoad(function(){ + zendBindEvent( + document.getElementById("$challengeId").form, + 'submit', + function(e) { + document.getElementById("$challengeId").value = document.getElementById("recaptcha_challenge_field").value; + document.getElementById("$responseId").value = document.getElementById("recaptcha_response_field").value; + } + ); +}); + +EOJ; + + // Always place the hidden fields before the captcha markup, and follow + // with the JS from above + switch ($placement) { + case 'PREPEND': + $content = $hidden . $markup . $js . $separator . $content; + break; + case 'APPEND': + default: + $content = $content . $separator . $hidden . $markup . $js; + } + return $content; + } +} + diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Captcha/Word.php --- a/web/lib/Zend/Form/Decorator/Captcha/Word.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Captcha/Word.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Word.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Word.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_Captcha_Word extends Zend_Form_Decorator_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Description.php --- a/web/lib/Zend/Form/Decorator/Description.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Description.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -37,9 +37,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Description.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_Description extends Zend_Form_Decorator_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/DtDdWrapper.php --- a/web/lib/Zend/Form/Decorator/DtDdWrapper.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/DtDdWrapper.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,9 +31,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DtDdWrapper.php 22128 2010-05-06 11:18:02Z alab $ + * @version $Id: DtDdWrapper.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_DtDdWrapper extends Zend_Form_Decorator_Abstract { @@ -51,14 +51,14 @@ *
$content
* * $dtLabel can be set via 'dtLabel' option, defaults to '\ ' - * + * * @param string $content * @return string */ public function render($content) { $elementName = $this->getElement()->getName(); - + $dtLabel = $this->getOption('dtLabel'); if( null === $dtLabel ) { $dtLabel = ' '; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Errors.php --- a/web/lib/Zend/Form/Decorator/Errors.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Errors.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Errors.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Errors.php 25253 2013-02-12 14:09:16Z frosch $ */ class Zend_Form_Decorator_Errors extends Zend_Form_Decorator_Abstract { @@ -50,7 +50,15 @@ return $content; } - $errors = $element->getMessages(); + // Get error messages + if ($element instanceof Zend_Form + && null !== $element->getElementsBelongTo() + ) { + $errors = $element->getMessages(null, true); + } else { + $errors = $element->getMessages(); + } + if (empty($errors)) { return $content; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Exception.php --- a/web/lib/Zend/Form/Decorator/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Decorator_Exception extends Zend_Form_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Fieldset.php --- a/web/lib/Zend/Form/Decorator/Fieldset.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Fieldset.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fieldset.php 23426 2010-11-22 22:50:25Z bittarman $ + * @version $Id: Fieldset.php 24961 2012-06-15 14:15:47Z adamlundrigan $ */ class Zend_Form_Decorator_Fieldset extends Zend_Form_Decorator_Abstract { @@ -46,6 +46,7 @@ 'helper', 'method', 'name', + 'accept-charset', ); /** @@ -131,7 +132,7 @@ $name = $element->getFullyQualifiedName(); $id = (string)$element->getId(); - if (!array_key_exists('id', $attribs) && '' !== $id) { + if ((!array_key_exists('id', $attribs) || $attribs['id'] == $id) && '' !== $id) { $attribs['id'] = 'fieldset-' . $id; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/File.php --- a/web/lib/Zend/Form/Decorator/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 25067 2012-11-03 14:20:28Z rob $ */ class Zend_Form_Decorator_File extends Zend_Form_Decorator_Abstract @@ -117,16 +117,17 @@ $markup[] = $view->formHidden('UPLOAD_IDENTIFIER', uniqid(), array('id' => 'progress_key')); } + $helper = $element->helper; if ($element->isArray()) { $name .= "[]"; $count = $element->getMultiFile(); for ($i = 0; $i < $count; ++$i) { $htmlAttribs = $attribs; $htmlAttribs['id'] .= '-' . $i; - $markup[] = $view->formFile($name, $htmlAttribs); + $markup[] = $view->$helper($name, $htmlAttribs); } } else { - $markup[] = $view->formFile($name, $attribs); + $markup[] = $view->$helper($name, $attribs); } $markup = implode($separator, $markup); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Form.php --- a/web/lib/Zend/Form/Decorator/Form.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Form.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -37,9 +37,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Form.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_Form extends Zend_Form_Decorator_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/FormElements.php --- a/web/lib/Zend/Form/Decorator/FormElements.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/FormElements.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormElements.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormElements.php 25093 2012-11-07 20:08:05Z rob $ */ class Zend_Form_Decorator_FormElements extends Zend_Form_Decorator_Abstract { @@ -76,14 +76,29 @@ $belongsTo = ($form instanceof Zend_Form) ? $form->getElementsBelongTo() : null; $elementContent = ''; + $displayGroups = ($form instanceof Zend_Form) ? $form->getDisplayGroups() : array(); $separator = $this->getSeparator(); $translator = $form->getTranslator(); $items = array(); $view = $form->getView(); foreach ($form as $item) { - $item->setView($view) - ->setTranslator($translator); + $item->setView($view); + + // Set translator + if (!$item->hasTranslator()) { + $item->setTranslator($translator); + } + if ($item instanceof Zend_Form_Element) { + foreach ($displayGroups as $group) { + $elementName = $item->getName(); + $element = $group->getElement($elementName); + if ($element) { + // Element belongs to display group; only render in that + // context. + continue 2; + } + } $item->setBelongsTo($belongsTo); } elseif (!empty($belongsTo) && ($item instanceof Zend_Form)) { if ($item->isArray()) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/FormErrors.php --- a/web/lib/Zend/Form/Decorator/FormErrors.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/FormErrors.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormErrors.php 22316 2010-05-29 10:03:37Z alab $ + * @version $Id: FormErrors.php 25257 2013-02-13 16:47:18Z frosch $ */ class Zend_Form_Decorator_FormErrors extends Zend_Form_Decorator_Abstract { @@ -70,6 +70,12 @@ /**#@-*/ /** + * Whether or not to escape error label and error message + * @var bool + */ + protected $_escape; + + /** * Render errors * * @param string $content @@ -345,13 +351,13 @@ /** * Get showCustomFormErrors - * + * * @return bool */ public function getShowCustomFormErrors() { if (null === $this->_showCustomFormErrors) { - if (null === ($how = $this->getOption('showCustomFormErrors'))) { + if (null === ($show = $this->getOption('showCustomFormErrors'))) { $this->setShowCustomFormErrors($this->_defaults['showCustomFormErrors']); } else { $this->setShowCustomFormErrors($show); @@ -375,7 +381,7 @@ /** * Get onlyCustomFormErrors - * + * * @return bool */ public function getOnlyCustomFormErrors() @@ -405,6 +411,41 @@ } /** + * Set whether or not to escape error label and error message + * + * Sets also the 'escape' option for the view helper + * + * @param bool $flag + * @return Zend_Form_Decorator_FormErrors + */ + public function setEscape($flag) + { + $this->_escape = (bool) $flag; + + // Set also option for view helper + $this->setOption('escape', $this->_escape); + return $this; + } + + /** + * Get escape flag + * + * @return bool + */ + public function getEscape() + { + if (null === $this->_escape) { + if (null !== ($escape = $this->getOption('escape'))) { + $this->setEscape($escape); + } else { + $this->setEscape(true); + } + } + + return $this->_escape; + } + + /** * Render element label * * @param Zend_Form_Element $element @@ -416,10 +457,19 @@ $label = $element->getLabel(); if (empty($label)) { $label = $element->getName(); + + // Translate element name + if (null !== ($translator = $element->getTranslator())) { + $label = $translator->translate($label); + } + } + + if ($this->getEscape()) { + $label = $view->escape($label); } return $this->getMarkupElementLabelStart() - . $view->escape($label) + . $label . $this->getMarkupElementLabelEnd(); } @@ -451,9 +501,13 @@ . $this->getMarkupListItemEnd(); } } else if ($subitem instanceof Zend_Form && !$this->ignoreSubForms()) { - $content .= $this->getMarkupListStart() - . $this->_recurseForm($subitem, $view) - . $this->getMarkupListEnd(); + $markup = $this->_recurseForm($subitem, $view); + + if (!empty($markup)) { + $content .= $this->getMarkupListStart() + . $markup + . $this->getMarkupListEnd(); + } } } return $content; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/HtmlTag.php --- a/web/lib/Zend/Form/Decorator/HtmlTag.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/HtmlTag.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -43,9 +43,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlTag.php 21970 2010-04-22 18:14:45Z alab $ + * @version $Id: HtmlTag.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_HtmlTag extends Zend_Form_Decorator_Abstract { @@ -85,8 +85,9 @@ $key = htmlspecialchars($key, ENT_COMPAT, $enc); if (is_array($val)) { if (array_key_exists('callback', $val) - && is_callable($val['callback'])) { - $val = $val['callback']($this); + && is_callable($val['callback']) + ) { + $val = call_user_func($val['callback'], $this); } else { $val = implode(' ', $val); } @@ -231,7 +232,7 @@ /** * Get encoding for use with htmlspecialchars() - * + * * @return string */ protected function _getEncoding() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Image.php --- a/web/lib/Zend/Form/Decorator/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_Image extends Zend_Form_Decorator_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Interface.php --- a/web/lib/Zend/Form/Decorator/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,9 +24,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ interface Zend_Form_Decorator_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Label.php --- a/web/lib/Zend/Form/Decorator/Label.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Label.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,8 +29,9 @@ * - separator: separator to use between label and content (defaults to PHP_EOL) * - placement: whether to append or prepend label to content (defaults to prepend) * - tag: if set, used to wrap the label in an additional HTML tag + * - tagClass: if tag option is set, used to add a class to the label wrapper * - opt(ional)Prefix: a prefix to the label to use when the element is optional - * - opt(iona)lSuffix: a suffix to the label to use when the element is optional + * - opt(ional)Suffix: a suffix to the label to use when the element is optional * - req(uired)Prefix: a prefix to the label to use when the element is required * - req(uired)Suffix: a suffix to the label to use when the element is required * @@ -39,13 +40,20 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Label.php 22128 2010-05-06 11:18:02Z alab $ + * @version $Id: Label.php 25243 2013-01-22 12:07:26Z frosch $ */ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract { /** + * Placement constants + */ + const IMPLICIT = 'IMPLICIT'; + const IMPLICIT_PREPEND = 'IMPLICIT_PREPEND'; + const IMPLICIT_APPEND = 'IMPLICIT_APPEND'; + + /** * Default placement: prepend * @var string */ @@ -58,6 +66,12 @@ protected $_tag; /** + * Class for the HTML tag with which to surround label + * @var string + */ + protected $_tagClass; + + /** * Set element ID * * @param string $id @@ -129,6 +143,43 @@ } /** + * Set the class to apply to the HTML tag with which to surround label + * + * @param string $tagClass + * @return Zend_Form_Decorator_Label + */ + public function setTagClass($tagClass) + { + if (empty($tagClass)) { + $this->_tagClass = null; + } else { + $this->_tagClass = (string) $tagClass; + } + + $this->removeOption('tagClass'); + + return $this; + } + + /** + * Get the class to apply to the HTML tag, if any, with which to surround label + * + * @return void + */ + public function getTagClass() + { + if (null === $this->_tagClass) { + $tagClass = $this->getOption('tagClass'); + if (null !== $tagClass) { + $this->removeOption('tagClass'); + $this->setTagClass($tagClass); + } + } + + return $this->_tagClass; + } + + /** * Get class with which to define label * * Appends either 'optional' or 'required' to class, depending on whether @@ -242,7 +293,7 @@ /** * Get label to render * - * @return void + * @return string */ public function getLabel() { @@ -257,10 +308,6 @@ return ''; } - if (null !== ($translator = $element->getTranslator())) { - $label = $translator->translate($label); - } - $optPrefix = $this->getOptPrefix(); $optSuffix = $this->getOptSuffix(); $reqPrefix = $this->getReqPrefix(); @@ -278,6 +325,35 @@ return $label; } + /** + * Determine if label should append, prepend or implicit content + * + * @return string + */ + public function getPlacement() + { + $placement = $this->_placement; + if (null !== ($placementOpt = $this->getOption('placement'))) { + $placementOpt = strtoupper($placementOpt); + switch ($placementOpt) { + case self::APPEND: + case self::PREPEND: + case self::IMPLICIT: + case self::IMPLICIT_PREPEND: + case self::IMPLICIT_APPEND: + $placement = $this->_placement = $placementOpt; + break; + case false: + $placement = $this->_placement = null; + break; + default: + break; + } + $this->removeOption('placement'); + } + + return $placement; + } /** * Render a label @@ -297,6 +373,7 @@ $separator = $this->getSeparator(); $placement = $this->getPlacement(); $tag = $this->getTag(); + $tagClass = $this->getTagClass(); $id = $this->getId(); $class = $this->getClass(); $options = $this->getOptions(); @@ -308,7 +385,48 @@ if (!empty($label)) { $options['class'] = $class; - $label = $view->formLabel($element->getFullyQualifiedName(), trim($label), $options); + $label = trim($label); + + switch ($placement) { + case self::IMPLICIT: + // Break was intentionally omitted + + case self::IMPLICIT_PREPEND: + $options['escape'] = false; + $options['disableFor'] = true; + + $label = $view->formLabel( + $element->getFullyQualifiedName(), + $label . $separator . $content, + $options + ); + break; + + case self::IMPLICIT_APPEND: + $options['escape'] = false; + $options['disableFor'] = true; + + $label = $view->formLabel( + $element->getFullyQualifiedName(), + $content . $separator . $label, + $options + ); + break; + + case self::APPEND: + // Break was intentionally omitted + + case self::PREPEND: + // Break was intentionally omitted + + default: + $label = $view->formLabel( + $element->getFullyQualifiedName(), + $label, + $options + ); + break; + } } else { $label = ' '; } @@ -316,8 +434,14 @@ if (null !== $tag) { require_once 'Zend/Form/Decorator/HtmlTag.php'; $decorator = new Zend_Form_Decorator_HtmlTag(); - $decorator->setOptions(array('tag' => $tag, - 'id' => $id . '-label')); + if (null !== $this->_tagClass) { + $decorator->setOptions(array('tag' => $tag, + 'id' => $id . '-label', + 'class' => $tagClass)); + } else { + $decorator->setOptions(array('tag' => $tag, + 'id' => $id . '-label')); + } $label = $decorator->render($label); } @@ -325,8 +449,18 @@ switch ($placement) { case self::APPEND: return $content . $separator . $label; + case self::PREPEND: return $label . $separator . $content; + + case self::IMPLICIT: + // Break was intentionally omitted + + case self::IMPLICIT_PREPEND: + // Break was intentionally omitted + + case self::IMPLICIT_APPEND: + return $label; } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Marker/File/Interface.php --- a/web/lib/Zend/Form/Decorator/Marker/File/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Marker/File/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,9 +24,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ interface Zend_Form_Decorator_Marker_File_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/PrepareElements.php --- a/web/lib/Zend/Form/Decorator/PrepareElements.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/PrepareElements.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PrepareElements.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PrepareElements.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_PrepareElements extends Zend_Form_Decorator_FormElements { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/Tooltip.php --- a/web/lib/Zend/Form/Decorator/Tooltip.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/Tooltip.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Tooltip.php$ */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/ViewHelper.php --- a/web/lib/Zend/Form/Decorator/ViewHelper.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/ViewHelper.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -37,9 +37,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewHelper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewHelper.php 25189 2013-01-08 08:32:43Z frosch $ */ class Zend_Form_Decorator_ViewHelper extends Zend_Form_Decorator_Abstract { @@ -196,7 +196,8 @@ if ($element instanceof $type) { if (stristr($type, 'button')) { $element->content = $element->getLabel(); - return null; + + return $element->getValue(); } return $element->getLabel(); } @@ -243,7 +244,18 @@ $helperObject->setTranslator($element->getTranslator()); } - $elementContent = $view->$helper($name, $value, $attribs, $element->options); + // Check list separator + if (isset($attribs['listsep']) + && in_array($helper, array('formMulticheckbox', 'formRadio', 'formSelect')) + ) { + $listsep = $attribs['listsep']; + unset($attribs['listsep']); + + $elementContent = $view->$helper($name, $value, $attribs, $element->options, $listsep); + } else { + $elementContent = $view->$helper($name, $value, $attribs, $element->options); + } + switch ($this->getPlacement()) { case self::APPEND: return $content . $separator . $elementContent; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Decorator/ViewScript.php --- a/web/lib/Zend/Form/Decorator/ViewScript.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Decorator/ViewScript.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,9 +46,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewScript.php 23299 2010-11-05 04:38:14Z matthew $ + * @version $Id: ViewScript.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Decorator_ViewScript extends Zend_Form_Decorator_Abstract { @@ -108,7 +108,7 @@ /** * Set view script module - * + * * @param string $module * @return Zend_Form_Decorator_ViewScript */ @@ -120,7 +120,7 @@ /** * Get view script module - * + * * @return string|null */ public function getViewModule() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/DisplayGroup.php --- a/web/lib/Zend/Form/DisplayGroup.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/DisplayGroup.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,9 +23,9 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DisplayGroup.php 22930 2010-09-09 18:45:18Z matthew $ + * @version $Id: DisplayGroup.php 25093 2012-11-07 20:08:05Z rob $ */ class Zend_Form_DisplayGroup implements Iterator,Countable { @@ -67,7 +67,7 @@ /** * Form object to which the display group is currently registered - * + * * @var Zend_Form */ protected $_form; @@ -284,15 +284,15 @@ /** * Set form object to which the display group is attached - * - * @param Zend_Form $form + * + * @param Zend_Form $form * @return Zend_Form_DisplayGroup */ public function setForm(Zend_Form $form) { $this->_form = $form; - // Ensure any elements attached prior to setting the form are now + // Ensure any elements attached prior to setting the form are now // removed from iteration by the form foreach ($this->getElements() as $element) { $form->removeFromIteration($element->getName()); @@ -303,7 +303,7 @@ /** * Get form object to which the group is attached - * + * * @return Zend_Form|null */ public function getForm() @@ -657,7 +657,7 @@ /** * Load default decorators * - * @return void + * @return Zend_Form_DisplayGroup */ public function loadDefaultDecorators() { @@ -977,6 +977,16 @@ } /** + * Does this display group have its own specific translator? + * + * @return bool + */ + public function hasTranslator() + { + return (bool) $this->getTranslator(); + } + + /** * Indicate whether or not translation should be disabled * * @param bool $flag diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element.php --- a/web/lib/Zend/Form/Element.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 22464 2010-06-19 17:31:21Z alab $ + * @version $Id: Element.php 25173 2012-12-22 20:05:32Z rob $ */ class Zend_Form_Element implements Zend_Validate_Interface { @@ -315,20 +315,32 @@ $decorators = $this->getDecorators(); if (empty($decorators)) { - $getId = create_function('$decorator', - 'return $decorator->getElement()->getId() - . "-element";'); $this->addDecorator('ViewHelper') ->addDecorator('Errors') ->addDecorator('Description', array('tag' => 'p', 'class' => 'description')) - ->addDecorator('HtmlTag', array('tag' => 'dd', - 'id' => array('callback' => $getId))) + ->addDecorator('HtmlTag', array( + 'tag' => 'dd', + 'id' => array('callback' => array(get_class($this), 'resolveElementId')) + )) ->addDecorator('Label', array('tag' => 'dt')); } return $this; } /** + * Used to resolve and return an element ID + * + * Passed to the HtmlTag decorator as a callback in order to provide an ID. + * + * @param Zend_Form_Decorator_Interface $decorator + * @return string + */ + public static function resolveElementId(Zend_Form_Decorator_Interface $decorator) + { + return $decorator->getElement()->getId() . '-element'; + } + + /** * Set object state from options array * * @param array $options @@ -892,6 +904,7 @@ public function getAttribs() { $attribs = get_object_vars($this); + unset($attribs['helper']); foreach ($attribs as $key => $value) { if ('_' == substr($key, 0, 1)) { unset($attribs[$key]); @@ -1058,14 +1071,13 @@ $loader->addPrefixPath($prefix, $path); return $this; case null: - $prefix = rtrim($prefix, '_'); - $path = rtrim($path, DIRECTORY_SEPARATOR); + $nsSeparator = (false !== strpos($prefix, '\\'))?'\\':'_'; + $prefix = rtrim($prefix, $nsSeparator) . $nsSeparator; + $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; foreach (array(self::DECORATOR, self::FILTER, self::VALIDATE) as $type) { $cType = ucfirst(strtolower($type)); - $pluginPath = $path . DIRECTORY_SEPARATOR . $cType . DIRECTORY_SEPARATOR; - $pluginPrefix = $prefix . '_' . $cType; $loader = $this->getPluginLoader($type); - $loader->addPrefixPath($pluginPrefix, $pluginPath); + $loader->addPrefixPath($prefix . $cType, $path . $cType . DIRECTORY_SEPARATOR); } return $this; default: @@ -1377,7 +1389,14 @@ if ($isArray && is_array($value)) { $messages = array(); $errors = array(); - foreach ($value as $val) { + if (empty($value)) { + if ($this->isRequired() + || (!$this->isRequired() && !$this->getAllowEmpty()) + ) { + $value = ''; + } + } + foreach ((array)$value as $val) { if (!$validator->isValid($val, $context)) { $result = false; if ($this->_hasErrorMessages()) { @@ -2223,14 +2242,14 @@ if (null !== $translator) { $message = $translator->translate($message); } - if (($this->isArray() || is_array($value)) - && !empty($value) - ) { + if ($this->isArray() || is_array($value)) { $aggregateMessages = array(); foreach ($value as $val) { $aggregateMessages[] = str_replace('%value%', $val, $message); } - $messages[$key] = implode($this->getErrorMessageSeparator(), $aggregateMessages); + if (count($aggregateMessages)) { + $messages[$key] = implode($this->getErrorMessageSeparator(), $aggregateMessages); + } } else { $messages[$key] = str_replace('%value%', $value, $message); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Button.php --- a/web/lib/Zend/Form/Element/Button.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Button.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Button.php 25189 2013-01-08 08:32:43Z frosch $ */ class Zend_Form_Element_Button extends Zend_Form_Element_Submit { @@ -39,4 +39,18 @@ * @var string */ public $helper = 'formButton'; + + /** + * Validate element value (pseudo) + * + * There is no need to reset the value + * + * @param mixed $value Is always ignored + * @param mixed $context Is always ignored + * @return boolean Returns always TRUE + */ + public function isValid($value, $context = null) + { + return true; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Captcha.php --- a/web/lib/Zend/Form/Element/Captcha.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Captcha.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Captcha.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Captcha.php 24848 2012-05-31 19:28:48Z rob $ */ /** @see Zend_Form_Element_Xhtml */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Element_Captcha extends Zend_Form_Element_Xhtml @@ -127,24 +127,6 @@ } /** - * Return all attributes - * - * @return array - */ - public function getAttribs() - { - $attribs = get_object_vars($this); - unset($attribs['helper']); - foreach ($attribs as $key => $value) { - if ('_' == substr($key, 0, 1)) { - unset($attribs[$key]); - } - } - - return $attribs; - } - - /** * Set options * * Overrides to allow passing captcha options @@ -154,16 +136,22 @@ */ public function setOptions(array $options) { + $captcha = null; + $captchaOptions = array(); + if (array_key_exists('captcha', $options)) { + $captcha = $options['captcha']; if (array_key_exists('captchaOptions', $options)) { - $this->setCaptcha($options['captcha'], $options['captchaOptions']); + $captchaOptions = $options['captchaOptions']; unset($options['captchaOptions']); - } else { - $this->setCaptcha($options['captcha']); } unset($options['captcha']); } parent::setOptions($options); + + if(null !== $captcha) { + $this->setCaptcha($captcha, $captchaOptions); + } return $this; } @@ -178,18 +166,25 @@ $captcha = $this->getCaptcha(); $captcha->setName($this->getFullyQualifiedName()); - $decorators = $this->getDecorators(); + if (!$this->loadDefaultDecoratorsIsDisabled()) { + $decorators = $this->getDecorators(); + $decorator = $captcha->getDecorator(); + $key = get_class($this->_getDecorator($decorator, null)); + + if (!empty($decorator) && !array_key_exists($key, $decorators)) { + array_unshift($decorators, $decorator); + } - $decorator = $captcha->getDecorator(); - if (!empty($decorator)) { - array_unshift($decorators, $decorator); + $decorator = array('Captcha', array('captcha' => $captcha)); + $key = get_class($this->_getDecorator($decorator[0], $decorator[1])); + + if ($captcha instanceof Zend_Captcha_Word && !array_key_exists($key, $decorators)) { + array_unshift($decorators, $decorator); + } + + $this->setDecorators($decorators); } - $decorator = array('Captcha', array('captcha' => $captcha)); - array_unshift($decorators, $decorator); - - $this->setDecorators($decorators); - $this->setValue($this->getCaptcha()->generate()); return parent::render($view); @@ -237,7 +232,8 @@ switch ($type) { case null: $loader = $this->getPluginLoader(self::CAPTCHA); - $cPrefix = rtrim($prefix, '_') . '_Captcha'; + $nsSeparator = (false !== strpos($prefix, '\\'))?'\\':'_'; + $cPrefix = rtrim($prefix, $nsSeparator) . $nsSeparator . 'Captcha'; $cPath = rtrim($path, '/\\') . '/Captcha'; $loader->addPrefixPath($cPrefix, $cPath); return parent::addPrefixPath($prefix, $path); @@ -253,7 +249,7 @@ /** * Load default decorators * - * @return void + * @return Zend_Form_Element_Captcha */ public function loadDefaultDecorators() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Checkbox.php --- a/web/lib/Zend/Form/Element/Checkbox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Checkbox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Checkbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Checkbox.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Checkbox extends Zend_Form_Element_Xhtml { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Exception.php --- a/web/lib/Zend/Form/Element/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Element_Exception extends Zend_Form_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/File.php --- a/web/lib/Zend/Form/Element/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 22371 2010-06-04 20:09:44Z thomas $ + * @version $Id: File.php 25225 2013-01-17 15:59:16Z frosch $ */ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml { @@ -71,7 +71,7 @@ /** * Load default decorators * - * @return void + * @return Zend_Form_Element_File */ public function loadDefaultDecorators() { @@ -150,7 +150,8 @@ } if (empty($type)) { - $pluginPrefix = rtrim($prefix, '_') . '_Transfer_Adapter'; + $nsSeparator = (false !== strpos($prefix, '\\'))?'\\':'_'; + $pluginPrefix = rtrim($prefix, $nsSeparator) . $nsSeparator . 'Transfer' . $nsSeparator . 'Adapter'; $pluginPath = rtrim($path, DIRECTORY_SEPARATOR) . '/Transfer/Adapter/'; $loader = $this->getPluginLoader(self::TRANSFER_ADAPTER); $loader->addPrefixPath($pluginPrefix, $pluginPath); @@ -430,7 +431,7 @@ } else { $adapter->setOptions(array('ignoreNoFile' => false), $this->getName()); if ($this->autoInsertNotEmptyValidator() && !$this->getValidator('NotEmpty')) { - $this->addValidator = array('validator' => 'NotEmpty', 'breakChainOnFailure' => true); + $this->addValidator('NotEmpty', true); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Hash.php --- a/web/lib/Zend/Form/Element/Hash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Hash.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hash.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Hash extends Zend_Form_Element_Xhtml { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Hidden.php --- a/web/lib/Zend/Form/Element/Hidden.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Hidden.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hidden.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hidden.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Hidden extends Zend_Form_Element_Xhtml { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Image.php --- a/web/lib/Zend/Form/Element/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Image extends Zend_Form_Element_Xhtml { @@ -55,7 +55,7 @@ /** * Load default decorators * - * @return void + * @return Zend_Form_Element_Image */ public function loadDefaultDecorators() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Multi.php --- a/web/lib/Zend/Form/Element/Multi.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Multi.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Multi.php 22322 2010-05-30 11:12:57Z thomas $ + * @version $Id: Multi.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Form_Element_Multi extends Zend_Form_Element_Xhtml { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/MultiCheckbox.php --- a/web/lib/Zend/Form/Element/MultiCheckbox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/MultiCheckbox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MultiCheckbox.php 24963 2012-06-15 14:32:23Z adamlundrigan $ */ class Zend_Form_Element_MultiCheckbox extends Zend_Form_Element_Multi { @@ -49,4 +49,25 @@ * @var bool */ protected $_isArray = true; + + /** + * Load default decorators + * + * @return Zend_Form_Element_MultiCheckbox + */ + public function loadDefaultDecorators() + { + if ($this->loadDefaultDecoratorsIsDisabled()) { + return $this; + } + + parent::loadDefaultDecorators(); + + // Disable 'for' attribute + if (false !== $decorator = $this->getDecorator('label')) { + $decorator->setOption('disableFor', true); + } + + return $this; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Multiselect.php --- a/web/lib/Zend/Form/Element/Multiselect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Multiselect.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Multiselect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Multiselect.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Multiselect extends Zend_Form_Element_Select { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Note.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Form/Element/Note.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,64 @@ +addDecorator('Label', array('tag' => 'dt', - 'disableFor' => true)); + + // Disable 'for' attribute + if (isset($this->_decorators['Label']) + && !isset($this->_decorators['Label']['options']['disableFor'])) + { + $this->_decorators['Label']['options']['disableFor'] = true; + } + return $this; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Reset.php --- a/web/lib/Zend/Form/Element/Reset.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Reset.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reset.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Reset extends Zend_Form_Element_Submit { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Select.php --- a/web/lib/Zend/Form/Element/Select.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Select.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,13 +28,19 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Select.php 25183 2013-01-07 17:38:54Z frosch $ */ class Zend_Form_Element_Select extends Zend_Form_Element_Multi { /** + * 'multiple' attribute + * @var string + */ + public $multiple = false; + + /** * Use formSelect view helper by default * @var string */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Submit.php --- a/web/lib/Zend/Form/Element/Submit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Submit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Submit.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Submit.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Submit extends Zend_Form_Element_Xhtml { @@ -52,7 +52,7 @@ if (is_string($spec) && ((null !== $options) && is_string($options))) { $options = array('label' => $options); } - + if (!isset($options['ignore'])) { $options['ignore'] = true; } @@ -75,10 +75,10 @@ if (null === $value) { $value = $this->getName(); - } - if (null !== ($translator = $this->getTranslator())) { - return $translator->translate($value); + if (null !== ($translator = $this->getTranslator())) { + return $translator->translate($value); + } } return $value; @@ -108,7 +108,7 @@ * * Uses only 'Submit' and 'DtDdWrapper' decorators by default. * - * @return void + * @return Zend_Form_Element_Submit */ public function loadDefaultDecorators() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Text.php --- a/web/lib/Zend/Form/Element/Text.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Text.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Text extends Zend_Form_Element_Xhtml { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Textarea.php --- a/web/lib/Zend/Form/Element/Textarea.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Textarea.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Textarea.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_Element_Textarea extends Zend_Form_Element_Xhtml { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Element/Xhtml.php --- a/web/lib/Zend/Form/Element/Xhtml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Element/Xhtml.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xhtml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Xhtml.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Form_Element_Xhtml extends Zend_Form_Element { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/Exception.php --- a/web/lib/Zend/Form/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Form/SubForm.php --- a/web/lib/Zend/Form/SubForm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Form/SubForm.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubForm.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: SubForm.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Form_SubForm extends Zend_Form { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata.php --- a/web/lib/Zend/Gdata.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gdata.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Gdata.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata extends Zend_Gdata_App diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,137 @@ +registerPackage('Zend_Gdata_Analytics'); + $this->registerPackage('Zend_Gdata_Analytics_Extension'); + parent::__construct($client, $applicationId); + $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME); + } + + /** + * Retrieve account feed object + * + * @param string|Zend_Uri_Uri $uri + * @return Zend_Gdata_Analytics_AccountFeed + */ + public function getAccountFeed($uri = self::ANALYTICS_ACCOUNT_FEED_URI) + { + if ($uri instanceof Query) { + $uri = $uri->getQueryUrl(); + } + return parent::getFeed($uri, 'Zend_Gdata_Analytics_AccountFeed'); + } + + /** + * Retrieve data feed object + * + * @param string|Zend_Uri_Uri $uri + * @return Zend_Gdata_Analytics_DataFeed + */ + public function getDataFeed($uri = self::ANALYTICS_FEED_URI) + { + if ($uri instanceof Query) { + $uri = $uri->getQueryUrl(); + } + return parent::getFeed($uri, 'Zend_Gdata_Analytics_DataFeed'); + } + + /** + * Returns a new DataQuery object. + * + * @return Zend_Gdata_Analytics_DataQuery + */ + public function newDataQuery() + { + return new Zend_Gdata_Analytics_DataQuery(); + } + + /** + * Returns a new AccountQuery object. + * + * @return Zend_Gdata_Analytics_AccountQuery + */ + public function newAccountQuery() + { + return new Zend_Gdata_Analytics_AccountQuery(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/AccountEntry.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/AccountEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,102 @@ +registerAllNamespaces(Zend_Gdata_Analytics::$namespaces); + parent::__construct($element); + } + + /** + * @param DOMElement $child + * @return void + */ + protected function takeChildFromDOM($child) + { + $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; + switch ($absoluteNodeName){ + case $this->lookupNamespace('analytics') . ':' . 'property'; + $property = new Zend_Gdata_Analytics_Extension_Property(); + $property->transferFromDOM($child); + $this->{$property->getName()} = $property; + break; + case $this->lookupNamespace('analytics') . ':' . 'tableId'; + $tableId = new Zend_Gdata_Analytics_Extension_TableId(); + $tableId->transferFromDOM($child); + $this->_tableId = $tableId; + break; + case $this->lookupNamespace('ga') . ':' . 'goal'; + $goal = new Zend_Gdata_Analytics_Extension_Goal(); + $goal->transferFromDOM($child); + $this->_goal = $goal; + break; + default: + parent::takeChildFromDOM($child); + break; + } + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/AccountFeed.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/AccountFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,57 @@ +registerAllNamespaces(Zend_Gdata_Analytics::$namespaces); + parent::__construct($element); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/AccountQuery.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/AccountQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,190 @@ +_accountId = $accountId; + return $this; + } + + /** + * @return string + */ + public function getAccountId() + { + return $this->_accountId; + } + + /** + * @param string $webpropertyId + * @return Zend_Gdata_Analytics_AccountQuery + */ + public function setWebpropertyId($webpropertyId) + { + $this->_webpropertyId = $webpropertyId; + return $this; + } + + /** + * @return string + */ + public function getWebpropertyId() + { + return $this->_webpropertyId; + } + + /** + * @param string $profileId + * @return Zend_Gdata_Analytics_AccountQuery + */ + public function setProfileId($profileId) + { + $this->_profileId = $profileId; + return $this; + } + + /** + * @return string + */ + public function getProfileId() + { + return $this->_profileId; + } + + /** + * @param string $accountId + * @return Zend_Gdata_Analytics_AccountQuery + */ + public function webproperties($accountId = '~all') + { + $this->_webproperties = true; + $this->setAccountId($accountId); + return $this; + } + + /** + * @param string $webpropertyId + * @param string $accountId + * @return Zend_Gdata_Analytics_AccountQuery + */ + public function profiles($webpropertyId = '~all', $accountId = '~all') + { + $this->_profiles = true; + if (null !== $accountId) { + $this->setAccountId($accountId); + } + $this->setWebpropertyId($webpropertyId); + return $this; + } + + /** + * @param string $webpropertyId + * @param string $accountId + * @param string $accountId + * @return Zend_Gdata_Analytics_AccountQuery + */ + public function goals($profileId = '~all', $webpropertyId = '~all', $accountId = '~all') + { + $this->_goals = true; + if (null !== $accountId) { + $this->setAccountId($accountId); + } + if (null !== $webpropertyId) { + $this->setWebpropertyId($webpropertyId); + } + $this->setProfileId($profileId); + return $this; + } + + /** + * @return string url + */ + public function getQueryUrl() + { + $url = $this->_defaultFeedUri; + + // add account id + if ($this->_webproperties or $this->_profiles or $this->_goals) { + $url .= '/' . $this->_accountId . '/webproperties'; + } + + if ($this->_profiles or $this->_goals) { + $url .= '/' . $this->_webpropertyId . '/profiles'; + } + + if ($this->_goals) { + $url .= '/' . $this->_profileId . '/goals'; + } + + $url .= $this->getQueryString(); + return $url; + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/DataEntry.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/DataEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,116 @@ +registerAllNamespaces(Zend_Gdata_Analytics::$namespaces); + parent::__construct($element); + } + + /** + * @param DOMElement $child + * @return void + */ + protected function takeChildFromDOM($child) + { + $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; + switch ($absoluteNodeName) { + case $this->lookupNamespace('analytics') . ':' . 'dimension'; + $dimension = new Zend_Gdata_Analytics_Extension_Dimension(); + $dimension->transferFromDOM($child); + $this->_dimensions[] = $dimension; + break; + case $this->lookupNamespace('analytics') . ':' . 'metric'; + $metric = new Zend_Gdata_Analytics_Extension_Metric(); + $metric->transferFromDOM($child); + $this->_metrics[] = $metric; + break; + default: + parent::takeChildFromDOM($child); + break; + } + } + + /** + * @param string $name + * @return mixed + */ + public function getDimension($name) + { + foreach ($this->_dimensions as $dimension) { + if ($dimension->getName() == $name) { + return $dimension; + } + } + return null; + } + + /** + * @param string $name + * @return mixed + */ + public function getMetric($name) + { + foreach ($this->_metrics as $metric) { + if ($metric->getName() == $name) { + return $metric; + } + } + return null; + } + + /** + * @param string $name + * @return mixed + */ + public function getValue($name) + { + if (null !== ($metric = $this->getMetric($name))) { + return $metric; + } + return $this->getDimension($name); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/DataFeed.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/DataFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,64 @@ +registerAllNamespaces(Zend_Gdata_Analytics::$namespaces); + parent::__construct($element); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/DataQuery.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/DataQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,403 @@ +"; + const LESS = ">"; + const GREATER_EQUAL = ">="; + const LESS_EQUAL = "<="; + const CONTAINS = "=@"; + const CONTAINS_NOT ="!@"; + const REGULAR ="=~"; + const REGULAR_NOT ="!~"; + + /** + * @var string + */ + protected $_profileId; + /** + * @var array + */ + protected $_dimensions = array(); + /** + * @var array + */ + protected $_metrics = array(); + /** + * @var array + */ + protected $_sort = array(); + /** + * @var array + */ + protected $_filters = array(); + + /** + * @param string $id + * @return Zend_Gdata_Analytics_DataQuery + */ + public function setProfileId($id) + { + $this->_profileId = $id; + return $this; + } + + /** + * @return string + */ + public function getProfileId() + { + return $this->_profileId; + } + + /** + * @param string $dimension + * @return Zend_Gdata_Analytics_DataQuery + */ + public function addDimension($dimension) + { + $this->_dimensions[$dimension] = true; + return $this; + } + + /** + * @param string $metric + * @return Zend_Gdata_Analytics_DataQuery + */ + public function addMetric($metric) + { + $this->_metrics[$metric] = true; + return $this; + } + + /** + * @return array + */ + public function getDimensions() + { + return $this->_dimensions; + } + + /** + * @return array + */ + public function getMetrics() + { + return $this->_metrics; + } + + /** + * @param string $dimension + * @return Zend_Gdata_Analytics_DataQuery + */ + public function removeDimension($dimension) + { + unset($this->_dimensions[$dimension]); + return $this; + } + /** + * @param string $metric + * @return Zend_Gdata_Analytics_DataQuery + */ + public function removeMetric($metric) + { + unset($this->_metrics[$metric]); + return $this; + } + /** + * @param string $value + * @return Zend_Gdata_Analytics_DataQuery + */ + public function setStartDate($date) + { + $this->setParam("start-date", $date); + return $this; + } + /** + * @param string $value + * @return Zend_Gdata_Analytics_DataQuery + */ + public function setEndDate($date) + { + $this->setParam("end-date", $date); + return $this; + } + + /** + * @param string $filter + * @return Zend_Gdata_Analytics_DataQuery + */ + public function addFilter($filter) + { + $this->_filters[] = array($filter, true); + return $this; + } + + /** + * @param string $filter + * @return Zend_Gdata_Analytics_DataQuery + */ + public function addOrFilter($filter) + { + $this->_filters[] = array($filter, false); + return $this; + } + + /** + * @param string $sort + * @param boolean[optional] $descending + * @return Zend_Gdata_Analytics_DataQuery + */ + public function addSort($sort, $descending=false) + { + // add to sort storage + $this->_sort[] = ($descending?'-':'').$sort; + return $this; + } + + /** + * @return Zend_Gdata_Analytics_DataQuery + */ + public function clearSort() + { + $this->_sort = array(); + return $this; + } + + /** + * @param string $segment + * @return Zend_Gdata_Analytics_DataQuery + */ + public function setSegment($segment) + { + $this->setParam('segment', $segment); + return $this; + } + + /** + * @return string url + */ + public function getQueryUrl() + { + $uri = $this->_defaultFeedUri; + if (isset($this->_url)) { + $uri = $this->_url; + } + + $dimensions = $this->getDimensions(); + if (!empty($dimensions)) { + $this->setParam('dimensions', implode(",", array_keys($dimensions))); + } + + $metrics = $this->getMetrics(); + if (!empty($metrics)) { + $this->setParam('metrics', implode(",", array_keys($metrics))); + } + + // profile id (ga:tableId) + if ($this->getProfileId() != null) { + $this->setParam('ids', 'ga:'.ltrim($this->getProfileId(), "ga:")); + } + + // sorting + if ($this->_sort) { + $this->setParam('sort', implode(",", $this->_sort)); + } + + // filtering + $filters = ""; + foreach ($this->_filters as $filter) { + $filters.=($filter[1]===true?';':',').$filter[0]; + } + + if ($filters!="") { + $this->setParam('filters', ltrim($filters, ",;")); + } + + $uri .= $this->getQueryString(); + return $uri; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/Extension/Dimension.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/Extension/Dimension.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,40 @@ +registerAllNamespaces(Zend_Gdata_Analytics::$namespaces); + parent::__construct(); + } + + /** + * @return string + */ + public function __toString() + { + $attribs = $this->getExtensionAttributes(); + return $attribs['name']['value']; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/Extension/Metric.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/Extension/Metric.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,54 @@ +localName) { + case 'name': + $this->_name = $attribute->nodeValue; + break; + case 'value': + $this->_value = $attribute->nodeValue; + break; + default: + parent::takeAttributeFromDOM($attribute); + } + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/Extension/Property.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/Extension/Property.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,122 @@ +registerAllNamespaces(Zend_Gdata_Analytics::$namespaces); + parent::__construct(); + $this->_value = $value; + $this->_name = $name; + } + + /** + * Given a DOMNode representing an attribute, tries to map the data into + * instance members. If no mapping is defined, the name and value are + * stored in an array. + * + * @param DOMNode $attribute The DOMNode attribute needed to be handled + */ + protected function takeAttributeFromDOM($attribute) + { + switch ($attribute->localName) { + case 'name': + $name = explode(':', $attribute->nodeValue); + $this->_name = end($name); + break; + case 'value': + $this->_value = $attribute->nodeValue; + break; + default: + parent::takeAttributeFromDOM($attribute); + } + } + + /** + * Get the value for this element's value attribute. + * + * @return string The value associated with this attribute. + */ + public function getValue() + { + return $this->_value; + } + + /** + * Set the value for this element's value attribute. + * + * @param string $value The desired value for this attribute. + * @return Zend_Gdata_Analytics_Extension_Property The element being modified. + */ + public function setValue($value) + { + $this->_value = $value; + return $this; + } + + /** + * @param string $name + * @return Zend_Gdata_Analytics_Extension_Property + */ + public function setName($name) + { + $this->_name = $name; + return $this; + } + + /** + * @return string + */ + public function getName() + { + return $this->_name; + } + + /** + * Magic toString method allows using this directly via echo + * Works best in PHP >= 4.2.0 + */ + public function __toString() + { + return $this->getValue(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Analytics/Extension/TableId.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Gdata/Analytics/Extension/TableId.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,112 @@ +registerAllNamespaces(Zend_Gdata_Analytics::$namespaces); + parent::__construct(); + $this->_value = $value; + } + + /** + * Retrieves a DOMElement which corresponds to this element and all + * child properties. This is used to build an entry back into a DOM + * and eventually XML text for sending to the server upon updates, or + * for application storage/persistence. + * + * @param DOMDocument $doc The DOMDocument used to construct DOMElements + * @return DOMElement The DOMElement representing this element and all + * child properties. + */ + public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null) + { + $element = parent::getDOM($doc, $majorVersion, $minorVersion); + if ($this->_value != null) { + $element->setAttribute('value', $this->_value); + } + return $element; + } + + /** + * Given a DOMNode representing an attribute, tries to map the data into + * instance members. If no mapping is defined, the name and value are + * stored in an array. + * + * @param DOMNode $attribute The DOMNode attribute needed to be handled + */ + protected function takeChildFromDOM($child) + { + $this->_value = $child->nodeValue; + } + + /** + * Get the value for this element's value attribute. + * + * @return string The value associated with this attribute. + */ + public function getValue() + { + return $this->_value; + } + + /** + * Set the value for this element's value attribute. + * + * @param string $value The desired value for this attribute. + * @return Zend_Gdata_Calendar_Extension_Timezone The element being modified. + */ + public function setValue($value) + { + $this->_value = $value; + return $this; + } + + /** + * Magic toString method allows using this directly via echo + * Works best in PHP >= 4.2.0 + */ + public function __toString() + { + return $this->getValue(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App.php --- a/web/lib/Zend/Gdata/App.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: App.php 22972 2010-09-18 20:33:53Z ramon $ + * @version $Id: App.php 25259 2013-02-13 17:38:12Z frosch $ */ /** @@ -42,6 +42,11 @@ require_once 'Zend/Gdata/App/MediaSource.php'; /** + * Zend_Uri/Http + */ +require_once 'Zend/Uri/Http.php'; + +/** * Provides Atom Publishing Protocol (APP) functionality. This class and all * other components of Zend_Gdata_App are designed to work independently from * other Zend_Gdata components in order to interact with generic APP services. @@ -49,7 +54,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App @@ -719,14 +724,14 @@ * @param string $uri * @param Zend_Http_Client $client The client used for communication * @param string $className The class which is used as the return type + * @param bool $useObjectMapping Enable/disable the use of XML to object mapping. * @throws Zend_Gdata_App_Exception - * @return string|Zend_Gdata_App_Feed Returns string only if the object - * mapping has been disabled explicitly - * by passing false to the - * useObjectMapping() function. + * @return string|Zend_Gdata_App_Feed Returns string only if the fourth + * parameter ($useObjectMapping) is set + * to false. */ public static function import($uri, $client = null, - $className='Zend_Gdata_App_Feed') + $className='Zend_Gdata_App_Feed', $useObjectMapping = true) { $app = new Zend_Gdata_App($client); $requestData = $app->prepareRequest('GET', $uri); @@ -734,7 +739,7 @@ $requestData['method'], $requestData['url']); $feedContent = $response->getBody(); - if (!$this->_useObjectMapping) { + if (false === $useObjectMapping) { return $feedContent; } $feed = self::importString($feedContent, $className); @@ -1055,6 +1060,9 @@ break; } catch (Zend_Exception $e) { // package wasn't here- continue searching + } catch (ErrorException $e) { + // package wasn't here- continue searching + // @see ZF-7013 and ZF-11959 } } if ($foundClassName != null) { @@ -1087,7 +1095,7 @@ * significant amount of time to complete. In some cases this may cause * execution to timeout without proper precautions in place. * - * @param $feed The feed to iterate through. + * @param object $feed The feed to iterate through. * @return mixed A new feed of the same type as the one originally * passed in, containing all relevent entries. */ @@ -1117,7 +1125,7 @@ * NOTE: This will not work if you have customized the adapter * already to use a proxy server or other interface. * - * @param $logfile The logfile to use when logging the requests + * @param string $logfile The logfile to use when logging the requests */ public function enableRequestDebugLogging($logfile) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/AuthException.php --- a/web/lib/Zend/Gdata/App/AuthException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/AuthException.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AuthException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AuthException.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_AuthException extends Zend_Gdata_App_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/BadMethodCallException.php --- a/web/lib/Zend/Gdata/App/BadMethodCallException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/BadMethodCallException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BadMethodCallException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BadMethodCallException.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_BadMethodCallException extends Zend_Gdata_App_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Base.php --- a/web/lib/Zend/Gdata/App/Base.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Base.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Base.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/BaseMediaSource.php --- a/web/lib/Zend/Gdata/App/BaseMediaSource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/BaseMediaSource.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseMediaSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BaseMediaSource.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/CaptchaRequiredException.php --- a/web/lib/Zend/Gdata/App/CaptchaRequiredException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/CaptchaRequiredException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaptchaRequiredException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaptchaRequiredException.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_CaptchaRequiredException extends Zend_Gdata_App_AuthException diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Entry.php --- a/web/lib/Zend/Gdata/App/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -62,7 +62,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Entry extends Zend_Gdata_App_FeedEntryParent diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Exception.php --- a/web/lib/Zend/Gdata/App/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension.php --- a/web/lib/Zend/Gdata/App/Extension.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension extends Zend_Gdata_App_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Author.php --- a/web/lib/Zend/Gdata/App/Extension/Author.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Author.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Author.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Author extends Zend_Gdata_App_Extension_Person diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Category.php --- a/web/lib/Zend/Gdata/App/Extension/Category.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Category.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Category.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Category.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Category extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Content.php --- a/web/lib/Zend/Gdata/App/Extension/Content.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Content.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Content.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Content.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Content extends Zend_Gdata_App_Extension_Text diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Contributor.php --- a/web/lib/Zend/Gdata/App/Extension/Contributor.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Contributor.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Contributor.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Contributor.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Contributor extends Zend_Gdata_App_Extension_Person diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Control.php --- a/web/lib/Zend/Gdata/App/Extension/Control.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Control.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Control.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Control.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Control extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Draft.php --- a/web/lib/Zend/Gdata/App/Extension/Draft.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Draft.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Draft.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Draft.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Draft extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Edited.php --- a/web/lib/Zend/Gdata/App/Extension/Edited.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Edited.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Edited.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Edited.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Edited extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Element.php --- a/web/lib/Zend/Gdata/App/Extension/Element.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Element.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Element.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Element extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Email.php --- a/web/lib/Zend/Gdata/App/Extension/Email.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Email.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Email.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Email.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Email extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Generator.php --- a/web/lib/Zend/Gdata/App/Extension/Generator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Generator.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Generator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Generator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Generator extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Icon.php --- a/web/lib/Zend/Gdata/App/Extension/Icon.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Icon.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Icon.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Icon.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Icon extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Id.php --- a/web/lib/Zend/Gdata/App/Extension/Id.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Id.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Id.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Id.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Id extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Link.php --- a/web/lib/Zend/Gdata/App/Extension/Link.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Link.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Link extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Logo.php --- a/web/lib/Zend/Gdata/App/Extension/Logo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Logo.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Logo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Logo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Logo extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Name.php --- a/web/lib/Zend/Gdata/App/Extension/Name.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Name.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Name extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Person.php --- a/web/lib/Zend/Gdata/App/Extension/Person.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Person.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Person.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Person.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension_Person extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Published.php --- a/web/lib/Zend/Gdata/App/Extension/Published.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Published.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Published.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Published.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Published extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Rights.php --- a/web/lib/Zend/Gdata/App/Extension/Rights.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Rights.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rights.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rights.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Rights extends Zend_Gdata_App_Extension_Text diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Source.php --- a/web/lib/Zend/Gdata/App/Extension/Source.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Source.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Source.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Source.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Source extends Zend_Gdata_App_FeedSourceParent diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Subtitle.php --- a/web/lib/Zend/Gdata/App/Extension/Subtitle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Subtitle.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subtitle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Subtitle.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Subtitle extends Zend_Gdata_App_Extension_Text diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Summary.php --- a/web/lib/Zend/Gdata/App/Extension/Summary.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Summary.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Summary.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Summary.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Summary extends Zend_Gdata_App_Extension_Text diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Text.php --- a/web/lib/Zend/Gdata/App/Extension/Text.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Text.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension_Text extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Title.php --- a/web/lib/Zend/Gdata/App/Extension/Title.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Title.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Title.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Title.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Title extends Zend_Gdata_App_Extension_Text diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Updated.php --- a/web/lib/Zend/Gdata/App/Extension/Updated.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Updated.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Updated.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Updated.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Updated extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Extension/Uri.php --- a/web/lib/Zend/Gdata/App/Extension/Uri.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Extension/Uri.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uri.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Uri.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Uri extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Feed.php --- a/web/lib/Zend/Gdata/App/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 22880 2010-08-21 23:44:00Z ramon $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/FeedEntryParent.php --- a/web/lib/Zend/Gdata/App/FeedEntryParent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/FeedEntryParent.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedEntryParent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedEntryParent.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -77,7 +77,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/FeedSourceParent.php --- a/web/lib/Zend/Gdata/App/FeedSourceParent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/FeedSourceParent.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedSourceParent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedSourceParent.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryParent diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/HttpException.php --- a/web/lib/Zend/Gdata/App/HttpException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/HttpException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpException.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_HttpException extends Zend_Gdata_App_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/IOException.php --- a/web/lib/Zend/Gdata/App/IOException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/IOException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IOException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: IOException.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_IOException extends Zend_Gdata_App_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/InvalidArgumentException.php --- a/web/lib/Zend/Gdata/App/InvalidArgumentException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/InvalidArgumentException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InvalidArgumentException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InvalidArgumentException.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_InvalidArgumentException extends Zend_Gdata_App_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php --- a/web/lib/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @version $Id: LoggingHttpClientAdapterSocket.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: LoggingHttpClientAdapterSocket.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_LoggingHttpClientAdapterSocket extends Zend_Http_Client_Adapter_Socket diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/MediaEntry.php --- a/web/lib/Zend/Gdata/App/MediaEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/MediaEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_MediaEntry extends Zend_Gdata_App_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/MediaFileSource.php --- a/web/lib/Zend/Gdata/App/MediaFileSource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/MediaFileSource.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaFileSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaFileSource.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/MediaSource.php --- a/web/lib/Zend/Gdata/App/MediaSource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/MediaSource.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaSource.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Gdata_App_MediaSource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/Util.php --- a/web/lib/Zend/Gdata/App/Util.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/Util.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Util.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Util.php 24643 2012-02-25 21:35:32Z adamlundrigan $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Util @@ -45,7 +45,7 @@ $rfc3339 = '/^(\d{4})\-?(\d{2})\-?(\d{2})((T|t)(\d{2})\:?(\d{2})' . '\:?(\d{2})(\.\d{1,})?((Z|z)|([\+\-])(\d{2})\:?(\d{2})))?$/'; - if (ctype_digit($timestamp)) { + if (ctype_digit((string)$timestamp)) { return gmdate('Y-m-d\TH:i:sP', $timestamp); } elseif (preg_match($rfc3339, $timestamp) > 0) { // timestamp is already properly formatted diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/App/VersionException.php --- a/web/lib/Zend/Gdata/App/VersionException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/App/VersionException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VersionException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VersionException.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_VersionException extends Zend_Gdata_App_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/AuthSub.php --- a/web/lib/Zend/Gdata/AuthSub.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/AuthSub.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AuthSub.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AuthSub.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_AuthSub @@ -169,6 +169,7 @@ try { $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { + ob_end_clean(); require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } @@ -210,6 +211,7 @@ try { $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { + ob_end_clean(); require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } @@ -229,9 +231,9 @@ if ($client == null) { $client = new Zend_Gdata_HttpClient(); } - if (!$client instanceof Zend_Http_Client) { + if (!$client instanceof Zend_Gdata_HttpClient) { require_once 'Zend/Gdata/App/HttpException.php'; - throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Http_Client.'); + throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Gdata_HttpClient.'); } $useragent = 'Zend_Framework_Gdata/' . Zend_Version::VERSION; $client->setConfig(array( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books.php --- a/web/lib/Zend/Gdata/Books.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Books.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Books.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -57,14 +57,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books extends Zend_Gdata { - const VOLUME_FEED_URI = 'http://books.google.com/books/feeds/volumes'; - const MY_LIBRARY_FEED_URI = 'http://books.google.com/books/feeds/users/me/collections/library/volumes'; - const MY_ANNOTATION_FEED_URI = 'http://books.google.com/books/feeds/users/me/volumes'; + const VOLUME_FEED_URI = 'https://books.google.com/books/feeds/volumes'; + const MY_LIBRARY_FEED_URI = 'https://books.google.com/books/feeds/users/me/collections/library/volumes'; + const MY_ANNOTATION_FEED_URI = 'https://books.google.com/books/feeds/users/me/volumes'; const AUTH_SERVICE_NAME = 'print'; /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/CollectionEntry.php --- a/web/lib/Zend/Gdata/Books/CollectionEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/CollectionEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CollectionEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CollectionEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_CollectionEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/CollectionFeed.php --- a/web/lib/Zend/Gdata/Books/CollectionFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/CollectionFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CollectionFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CollectionFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_CollectionFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/AnnotationLink.php --- a/web/lib/Zend/Gdata/Books/Extension/AnnotationLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/AnnotationLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AnnotationLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AnnotationLink.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_AnnotationLink extends diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/BooksCategory.php --- a/web/lib/Zend/Gdata/Books/Extension/BooksCategory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/BooksCategory.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BooksCategory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BooksCategory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_BooksCategory extends diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/BooksLink.php --- a/web/lib/Zend/Gdata/Books/Extension/BooksLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/BooksLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BooksLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BooksLink.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_BooksLink extends Zend_Gdata_App_Extension_Link diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/Embeddability.php --- a/web/lib/Zend/Gdata/Books/Extension/Embeddability.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/Embeddability.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Embeddability.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Embeddability.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Embeddability extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/InfoLink.php --- a/web/lib/Zend/Gdata/Books/Extension/InfoLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/InfoLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -17,7 +17,7 @@ * @package Zend_Gdata * @subpackage Books * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InfoLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InfoLink.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_InfoLink extends diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/PreviewLink.php --- a/web/lib/Zend/Gdata/Books/Extension/PreviewLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/PreviewLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PreviewLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PreviewLink.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_PreviewLink extends diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/Review.php --- a/web/lib/Zend/Gdata/Books/Extension/Review.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/Review.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Review.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Review.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Review extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/ThumbnailLink.php --- a/web/lib/Zend/Gdata/Books/Extension/ThumbnailLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/ThumbnailLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ThumbnailLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ThumbnailLink.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_ThumbnailLink extends diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/Extension/Viewability.php --- a/web/lib/Zend/Gdata/Books/Extension/Viewability.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/Extension/Viewability.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Viewability.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Viewability.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Viewability extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/VolumeEntry.php --- a/web/lib/Zend/Gdata/Books/VolumeEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/VolumeEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VolumeEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VolumeEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -102,7 +102,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/VolumeFeed.php --- a/web/lib/Zend/Gdata/Books/VolumeFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/VolumeFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VolumeFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VolumeFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Books/VolumeQuery.php --- a/web/lib/Zend/Gdata/Books/VolumeQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Books/VolumeQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VolumeQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VolumeQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeQuery extends Zend_Gdata_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar.php --- a/web/lib/Zend/Gdata/Calendar.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Calendar.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Calendar.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -53,14 +53,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar extends Zend_Gdata { - const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds'; - const CALENDAR_EVENT_FEED_URI = 'http://www.google.com/calendar/feeds/default/private/full'; + const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds'; + const CALENDAR_EVENT_FEED_URI = 'https://www.google.com/calendar/feeds/default/private/full'; const AUTH_SERVICE_NAME = 'cl'; protected $_defaultPostUri = self::CALENDAR_EVENT_FEED_URI; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/EventEntry.php --- a/web/lib/Zend/Gdata/Calendar/EventEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/EventEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventEntry extends Zend_Gdata_Kind_EventEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/EventFeed.php --- a/web/lib/Zend/Gdata/Calendar/EventFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/EventFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/EventQuery.php --- a/web/lib/Zend/Gdata/Calendar/EventQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/EventQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query { - const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds'; + const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds'; /** * The default URI used for feeds. @@ -91,9 +91,9 @@ /** * Create Gdata_Calendar_EventQuery object. If a URL is provided, * it becomes the base URL, and additional URL components may be - * appended. For instance, if $url is 'http://www.google.com/calendar', + * appended. For instance, if $url is 'https://www.google.com/calendar', * the default URL constructed will be - * 'http://www.google.com/calendar/default/public/full'. + * 'https://www.google.com/calendar/default/public/full'. * * If the URL already contains a calendar ID, projection, visibility, * event ID, or comment ID, you will need to set these fields to null diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/AccessLevel.php --- a/web/lib/Zend/Gdata/Calendar/Extension/AccessLevel.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/AccessLevel.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccessLevel.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccessLevel.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_AccessLevel extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/Color.php --- a/web/lib/Zend/Gdata/Calendar/Extension/Color.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/Color.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Color.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Color.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Color extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/Hidden.php --- a/web/lib/Zend/Gdata/Calendar/Extension/Hidden.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/Hidden.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hidden.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hidden.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Hidden extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/Link.php --- a/web/lib/Zend/Gdata/Calendar/Extension/Link.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/Link.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Link extends Zend_Gdata_App_Extension_Link diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/QuickAdd.php --- a/web/lib/Zend/Gdata/Calendar/Extension/QuickAdd.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/QuickAdd.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QuickAdd.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QuickAdd.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_QuickAdd extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/Selected.php --- a/web/lib/Zend/Gdata/Calendar/Extension/Selected.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/Selected.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Selected.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Selected.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Selected extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/SendEventNotifications.php --- a/web/lib/Zend/Gdata/Calendar/Extension/SendEventNotifications.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/SendEventNotifications.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendEventNotifications.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SendEventNotifications.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_SendEventNotifications extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/Timezone.php --- a/web/lib/Zend/Gdata/Calendar/Extension/Timezone.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/Timezone.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Timezone.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Timezone.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Timezone extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/Extension/WebContent.php --- a/web/lib/Zend/Gdata/Calendar/Extension/WebContent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/Extension/WebContent.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WebContent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WebContent.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_WebContent extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/ListEntry.php --- a/web/lib/Zend/Gdata/Calendar/ListEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/ListEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -69,7 +69,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_ListEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Calendar/ListFeed.php --- a/web/lib/Zend/Gdata/Calendar/ListFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Calendar/ListFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_ListFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/ClientLogin.php --- a/web/lib/Zend/Gdata/ClientLogin.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/ClientLogin.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ClientLogin.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ClientLogin.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_ClientLogin diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Docs.php --- a/web/lib/Zend/Gdata/Docs.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Docs.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docs.php 20112 2010-01-07 02:39:32Z tjohns $ + * @version $Id: Docs.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -53,14 +53,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs extends Zend_Gdata { - const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents/private/full'; - const DOCUMENTS_FOLDER_FEED_URI = 'http://docs.google.com/feeds/folders/private/full'; + const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents/private/full'; + const DOCUMENTS_FOLDER_FEED_URI = 'https://docs.google.com/feeds/folders/private/full'; const DOCUMENTS_CATEGORY_SCHEMA = 'http://schemas.google.com/g/2005#kind'; const DOCUMENTS_CATEGORY_TERM = 'http://schemas.google.com/docs/2007#folder'; const AUTH_SERVICE_NAME = 'writely'; @@ -162,7 +162,7 @@ * @return Zend_Gdata_Docs_DocumentListEntry */ public function getDoc($docId, $docType) { - $location = 'http://docs.google.com/feeds/documents/private/full/' . + $location = 'https://docs.google.com/feeds/documents/private/full/' . $docType . '%3A' . $docId; return $this->getDocumentListEntry($location); } @@ -215,7 +215,7 @@ * which are enumerated in SUPPORTED_FILETYPES. * @param string $uri (optional) The URL to which the upload should be * made. - * Example: 'http://docs.google.com/feeds/documents/private/full'. + * Example: 'https://docs.google.com/feeds/documents/private/full'. * @return Zend_Gdata_Docs_DocumentListEntry The entry for the newly * created Google Document. */ @@ -265,7 +265,7 @@ * the appropriate type doesn't exist yet. */ public function createFolder($folderName, $folderResourceId=null) { - $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, + $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, self::DOCUMENTS_CATEGORY_SCHEMA); $title = new Zend_Gdata_App_Extension_Title($folderName); $entry = new Zend_Gdata_Entry(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Docs/DocumentListEntry.php --- a/web/lib/Zend/Gdata/Docs/DocumentListEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Docs/DocumentListEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentListEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_DocumentListEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Docs/DocumentListFeed.php --- a/web/lib/Zend/Gdata/Docs/DocumentListFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Docs/DocumentListFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentListFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_DocumentListFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Docs/Query.php --- a/web/lib/Zend/Gdata/Docs/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Docs/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query @@ -45,7 +45,7 @@ * * @var string */ - const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents'; + const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents'; /** * The generic base URL used by some inherited methods diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore.php --- a/web/lib/Zend/Gdata/DublinCore.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DublinCore.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DublinCore.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore extends Zend_Gdata diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Creator.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Creator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Creator.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Creator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Creator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Creator extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Date.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Date.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Date.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Date.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Date extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Description.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Description.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Description.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Description.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Description extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Format.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Format.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Format.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Format.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Format.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Format extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Identifier.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Identifier.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Identifier.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identifier.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Identifier.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Identifier extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Language.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Language.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Language.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Language.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Language.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Language extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Publisher.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Publisher.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Publisher.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Publisher.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Publisher.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Publisher extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Rights.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Rights.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Rights.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rights.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rights.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Rights extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Subject.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Subject.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Subject.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subject.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Subject.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Subject extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/DublinCore/Extension/Title.php --- a/web/lib/Zend/Gdata/DublinCore/Extension/Title.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/DublinCore/Extension/Title.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Title.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Title.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Title extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Entry.php --- a/web/lib/Zend/Gdata/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Entry extends Zend_Gdata_App_MediaEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif.php --- a/web/lib/Zend/Gdata/Exif.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exif.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exif.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif extends Zend_Gdata diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Entry.php --- a/web/lib/Zend/Gdata/Exif/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Entry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Distance.php --- a/web/lib/Zend/Gdata/Exif/Extension/Distance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Distance.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Distance.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Distance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Distance extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Exposure.php --- a/web/lib/Zend/Gdata/Exif/Extension/Exposure.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Exposure.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exposure.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exposure.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Exposure extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/FStop.php --- a/web/lib/Zend/Gdata/Exif/Extension/FStop.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/FStop.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FStop.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FStop.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_FStop extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Flash.php --- a/web/lib/Zend/Gdata/Exif/Extension/Flash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Flash.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Flash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Flash.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Flash extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/FocalLength.php --- a/web/lib/Zend/Gdata/Exif/Extension/FocalLength.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/FocalLength.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FocalLength.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FocalLength.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_FocalLength extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/ImageUniqueId.php --- a/web/lib/Zend/Gdata/Exif/Extension/ImageUniqueId.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/ImageUniqueId.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageUniqueId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageUniqueId.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_ImageUniqueId extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Iso.php --- a/web/lib/Zend/Gdata/Exif/Extension/Iso.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Iso.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iso.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Iso.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Iso extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Make.php --- a/web/lib/Zend/Gdata/Exif/Extension/Make.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Make.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Make.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Make.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Make extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Model.php --- a/web/lib/Zend/Gdata/Exif/Extension/Model.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Model.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Model.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Model.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Model extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Tags.php --- a/web/lib/Zend/Gdata/Exif/Extension/Tags.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Tags.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tags.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tags.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -87,7 +87,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Tags extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Extension/Time.php --- a/web/lib/Zend/Gdata/Exif/Extension/Time.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Extension/Time.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Time.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Time.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Time extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Exif/Feed.php --- a/web/lib/Zend/Gdata/Exif/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Exif/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Feed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension.php --- a/web/lib/Zend/Gdata/Extension.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/AttendeeStatus.php --- a/web/lib/Zend/Gdata/Extension/AttendeeStatus.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/AttendeeStatus.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AttendeeStatus.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AttendeeStatus.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_AttendeeStatus extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/AttendeeType.php --- a/web/lib/Zend/Gdata/Extension/AttendeeType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/AttendeeType.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AttendeeType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AttendeeType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_AttendeeType extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Comments.php --- a/web/lib/Zend/Gdata/Extension/Comments.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Comments.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Comments.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Comments.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Comments extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/EntryLink.php --- a/web/lib/Zend/Gdata/Extension/EntryLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/EntryLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EntryLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EntryLink.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_EntryLink extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/EventStatus.php --- a/web/lib/Zend/Gdata/Extension/EventStatus.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/EventStatus.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventStatus.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventStatus.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_EventStatus extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/ExtendedProperty.php --- a/web/lib/Zend/Gdata/Extension/ExtendedProperty.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/ExtendedProperty.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExtendedProperty.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ExtendedProperty.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_ExtendedProperty extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/FeedLink.php --- a/web/lib/Zend/Gdata/Extension/FeedLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/FeedLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedLink.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_FeedLink extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/OpenSearchItemsPerPage.php --- a/web/lib/Zend/Gdata/Extension/OpenSearchItemsPerPage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/OpenSearchItemsPerPage.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenSearchItemsPerPage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenSearchItemsPerPage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchItemsPerPage extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/OpenSearchStartIndex.php --- a/web/lib/Zend/Gdata/Extension/OpenSearchStartIndex.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/OpenSearchStartIndex.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenSearchStartIndex.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenSearchStartIndex.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchStartIndex extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/OpenSearchTotalResults.php --- a/web/lib/Zend/Gdata/Extension/OpenSearchTotalResults.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/OpenSearchTotalResults.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenSearchTotalResults.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenSearchTotalResults.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchTotalResults extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/OriginalEvent.php --- a/web/lib/Zend/Gdata/Extension/OriginalEvent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/OriginalEvent.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OriginalEvent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OriginalEvent.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OriginalEvent extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Rating.php --- a/web/lib/Zend/Gdata/Extension/Rating.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Rating.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rating.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rating.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Rating extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Recurrence.php --- a/web/lib/Zend/Gdata/Extension/Recurrence.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Recurrence.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Recurrence.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Recurrence.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Recurrence extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/RecurrenceException.php --- a/web/lib/Zend/Gdata/Extension/RecurrenceException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/RecurrenceException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecurrenceException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecurrenceException.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_RecurrenceException extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Reminder.php --- a/web/lib/Zend/Gdata/Extension/Reminder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Reminder.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reminder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reminder.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Reminder extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Transparency.php --- a/web/lib/Zend/Gdata/Extension/Transparency.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Transparency.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Transparency.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Transparency.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Transparency extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Visibility.php --- a/web/lib/Zend/Gdata/Extension/Visibility.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Visibility.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Visibility.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Visibility.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Visibility extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/When.php --- a/web/lib/Zend/Gdata/Extension/When.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/When.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: When.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: When.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_When extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Where.php --- a/web/lib/Zend/Gdata/Extension/Where.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Where.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Where.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Where.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Where extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Extension/Who.php --- a/web/lib/Zend/Gdata/Extension/Who.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Extension/Who.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Who.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Who.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Who extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Feed.php --- a/web/lib/Zend/Gdata/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Feed extends Zend_Gdata_App_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps.php --- a/web/lib/Zend/Gdata/Gapps.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gapps.php 22511 2010-07-01 01:41:46Z tjohns $ + * @version $Id: Gapps.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -76,7 +76,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps extends Zend_Gdata @@ -1178,7 +1178,7 @@ { $i = 0; $group = $this->newGroupEntry(); - + $properties[$i] = $this->newProperty(); $properties[$i]->name = 'groupId'; $properties[$i]->value = $groupId; @@ -1200,8 +1200,8 @@ $properties[$i]->name = 'emailPermission'; $properties[$i]->value = $emailPermission; $i++; - } - + } + $group->property = $properties; return $this->insertGroup($group); @@ -1240,7 +1240,7 @@ * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry objects * representing all groups apart of the domain. */ - public function retrieveAllGroups() + public function retrieveAllGroups() { return $this->retrieveAllEntriesForFeed($this->retrievePageOfGroups()); } @@ -1257,7 +1257,7 @@ $this->delete($uri); } - + /** * Check to see if a member id or group id is a member of group * @@ -1269,7 +1269,7 @@ { $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId . '/member/' . $memberId; - + //if the enitiy is not a member, an exception is thrown try { $results = $this->get($uri); @@ -1353,7 +1353,7 @@ $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId . '/owner'; - + return $this->insertOwner($owner, $uri); } @@ -1383,9 +1383,9 @@ { $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId . '/owner/' . $email; - + //if the enitiy is not an owner of the group, an exception is thrown - try { + try { $results = $this->get($uri); } catch (Exception $e) { $results = false; @@ -1427,7 +1427,7 @@ { $i = 0; $group = $this->newGroupEntry(); - + $properties[$i] = $this->newProperty(); $properties[$i]->name = 'groupId'; $properties[$i]->value = $groupId; @@ -1453,20 +1453,20 @@ $properties[$i]->value = $emailPermission; $i++; } - + $group->property = $properties; $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId; - return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry'); + return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry'); } /** * Retrieve all of the groups that a user is a member of * * @param string $memberId Member username - * @param bool $directOnly (Optional) If true, members with direct association + * @param bool $directOnly (Optional) If true, members with direct association * only will be considered * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry * objects representing all groups member is apart of in the domain. diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/EmailListEntry.php --- a/web/lib/Zend/Gdata/Gapps/EmailListEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/EmailListEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/EmailListFeed.php --- a/web/lib/Zend/Gdata/Gapps/EmailListFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/EmailListFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/EmailListQuery.php --- a/web/lib/Zend/Gdata/Gapps/EmailListQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/EmailListQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/EmailListRecipientEntry.php --- a/web/lib/Zend/Gdata/Gapps/EmailListRecipientEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/EmailListRecipientEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListRecipientEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListRecipientEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/EmailListRecipientFeed.php --- a/web/lib/Zend/Gdata/Gapps/EmailListRecipientFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/EmailListRecipientFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListRecipientFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListRecipientFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/EmailListRecipientQuery.php --- a/web/lib/Zend/Gdata/Gapps/EmailListRecipientQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/EmailListRecipientQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListRecipientQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListRecipientQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Error.php --- a/web/lib/Zend/Gdata/Gapps/Error.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Error.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Error.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Extension/EmailList.php --- a/web/lib/Zend/Gdata/Gapps/Extension/EmailList.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Extension/EmailList.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailList.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_EmailList extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Extension/Login.php --- a/web/lib/Zend/Gdata/Gapps/Extension/Login.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Extension/Login.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Login.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Login.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Extension/Name.php --- a/web/lib/Zend/Gdata/Gapps/Extension/Name.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Extension/Name.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Name extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Extension/Nickname.php --- a/web/lib/Zend/Gdata/Gapps/Extension/Nickname.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Extension/Nickname.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nickname.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nickname.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Nickname extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Extension/Property.php --- a/web/lib/Zend/Gdata/Gapps/Extension/Property.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Extension/Property.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Property extends Zend_Gdata_Extension @@ -177,4 +177,3 @@ "\nProperty Value: " . $this->getValue(); } } -?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Extension/Quota.php --- a/web/lib/Zend/Gdata/Gapps/Extension/Quota.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Extension/Quota.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Quota.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Quota.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Quota extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/GroupEntry.php --- a/web/lib/Zend/Gdata/Gapps/GroupEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/GroupEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_GroupEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/GroupFeed.php --- a/web/lib/Zend/Gdata/Gapps/GroupFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/GroupFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_GroupFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/GroupQuery.php --- a/web/lib/Zend/Gdata/Gapps/GroupQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/GroupQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_GroupQuery extends Zend_Gdata_Gapps_Query @@ -55,7 +55,7 @@ * Create a new instance. * * @param string $domain (optional) The Google Apps-hosted domain to use - * when constructing query URIs. + * when constructing query URIs. * @param string $groupId (optional) Value for the groupId property. * @param string $startGroupName (optional) Value for the * startGroupName property. @@ -210,15 +210,15 @@ $uri = Zend_Gdata_Gapps::APPS_BASE_FEED_URI; $uri .= Zend_Gdata_Gapps::APPS_GROUP_PATH; $uri .= '/' . $this->_domain; - + if ($this->_groupId !== null) { $uri .= '/' . $this->_groupId; } - + if(array_key_exists('member', $this->_params)) { $uri .= '/'; } - + $uri .= $this->getQueryString(); return $uri; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/MemberEntry.php --- a/web/lib/Zend/Gdata/Gapps/MemberEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/MemberEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_MemberEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/MemberFeed.php --- a/web/lib/Zend/Gdata/Gapps/MemberFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/MemberFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_MemberFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/MemberQuery.php --- a/web/lib/Zend/Gdata/Gapps/MemberQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/MemberQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_MemberQuery extends Zend_Gdata_Gapps_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/NicknameEntry.php --- a/web/lib/Zend/Gdata/Gapps/NicknameEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/NicknameEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NicknameEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NicknameEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/NicknameFeed.php --- a/web/lib/Zend/Gdata/Gapps/NicknameFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/NicknameFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NicknameFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NicknameFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/NicknameQuery.php --- a/web/lib/Zend/Gdata/Gapps/NicknameQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/NicknameQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NicknameQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NicknameQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/OwnerEntry.php --- a/web/lib/Zend/Gdata/Gapps/OwnerEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/OwnerEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_OwnerEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/OwnerFeed.php --- a/web/lib/Zend/Gdata/Gapps/OwnerFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/OwnerFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_OwnerFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/OwnerQuery.php --- a/web/lib/Zend/Gdata/Gapps/OwnerQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/OwnerQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_OwnerQuery extends Zend_Gdata_Gapps_Query @@ -76,7 +76,7 @@ * Set the group id to query for. * * @see getGroupId - * @param string $value + * @param string $value */ public function setGroupId($value) { @@ -133,9 +133,9 @@ throw new Zend_Gdata_App_InvalidArgumentException( 'groupId must not be null'); } - + $uri .= '/owner'; - + if ($this->_ownerEmail !== null) { $uri .= '/' . $this->_ownerEmail; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/Query.php --- a/web/lib/Zend/Gdata/Gapps/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/ServiceException.php --- a/web/lib/Zend/Gdata/Gapps/ServiceException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/ServiceException.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServiceException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ServiceException.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/UserEntry.php --- a/web/lib/Zend/Gdata/Gapps/UserEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/UserEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -61,7 +61,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/UserFeed.php --- a/web/lib/Zend/Gdata/Gapps/UserFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/UserFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gapps/UserQuery.php --- a/web/lib/Zend/Gdata/Gapps/UserQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gapps/UserQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase.php --- a/web/lib/Zend/Gdata/Gbase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,37 +16,22 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gbase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Gbase.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata */ require_once 'Zend/Gdata.php'; /** - * @see Zend_Gdata_Gbase_ItemFeed - */ -require_once 'Zend/Gdata/Gbase/ItemFeed.php'; - -/** - * @see Zend_Gdata_Gbase_ItemEntry - */ -require_once 'Zend/Gdata/Gbase/ItemEntry.php'; - -/** - * @see Zend_Gdata_Gbase_SnippetEntry - */ -require_once 'Zend/Gdata/Gbase/SnippetEntry.php'; - -/** - * @see Zend_Gdata_Gbase_SnippetFeed - */ -require_once 'Zend/Gdata/Gbase/SnippetFeed.php'; - -/** * Service class for interacting with the Google Base data API * * @link http://code.google.com/apis/base @@ -54,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase extends Zend_Gdata @@ -63,12 +48,12 @@ /** * Path to the customer items feeds on the Google Base server. */ - const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items'; + const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items'; /** * Path to the snippets feeds on the Google Base server. */ - const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets'; + const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets'; /** * Authentication service name for Google Base @@ -76,23 +61,6 @@ const AUTH_SERVICE_NAME = 'gbase'; /** - * The default URI for POST methods - * - * @var string - */ - protected $_defaultPostUri = self::GBASE_ITEM_FEED_URI; - - /** - * Namespaces used for Zend_Gdata_Gbase - * - * @var array - */ - public static $namespaces = array( - array('g', 'http://base.google.com/ns/1.0', 1, 0), - array('batch', 'http://schemas.google.com/gdata/batch', 1, 0) - ); - - /** * Create Zend_Gdata_Gbase object * * @param Zend_Http_Client $client (optional) The HTTP client to use when @@ -101,109 +69,10 @@ */ public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0') { - $this->registerPackage('Zend_Gdata_Gbase'); - $this->registerPackage('Zend_Gdata_Gbase_Extension'); - parent::__construct($client, $applicationId); - $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME); - } - - /** - * Retreive feed object - * - * @param mixed $location The location for the feed, as a URL or Query - * @return Zend_Gdata_Gbase_ItemFeed - */ - public function getGbaseItemFeed($location = null) - { - if ($location === null) { - $uri = self::GBASE_ITEM_FEED_URI; - } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); - } else { - $uri = $location; - } - return parent::getFeed($uri, 'Zend_Gdata_Gbase_ItemFeed'); - } - - /** - * Retreive entry object - * - * @param mixed $location The location for the feed, as a URL or Query - * @return Zend_Gdata_Gbase_ItemEntry - */ - public function getGbaseItemEntry($location = null) - { - if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; - throw new Zend_Gdata_App_InvalidArgumentException( - 'Location must not be null'); - } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); - } else { - $uri = $location; - } - return parent::getEntry($uri, 'Zend_Gdata_Gbase_ItemEntry'); - } - - /** - * Insert an entry - * - * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to upload - * @param boolean $dryRun Flag for the 'dry-run' parameter - * @return Zend_Gdata_Gbase_ItemFeed - */ - public function insertGbaseItem($entry, $dryRun = false) - { - if ($dryRun == false) { - $uri = $this->_defaultPostUri; - } else { - $uri = $this->_defaultPostUri . '?dry-run=true'; - } - $newitem = $this->insertEntry($entry, $uri, 'Zend_Gdata_Gbase_ItemEntry'); - return $newitem; - } - - /** - * Update an entry - * - * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to be updated - * @param boolean $dryRun Flag for the 'dry-run' parameter - * @return Zend_Gdata_Gbase_ItemEntry - */ - public function updateGbaseItem($entry, $dryRun = false) - { - $returnedEntry = $entry->save($dryRun); - return $returnedEntry; - } - - /** - * Delete an entry - * - * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to remove - * @param boolean $dryRun Flag for the 'dry-run' parameter - * @return Zend_Gdata_Gbase_ItemFeed - */ - public function deleteGbaseItem($entry, $dryRun = false) - { - $entry->delete($dryRun); - return $this; - } - - /** - * Retrieve feed object - * - * @param mixed $location The location for the feed, as a URL or Query - * @return Zend_Gdata_Gbase_SnippetFeed - */ - public function getGbaseSnippetFeed($location = null) - { - if ($location === null) { - $uri = self::GBASE_SNIPPET_FEED_URI; - } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); - } else { - $uri = $location; - } - return parent::getFeed($uri, 'Zend_Gdata_Gbase_SnippetFeed'); + throw new Zend_Exception( + 'Google Base API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/Entry.php --- a/web/lib/Zend/Gdata/Gbase/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,22 +16,22 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Entry */ require_once 'Zend/Gdata/Entry.php'; /** - * @see Zend_Gdata_Gbase_Extension_BaseAttribute - */ -require_once 'Zend/Gdata/Gbase/Extension/BaseAttribute.php'; - -/** * Base class for working with Google Base entries. * * @link http://code.google.com/apis/base/ @@ -39,113 +39,21 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Entry extends Zend_Gdata_Entry { - - /** - * Name of the base class for Google Base entries - * - * var @string - */ - protected $_entryClassName = 'Zend_Gdata_Gbase_Entry'; - - /** - * Google Base attribute elements in the 'g' namespace - * - * @var array - */ - protected $_baseAttributes = array(); - /** * Constructs a new Zend_Gdata_Gbase_ItemEntry object. * @param DOMElement $element (optional) The DOMElement on which to base this object. */ public function __construct($element = null) { - $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces); - parent::__construct($element); - } - - /** - * Retrieves a DOMElement which corresponds to this element and all - * child properties. This is used to build an entry back into a DOM - * and eventually XML text for application storage/persistence. - * - * @param DOMDocument $doc The DOMDocument used to construct DOMElements - * @return DOMElement The DOMElement representing this element and all - * child properties. - */ - public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null) - { - $element = parent::getDOM($doc, $majorVersion, $minorVersion); - foreach ($this->_baseAttributes as $baseAttribute) { - $element->appendChild($baseAttribute->getDOM($element->ownerDocument)); - } - return $element; - } - - /** - * Creates individual Entry objects of the appropriate type and - * stores them as members of this entry based upon DOM data. - * - * @param DOMNode $child The DOMNode to process - */ - protected function takeChildFromDOM($child) - { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - - if (strstr($absoluteNodeName, $this->lookupNamespace('g') . ':')) { - $baseAttribute = new Zend_Gdata_Gbase_Extension_BaseAttribute(); - $baseAttribute->transferFromDOM($child); - $this->_baseAttributes[] = $baseAttribute; - } else { - parent::takeChildFromDOM($child); - } + throw new Zend_Exception( + 'Google Base API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html' + ); } - - /** - * Get the value of the itme_type - * - * @return Zend_Gdata_Gbase_Extension_ItemType The requested object. - */ - public function getItemType() - { - $itemType = $this->getGbaseAttribute('item_type'); - if (is_object($itemType[0])) { - return $itemType[0]; - } else { - return null; - } - } - - /** - * Return all the Base attributes - * @return Zend_Gdata_Gbase_Extension_BaseAttribute - */ - public function getGbaseAttributes() { - return $this->_baseAttributes; - } - - /** - * Return an array of Base attributes that match the given attribute name - * - * @param string $name The name of the Base attribute to look for - * @return array $matches Array that contains the matching list of Base attributes - */ - public function getGbaseAttribute($name) - { - $matches = array(); - for ($i = 0; $i < count($this->_baseAttributes); $i++) { - $baseAttribute = $this->_baseAttributes[$i]; - if ($baseAttribute->rootElement == $name && - $baseAttribute->rootNamespaceURI == $this->lookupNamespace('g')) { - $matches[] = &$this->_baseAttributes[$i]; - } - } - return $matches; - } - } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/Extension/BaseAttribute.php --- a/web/lib/Zend/Gdata/Gbase/Extension/BaseAttribute.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/Extension/BaseAttribute.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseAttribute.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BaseAttribute.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** @@ -31,19 +31,11 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Extension_BaseAttribute extends Zend_Gdata_App_Extension_Element { - - /** - * Namespace for Google Base elements - * - * var @string - */ - protected $_rootNamespace = 'g'; - /** * Create a new instance. * @@ -53,63 +45,10 @@ */ public function __construct($name = null, $text = null, $type = null) { - $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces); - if ($type !== null) { - $attr = array('name' => 'type', 'value' => $type); - $typeAttr = array('type' => $attr); - $this->setExtensionAttributes($typeAttr); - } - parent::__construct($name, - $this->_rootNamespace, - $this->lookupNamespace($this->_rootNamespace), - $text); - } - - /** - * Get the name of the attribute - * - * @return attribute name The requested object. - */ - public function getName() { - return $this->_rootElement; - } - - /** - * Get the type of the attribute - * - * @return attribute type The requested object. - */ - public function getType() { - $typeAttr = $this->getExtensionAttributes(); - return $typeAttr['type']['value']; + throw new Zend_Exception( + 'Google Base API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html' + ); } - - /** - * Set the 'name' of the Base attribute object: - * <g:[$name] type='[$type]'>[$value]</g:[$name]> - * - * @param Zend_Gdata_App_Extension_Element $attribute The attribute object - * @param string $name The name of the Base attribute - * @return Zend_Gdata_Extension_ItemEntry Provides a fluent interface - */ - public function setName($name) { - $this->_rootElement = $name; - return $this; - } - - /** - * Set the 'type' of the Base attribute object: - * <g:[$name] type='[$type]'>[$value]</g:[$name]> - * - * @param Zend_Gdata_App_Extension_Element $attribute The attribute object - * @param string $type The type of the Base attribute - * @return Zend_Gdata_Extension_ItemEntry Provides a fluent interface - */ - public function setType($type) { - $attr = array('name' => 'type', 'value' => $type); - $typeAttr = array('type' => $attr); - $this->setExtensionAttributes($typeAttr); - return $this; - } - } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/Feed.php --- a/web/lib/Zend/Gdata/Gbase/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,12 +16,17 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Feed */ require_once 'Zend/Gdata/Feed.php'; @@ -34,19 +39,12 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Feed extends Zend_Gdata_Feed { /** - * The classname for the feed. - * - * @var string - */ - protected $_feedClassName = 'Zend_Gdata_Gbase_Feed'; - - /** * Create a new instance. * * @param DOMElement $element (optional) DOMElement from which this @@ -54,7 +52,10 @@ */ public function __construct($element = null) { - $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces); - parent::__construct($element); + throw new Zend_Exception( + 'Google Base API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/ItemEntry.php --- a/web/lib/Zend/Gdata/Gbase/ItemEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/ItemEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemEntry.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** @@ -34,128 +34,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry { - /** - * The classname for individual item entry elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Gbase_ItemEntry'; - - /** - * Set the value of the itme_type - * - * @param Zend_Gdata_Gbase_Extension_ItemType $value The desired value for the item_type - * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface - */ - public function setItemType($value) - { - $this->addGbaseAttribute('item_type', $value, 'text'); - return $this; - } - - /** - * Adds a custom attribute to the entry in the following format: - * <g:[$name] type='[$type]'>[$value]</g:[$name]> - * - * @param string $name The name of the attribute - * @param string $value The text value of the attribute - * @param string $type (optional) The type of the attribute. - * e.g.: 'text', 'number', 'floatUnit' - * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface - */ - public function addGbaseAttribute($name, $text, $type = null) { - $newBaseAttribute = new Zend_Gdata_Gbase_Extension_BaseAttribute($name, $text, $type); - $this->_baseAttributes[] = $newBaseAttribute; - return $this; - } - - /** - * Removes a Base attribute from the current list of Base attributes - * - * @param Zend_Gdata_Gbase_Extension_BaseAttribute $baseAttribute The attribute to be removed - * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface - */ - public function removeGbaseAttribute($baseAttribute) { - $baseAttributes = $this->_baseAttributes; - for ($i = 0; $i < count($this->_baseAttributes); $i++) { - if ($this->_baseAttributes[$i] == $baseAttribute) { - array_splice($baseAttributes, $i, 1); - break; - } - } - $this->_baseAttributes = $baseAttributes; - return $this; - } - - /** - * Uploads changes in this entry to the server using Zend_Gdata_App - * - * @param boolean $dryRun Whether the transaction is dry run or not. - * @param string|null $uri The URI to send requests to, or null if $data - * contains the URI. - * @param string|null $className The name of the class that should we - * deserializing the server response. If null, then - * 'Zend_Gdata_App_Entry' will be used. - * @param array $extraHeaders Extra headers to add to the request, as an - * array of string-based key/value pairs. - * @return Zend_Gdata_App_Entry The updated entry - * @throws Zend_Gdata_App_Exception - */ - public function save($dryRun = false, - $uri = null, - $className = null, - $extraHeaders = array()) - { - if ($dryRun == true) { - $editLink = $this->getEditLink(); - if ($uri == null && $editLink !== null) { - $uri = $editLink->getHref() . '?dry-run=true'; - } - if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; - throw new Zend_Gdata_App_InvalidArgumentException('You must specify an URI which needs deleted.'); - } - $service = new Zend_Gdata_App($this->getHttpClient()); - return $service->updateEntry($this, - $uri, - $className, - $extraHeaders); - } else { - parent::save($uri, $className, $extraHeaders); - } - } - - /** - * Deletes this entry to the server using the referenced - * Zend_Http_Client to do a HTTP DELETE to the edit link stored in this - * entry's link collection. - * - * @param boolean $dyrRun Whether the transaction is dry run or not - * @return void - * @throws Zend_Gdata_App_Exception - */ - public function delete($dryRun = false) - { - $uri = null; - - if ($dryRun == true) { - $editLink = $this->getEditLink(); - if ($editLink !== null) { - $uri = $editLink->getHref() . '?dry-run=true'; - } - if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; - throw new Zend_Gdata_App_InvalidArgumentException('You must specify an URI which needs deleted.'); - } - parent::delete($uri); - } else { - parent::delete(); - } - } - } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/ItemFeed.php --- a/web/lib/Zend/Gdata/Gbase/ItemFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/ItemFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemFeed.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** @@ -34,15 +34,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemFeed extends Zend_Gdata_Feed { - /** - * The classname for individual item feed elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Gbase_ItemEntry'; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/ItemQuery.php --- a/web/lib/Zend/Gdata/Gbase/ItemQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/ItemQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,20 +16,20 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemQuery.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** - * @see Zend_Gdata_Query + * @see Zend_Exception */ -require_once('Zend/Gdata/Query.php'); +require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Gbase_Query */ -require_once('Zend/Gdata/Gbase/Query.php'); +require_once 'Zend/Gdata/Gbase/Query.php'; /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query @@ -48,54 +48,5 @@ /** * Path to the customer items feeds on the Google Base server. */ - const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items'; - - /** - * The default URI for POST methods - * - * @var string - */ - protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI; - - /** - * The id of an item - * - * @var string - */ - protected $_id = null; - - /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setId($value) - { - $this->_id = $value; - return $this; - } - - /* - * @return string id - */ - public function getId() - { - return $this->_id; - } - - /** - * Returns the query URL generated by this query instance. - * - * @return string The query URL for this instance. - */ - public function getQueryUrl() - { - $uri = $this->_defaultFeedUri; - if ($this->getId() !== null) { - $uri .= '/' . $this->getId(); - } else { - $uri .= $this->getQueryString(); - } - return $uri; - } - + const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items'; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/Query.php --- a/web/lib/Zend/Gdata/Gbase/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,15 +16,20 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +require_once 'Zend/Gdata/Query.php'; /** * Assists in constructing queries for Google Base @@ -34,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query @@ -43,226 +48,22 @@ /** * Path to the customer items feeds on the Google Base server. */ - const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items'; + const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items'; /** * Path to the snippets feeds on the Google Base server. */ - const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets'; - - /** - * The default URI for POST methods - * - * @var string - */ - protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI; - - /** - * @param string $value - * @return Zend_Gdata_Gbase_Query Provides a fluent interface - */ - public function setKey($value) - { - if ($value !== null) { - $this->_params['key'] = $value; - } else { - unset($this->_params['key']); - } - return $this; - } - - /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setBq($value) - { - if ($value !== null) { - $this->_params['bq'] = $value; - } else { - unset($this->_params['bq']); - } - return $this; - } - - /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setRefine($value) - { - if ($value !== null) { - $this->_params['refine'] = $value; - } else { - unset($this->_params['refine']); - } - return $this; - } - - /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setContent($value) - { - if ($value !== null) { - $this->_params['content'] = $value; - } else { - unset($this->_params['content']); - } - return $this; - } - - /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setOrderBy($value) - { - if ($value !== null) { - $this->_params['orderby'] = $value; - } else { - unset($this->_params['orderby']); - } - return $this; - } - - /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setSortOrder($value) - { - if ($value !== null) { - $this->_params['sortorder'] = $value; - } else { - unset($this->_params['sortorder']); - } - return $this; - } - - /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setCrowdBy($value) - { - if ($value !== null) { - $this->_params['crowdby'] = $value; - } else { - unset($this->_params['crowdby']); - } - return $this; - } + const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets'; /** - * @param string $value - * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface - */ - public function setAdjust($value) - { - if ($value !== null) { - $this->_params['adjust'] = $value; - } else { - unset($this->_params['adjust']); - } - return $this; - } - - /** - * @return string key + * Create Gdata_Query object */ - public function getKey() - { - if (array_key_exists('key', $this->_params)) { - return $this->_params['key']; - } else { - return null; - } - } - - /** - * @return string bq - */ - public function getBq() - { - if (array_key_exists('bq', $this->_params)) { - return $this->_params['bq']; - } else { - return null; - } - } - - /** - * @return string refine - */ - public function getRefine() - { - if (array_key_exists('refine', $this->_params)) { - return $this->_params['refine']; - } else { - return null; - } - } - - /** - * @return string content - */ - public function getContent() + public function __construct($url = null) { - if (array_key_exists('content', $this->_params)) { - return $this->_params['content']; - } else { - return null; - } - } - - /** - * @return string orderby - */ - public function getOrderBy() - { - if (array_key_exists('orderby', $this->_params)) { - return $this->_params['orderby']; - } else { - return null; - } + throw new Zend_Exception( + 'Google Base API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html' + ); } - - /** - * @return string sortorder - */ - public function getSortOrder() - { - if (array_key_exists('sortorder', $this->_params)) { - return $this->_params['sortorder']; - } else { - return null; - } - } - - /** - * @return string crowdby - */ - public function getCrowdBy() - { - if (array_key_exists('crowdby', $this->_params)) { - return $this->_params['crowdby']; - } else { - return null; - } - } - - /** - * @return string adjust - */ - public function getAdjust() - { - if (array_key_exists('adjust', $this->_params)) { - return $this->_params['adjust']; - } else { - return null; - } - } - } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/SnippetEntry.php --- a/web/lib/Zend/Gdata/Gbase/SnippetEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/SnippetEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SnippetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SnippetEntry.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** @@ -34,15 +34,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetEntry extends Zend_Gdata_Gbase_Entry { - /** - * The classname for individual snippet entry elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Gbase_SnippetEntry'; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/SnippetFeed.php --- a/web/lib/Zend/Gdata/Gbase/SnippetFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/SnippetFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,15 +16,20 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SnippetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SnippetFeed.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** - * @see Zend_Gdata_Gbase_Feed + * @see Zend_Exception */ -require_once 'Zend/Gdata/Gbase/Feed.php'; +require_once 'Zend/Exception.php'; + +/** + * @see Zend_Gdata_Feed + */ +require_once 'Zend/Gdata/Feed.php'; /** * Represents the Google Base Snippets Feed @@ -34,15 +39,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetFeed extends Zend_Gdata_Feed { - /** - * The classname for individual snippet feed elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Gbase_SnippetEntry'; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Gbase/SnippetQuery.php --- a/web/lib/Zend/Gdata/Gbase/SnippetQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Gbase/SnippetQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,20 +16,15 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SnippetQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SnippetQuery.php 24777 2012-05-08 18:50:23Z adamlundrigan $ */ /** - * Zend_Gdata_Query + * @see Zend_Gdata_Gbase_Query */ -require_once('Zend/Gdata/Query.php'); - -/** - * Zend_Gdata_Gbase_Query - */ -require_once('Zend/Gdata/Gbase/Query.php'); +require_once 'Zend/Gdata/Gbase/Query.php'; /** * Assists in constructing queries for Google Base Snippets Feed @@ -39,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query @@ -47,28 +42,5 @@ /** * Path to the snippets feeds on the Google Base server. */ - const BASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets'; - - /** - * The default URI for POST methods - * - * @var string - */ - protected $_defaultFeedUri = self::BASE_SNIPPET_FEED_URI; - - /** - * Returns the query URL generated by this query instance. - * - * @return string The query URL for this instance. - */ - public function getQueryUrl() - { - $uri = $this->_defaultFeedUri; - if ($this->getCategory() !== null) { - $uri .= '/-/' . $this->getCategory(); - } - $uri .= $this->getQueryString(); - return $uri; - } - + const BASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets'; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Geo.php --- a/web/lib/Zend/Gdata/Geo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Geo.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Geo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Geo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo extends Zend_Gdata diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Geo/Entry.php --- a/web/lib/Zend/Gdata/Geo/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Geo/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Entry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Geo/Extension/GeoRssWhere.php --- a/web/lib/Zend/Gdata/Geo/Extension/GeoRssWhere.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Geo/Extension/GeoRssWhere.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GeoRssWhere.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GeoRssWhere.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GeoRssWhere extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Geo/Extension/GmlPoint.php --- a/web/lib/Zend/Gdata/Geo/Extension/GmlPoint.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Geo/Extension/GmlPoint.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GmlPoint.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GmlPoint.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GmlPoint extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Geo/Extension/GmlPos.php --- a/web/lib/Zend/Gdata/Geo/Extension/GmlPos.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Geo/Extension/GmlPos.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GmlPos.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GmlPos.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GmlPos extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Geo/Feed.php --- a/web/lib/Zend/Gdata/Geo/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Geo/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Feed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Health.php --- a/web/lib/Zend/Gdata/Health.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Health.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,37 +16,22 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Health.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Health.php 24779 2012-05-08 19:13:59Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata */ require_once 'Zend/Gdata.php'; /** - * @see Zend_Gdata_Health_ProfileFeed - */ -require_once 'Zend/Gdata/Health/ProfileFeed.php'; - -/** - * @see Zend_Gdata_Health_ProfileListFeed - */ -require_once 'Zend/Gdata/Health/ProfileListFeed.php'; - -/** - * @see Zend_Gdata_Health_ProfileListEntry - */ -require_once 'Zend/Gdata/Health/ProfileListEntry.php'; - -/** - * @see Zend_Gdata_Health_ProfileEntry - */ -require_once 'Zend/Gdata/Health/ProfileEntry.php'; - -/** * Service class for interacting with the Google Health Data API * * @link http://code.google.com/apis/health @@ -54,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health extends Zend_Gdata @@ -84,29 +69,6 @@ const H9_SANDBOX_SERVICE_NAME = 'weaver'; /** - * Profile ID used for all API interactions. This can only be set when - * using ClientLogin for authentication. - * - * @var string - */ - private $_profileID = null; - - /** - * True if API calls should be made to the H9 developer sandbox at /h9 - * rather than /health - * - * @var bool - */ - private $_useH9Sandbox = false; - - public static $namespaces = - array('ccr' => 'urn:astm-org:CCR', - 'batch' => 'http://schemas.google.com/gdata/batch', - 'h9m' => 'http://schemas.google.com/health/metadata', - 'gAcl' => 'http://schemas.google.com/acl/2007', - 'gd' => 'http://schemas.google.com/g/2005'); - - /** * Create Zend_Gdata_Health object * * @param Zend_Http_Client $client (optional) The HTTP client to use when @@ -118,157 +80,10 @@ */ public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0', $useH9Sandbox = false) { - $this->registerPackage('Zend_Gdata_Health'); - $this->registerPackage('Zend_Gdata_Health_Extension_Ccr'); - parent::__construct($client, $applicationId); - $this->_useH9Sandbox = $useH9Sandbox; - } - - /** - * Gets the id of the user's profile - * - * @return string The profile id - */ - public function getProfileID() - { - return $this->_profileID; - } - - /** - * Sets which of the user's profiles will be used - * - * @param string $id The profile ID - * @return Zend_Gdata_Health Provides a fluent interface - */ - public function setProfileID($id) { - $this->_profileID = $id; - return $this; - } - - /** - * Retrieves the list of profiles associated with the user's ClientLogin - * credentials. - * - * @param string $query The query of the feed as a URL or Query object - * @return Zend_Gdata_Feed - */ - public function getHealthProfileListFeed($query = null) - { - if ($this->_httpClient->getClientLoginToken() === null) { - require_once 'Zend/Gdata/App/AuthException.php'; - throw new Zend_Gdata_App_AuthException( - 'Profiles list feed is only available when using ClientLogin'); - } - - if($query === null) { - $uri = self::CLIENTLOGIN_PROFILELIST_FEED_URI; - } else if ($query instanceof Zend_Gdata_Query) { - $uri = $query->getQueryUrl(); - } else { - $uri = $query; - } - - // use correct feed for /h9 or /health - if ($this->_useH9Sandbox) { - $uri = preg_replace('/\/health\//', '/h9/', $uri); - } - - return parent::getFeed($uri, 'Zend_Gdata_Health_ProfileListFeed'); - } - - /** - * Retrieve a user's profile as a feed object. If ClientLogin is used, the - * profile associated with $this->_profileID is returned, otherwise - * the profile associated with the AuthSub token is read. - * - * @param mixed $query The query for the feed, as a URL or Query - * @return Zend_Gdata_Health_ProfileFeed - */ - public function getHealthProfileFeed($query = null) - { - if ($this->_httpClient->getClientLoginToken() !== null && - $this->getProfileID() == null) { - require_once 'Zend/Gdata/App/AuthException.php'; - throw new Zend_Gdata_App_AuthException( - 'Profile ID must not be null. Did you call setProfileID()?'); - } - - if ($query instanceof Zend_Gdata_Query) { - $uri = $query->getQueryUrl(); - } else if ($this->_httpClient->getClientLoginToken() !== null && - $query == null) { - $uri = self::CLIENTLOGIN_PROFILE_FEED_URI . '/' . $this->getProfileID(); - } else if ($query === null) { - $uri = self::AUTHSUB_PROFILE_FEED_URI; - } else { - $uri = $query; - } - - // use correct feed for /h9 or /health - if ($this->_useH9Sandbox) { - $uri = preg_replace('/\/health\//', '/h9/', $uri); - } - - return parent::getFeed($uri, 'Zend_Gdata_Health_ProfileFeed'); - } - - /** - * Retrieve a profile entry object - * - * @param mixed $query The query for the feed, as a URL or Query - * @return Zend_Gdata_Health_ProfileEntry - */ - public function getHealthProfileEntry($query = null) - { - if ($query === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; - throw new Zend_Gdata_App_InvalidArgumentException( - 'Query must not be null'); - } else if ($query instanceof Zend_Gdata_Query) { - $uri = $query->getQueryUrl(); - } else { - $uri = $query; - } - return parent::getEntry($uri, 'Zend_Gdata_Health_ProfileEntry'); - } - - /** - * Posts a new notice using the register feed. This function constructs - * the atom profile entry. - * - * @param string $subject The subject line of the notice - * @param string $body The message body of the notice - * @param string $bodyType The (optional) type of message body - * (text, xhtml, html, etc.) - * @param string $ccrXML The (optional) CCR to add to the user's profile - * @return Zend_Gdata_Health_ProfileEntry - */ - public function sendHealthNotice($subject, $body, $bodyType = null, $ccrXML = null) - { - if ($this->_httpClient->getClientLoginToken()) { - $profileID = $this->getProfileID(); - if ($profileID !== null) { - $uri = self::CLIENTLOGIN_REGISTER_FEED_URI . '/' . $profileID; - } else { - require_once 'Zend/Gdata/App/AuthException.php'; - throw new Zend_Gdata_App_AuthException( - 'Profile ID must not be null. Did you call setProfileID()?'); - } - } else { - $uri = self::AUTHSUB_REGISTER_FEED_URI; - } - - $entry = new Zend_Gdata_Health_ProfileEntry(); - $entry->title = $this->newTitle($subject); - $entry->content = $this->newContent($body); - $entry->content->type = $bodyType ? $bodyType : 'text'; - $entry->setCcr($ccrXML); - - // use correct feed for /h9 or /health - if ($this->_useH9Sandbox) { - $uri = preg_replace('/\/health\//', '/h9/', $uri); - } - - return $this->insertEntry($entry, $uri, 'Zend_Gdata_Health_ProfileEntry'); + throw new Zend_Exception( + 'Google Health API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Health/Extension/Ccr.php --- a/web/lib/Zend/Gdata/Health/Extension/Ccr.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Health/Extension/Ccr.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,12 +15,17 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ccr.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ccr.php 24779 2012-05-08 19:13:59Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_App_Extension_Element */ require_once 'Zend/Gdata/App/Extension/Element.php'; @@ -31,15 +36,11 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_Extension_Ccr extends Zend_Gdata_App_Extension_Element { - protected $_rootNamespace = 'ccr'; - protected $_rootElement = 'ContinuityOfCareRecord'; - protected $_ccrDom = null; - /** * Creates a Zend_Gdata_Health_Extension_Ccr entry, representing CCR data * @@ -48,77 +49,10 @@ */ public function __construct($element = null) { - foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) { - $this->registerNamespace($nsPrefix, $nsUri); - } - } - - /** - * Transfers each child and attribute into member variables. - * This is called when XML is received over the wire and the data - * model needs to be built to represent this XML. - * - * @param DOMNode $node The DOMNode that represents this object's data - */ - public function transferFromDOM($node) - { - $this->_ccrDom = $node; - } - - /** - * Retrieves a DOMElement which corresponds to this element and all - * child properties. This is used to build an entry back into a DOM - * and eventually XML text for sending to the server upon updates, or - * for application storage/persistence. - * - * @param DOMDocument $doc The DOMDocument used to construct DOMElements - * @return DOMElement The DOMElement representing this element and all - * child properties. - */ - public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null) - { - if ($doc === null) { - $doc = new DOMDocument('1.0', 'utf-8'); - } - $domElement = $doc->importNode($this->_ccrDom, true); - return $domElement; - } - - /** - * Magic helper that allows drilling down and returning specific elements - * in the CCR. For example, to retrieve the users medications - * (/ContinuityOfCareRecord/Body/Medications) from the entry's CCR, call - * $entry->getCcr()->getMedications(). Similarly, getConditions() would - * return extract the user's conditions. - * - * @param string $name Name of the function to call - * @param unknown $args - * @return array. A list of the appropriate CCR data - */ - public function __call($name, $args) - { - if (substr($name, 0, 3) === 'get') { - $category = substr($name, 3); - - switch ($category) { - case 'Conditions': - $category = 'Problems'; - break; - case 'Allergies': - $category = 'Alerts'; - break; - case 'TestResults': - // TestResults is an alias for LabResults - case 'LabResults': - $category = 'Results'; - break; - default: - // $category is already well formatted - } - - return $this->_ccrDom->getElementsByTagNameNS($this->lookupNamespace('ccr'), $category); - } else { - return null; - } + throw new Zend_Exception( + 'Google Health API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Health/ProfileEntry.php --- a/web/lib/Zend/Gdata/Health/ProfileEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Health/ProfileEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,22 +16,22 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileEntry.php 24779 2012-05-08 19:13:59Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Entry */ require_once 'Zend/Gdata/Entry.php'; /** - * @see Zend_Gdata_Health_Extension_Ccr - */ -require_once 'Zend/Gdata/Health/Extension/Ccr.php'; - -/** * Concrete class for working with Health profile entries. * * @link http://code.google.com/apis/health/ @@ -39,97 +39,21 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry { /** - * The classname for individual profile entry elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Health_ProfileEntry'; - - /** - * Google Health CCR data - * - * @var Zend_Gdata_Health_Extension_Ccr - */ - protected $_ccrData = null; - - /** * Constructs a new Zend_Gdata_Health_ProfileEntry object. * @param DOMElement $element (optional) The DOMElement on which to base this object. */ public function __construct($element = null) { - foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) { - $this->registerNamespace($nsPrefix, $nsUri); - } - parent::__construct($element); - } - - /** - * Retrieves a DOMElement which corresponds to this element and all - * child properties. This is used to build an entry back into a DOM - * and eventually XML text for application storage/persistence. - * - * @param DOMDocument $doc The DOMDocument used to construct DOMElements - * @return DOMElement The DOMElement representing this element and all - * child properties. - */ - public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null) - { - $element = parent::getDOM($doc, $majorVersion, $minorVersion); - if ($this->_ccrData !== null) { - $element->appendChild($this->_ccrData->getDOM($element->ownerDocument)); - } - - return $element; - } - - /** - * Creates individual Entry objects of the appropriate type and - * stores them as members of this entry based upon DOM data. - * - * @param DOMNode $child The DOMNode to process - */ - protected function takeChildFromDOM($child) - { - $absoluteNodeName = $child->namespaceURI . ':' . $child->localName; - - if (strstr($absoluteNodeName, $this->lookupNamespace('ccr') . ':')) { - $ccrElement = new Zend_Gdata_Health_Extension_Ccr(); - $ccrElement->transferFromDOM($child); - $this->_ccrData = $ccrElement; - } else { - parent::takeChildFromDOM($child); - - } - } - - /** - * Sets the profile entry's CCR data - * @param string $ccrXMLStr The CCR as an xml string - * @return Zend_Gdata_Health_Extension_Ccr - */ - public function setCcr($ccrXMLStr) { - $ccrElement = null; - if ($ccrXMLStr != null) { - $ccrElement = new Zend_Gdata_Health_Extension_Ccr(); - $ccrElement->transferFromXML($ccrXMLStr); - $this->_ccrData = $ccrElement; - } - return $ccrElement; - } - - - /** - * Returns all the CCR data in a profile entry - * @return Zend_Gdata_Health_Extension_Ccr - */ - public function getCcr() { - return $this->_ccrData; + throw new Zend_Exception( + 'Google Health API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Health/ProfileFeed.php --- a/web/lib/Zend/Gdata/Health/ProfileFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Health/ProfileFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,12 +16,17 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileFeed.php 24779 2012-05-08 19:13:59Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Feed */ require_once 'Zend/Gdata/Feed.php'; @@ -34,19 +39,12 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileFeed extends Zend_Gdata_Feed { /** - * The class name for individual profile feed elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Health_ProfileEntry'; - - /** * Creates a Health Profile feed, representing a user's Health profile * * @param DOMElement $element (optional) DOMElement from which this @@ -54,14 +52,10 @@ */ public function __construct($element = null) { - foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) { - $this->registerNamespace($nsPrefix, $nsUri); - } - parent::__construct($element); - } - - public function getEntries() - { - return $this->entry; + throw new Zend_Exception( + 'Google Health API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Health/ProfileListEntry.php --- a/web/lib/Zend/Gdata/Health/ProfileListEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Health/ProfileListEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,12 +16,17 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileListEntry.php 24779 2012-05-08 19:13:59Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Entry */ require_once 'Zend/Gdata/Entry.php'; @@ -34,67 +39,21 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileListEntry extends Zend_Gdata_Entry { /** - * The classname for individual profile list entry elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Health_ProfileListEntry'; - - /** * Constructs a new Zend_Gdata_Health_ProfileListEntry object. * @param DOMElement $element (optional) The DOMElement on which to base this object. */ public function __construct($element = null) { - parent::__construct($element); - } - - /** - * Retrieves a DOMElement which corresponds to this element and all - * child properties. This is used to build an entry back into a DOM - * and eventually XML text for application storage/persistence. - * - * @param DOMDocument $doc The DOMDocument used to construct DOMElements - * @return DOMElement The DOMElement representing this element and all - * child properties. - */ - public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null) - { - $element = parent::getDOM($doc, $majorVersion, $minorVersion); - return $element; + throw new Zend_Exception( + 'Google Health API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html' + ); } - - /** - * Creates individual Entry objects of the appropriate type and - * stores them as members of this entry based upon DOM data. - * - * @param DOMNode $child The DOMNode to process - */ - protected function takeChildFromDOM($child) - { - parent::takeChildFromDOM($child); - } - - /** - * Retrieves the profile ID for the entry, which is contained in - * @return string The profile id - */ - public function getProfileID() { - return $this->getContent()->text; - } - - /** - * Retrieves the profile's title, which is contained in - * @return string The profile name - */ - public function getProfileName() { - return $this->getTitle()->text; - } - } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Health/ProfileListFeed.php --- a/web/lib/Zend/Gdata/Health/ProfileListFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Health/ProfileListFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,12 +16,17 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileListFeed.php 24779 2012-05-08 19:13:59Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Feed */ require_once 'Zend/Gdata/Feed.php'; @@ -34,20 +39,17 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileListFeed extends Zend_Gdata_Feed { - /** - * The class name for individual profile feed elements. - * - * @var string - */ - protected $_entryClassName = 'Zend_Gdata_Health_ProfileListEntry'; - - public function getEntries() + public function __construct($element = null) { - return $this->entry; + throw new Zend_Exception( + 'Google Health API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Health/Query.php --- a/web/lib/Zend/Gdata/Health/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Health/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,12 +16,17 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24779 2012-05-08 19:13:59Z adamlundrigan $ */ /** + * @see Zend_Exception + */ +require_once 'Zend/Exception.php'; + +/** * @see Zend_Gdata_Query */ require_once('Zend/Gdata/Query.php'); @@ -34,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_Query extends Zend_Gdata_Query @@ -55,231 +60,16 @@ * Namespace for an item category */ const ITEM_CATEGORY_NS = 'http://schemas.google.com/health/item'; - - /** - * The default URI for POST methods - * - * @var string - */ - protected $_defaultFeedUri = self::HEALTH_PROFILE_FEED_URI; - - /** - * Sets the digest parameter's value. - * - * @param string $value - * @return Zend_Gdata_Health_Query Provides a fluent interface - */ - public function setDigest($value) - { - if ($value !== null) { - $this->_params['digest'] = $value; - } - return $this; - } - - /** - * Returns the digest parameter's value. - * - * @return string The value set for the digest parameter. - */ - public function getDigest() - { - if (array_key_exists('digest', $this->_params)) { - return $this->_params['digest']; - } else { - return null; - } - } - - /** - * Setter for category queries. - * - * @param string $item A category to query. - * @param string $name (optional) A specific item to search a category for. - * An example would be 'Lipitor' if $item is set to 'medication'. - * @return Zend_Gdata_Health_Query Provides a fluent interface - */ - public function setCategory($item, $name = null) - { - $this->_category = $item . - ($name ? '/' . urlencode('{' . self::ITEM_CATEGORY_NS . '}' . $name) : null); - return $this; - } - - /** - * Returns the query object's category. - * - * @return string id - */ - public function getCategory() - { - return $this->_category; - } - - /** - * Setter for the grouped parameter. - * - * @param string $value setting a count of results per group. - * @return Zend_Gdata_Health_Query Provides a fluent interface - */ - public function setGrouped($value) - { - if ($value !== null) { - $this->_params['grouped'] = $value; - } - return $this; - } - - /** - * Returns the value set for the grouped parameter. - * - * @return string grouped parameter. - */ - public function getGrouped() - { - if (array_key_exists('grouped', $this->_params)) { - return $this->_params['grouped']; - } else { - return null; - } - } - - /** - * Setter for the max-results-group parameter. - * - * @param int $value Specifies the maximum number of groups to be - * retrieved. Must be an integer value greater than zero. This parameter - * is only valid if grouped=true. - * @return Zend_Gdata_Health_Query Provides a fluent interface - */ - public function setMaxResultsGroup($value) - { - if ($value !== null) { - if ($value <= 0 || $this->getGrouped() !== 'true') { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; - throw new Zend_Gdata_App_InvalidArgumentException( - 'The max-results-group parameter must be set to a value - greater than 0 and can only be used if grouped=true'); - } else { - $this->_params['max-results-group'] = $value; - } - } - return $this; - } - + /** - * Returns the value set for max-results-group. - * - * @return int Returns max-results-group parameter. + * Create Gdata_Query object */ - public function getMaxResultsGroup() - { - if (array_key_exists('max-results-group', $this->_params)) { - return $this->_params['max-results-group']; - } else { - return null; - } - } - - /** - * Setter for the max-results-group parameter. - * - * @param int $value Specifies the maximum number of records to be - * retrieved from each group. The limits that you specify with this - * parameter apply to all groups. Must be an integer value greater than - * zero. This parameter is only valid if grouped=true. - * @return Zend_Gdata_Health_Query Provides a fluent interface - */ - public function setMaxResultsInGroup($value) - { - if ($value !== null) { - if ($value <= 0 || $this->getGrouped() !== 'true') { - throw new Zend_Gdata_App_InvalidArgumentException( - 'The max-results-in-group parameter must be set to a value - greater than 0 and can only be used if grouped=true'); - } else { - $this->_params['max-results-in-group'] = $value; - } - } - return $this; - } - - /** - * Returns the value set for max-results-in-group. - * - * @return int Returns max-results-in-group parameter. - */ - public function getMaxResultsInGroup() + public function __construct($url = null) { - if (array_key_exists('max-results-in-group', $this->_params)) { - return $this->_params['max-results-in-group']; - } else { - return null; - } - } - - /** - * Setter for the start-index-group parameter. - * - * @param int $value Retrieves only items whose group ranking is at - * least start-index-group. This should be set to a 1-based index of the - * first group to be retrieved. The range is applied per category. - * This parameter is only valid if grouped=true. - * @return Zend_Gdata_Health_Query Provides a fluent interface - */ - public function setStartIndexGroup($value) - { - if ($value !== null && $this->getGrouped() !== 'true') { - throw new Zend_Gdata_App_InvalidArgumentException( - 'The start-index-group can only be used if grouped=true'); - } else { - $this->_params['start-index-group'] = $value; - } - return $this; - } - - /** - * Returns the value set for start-index-group. - * - * @return int Returns start-index-group parameter. - */ - public function getStartIndexGroup() - { - if (array_key_exists('start-index-group', $this->_params)) { - return $this->_params['start-index-group']; - } else { - return null; - } - } - - /** - * Setter for the start-index-in-group parameter. - * - * @param int $value A 1-based index of the records to be retrieved from - * each group. This parameter is only valid if grouped=true. - * @return Zend_Gdata_Health_Query Provides a fluent interface - */ - public function setStartIndexInGroup($value) - { - if ($value !== null && $this->getGrouped() !== 'true') { - throw new Zend_Gdata_App_InvalidArgumentException('start-index-in-group'); - } else { - $this->_params['start-index-in-group'] = $value; - } - return $this; - } - - /** - * Returns the value set for start-index-in-group. - * - * @return int Returns start-index-in-group parameter. - */ - public function getStartIndexInGroup() - { - if (array_key_exists('start-index-in-group', $this->_params)) { - return $this->_params['start-index-in-group']; - } else { - return null; - } + throw new Zend_Exception( + 'Google Health API has been discontinued by Google and was removed' + . ' from Zend Framework in 1.12.0. For more information see: ' + . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/HttpAdapterStreamingProxy.php --- a/web/lib/Zend/Gdata/HttpAdapterStreamingProxy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/HttpAdapterStreamingProxy.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpAdapterStreamingProxy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpAdapterStreamingProxy.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Proxy diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/HttpAdapterStreamingSocket.php --- a/web/lib/Zend/Gdata/HttpAdapterStreamingSocket.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/HttpAdapterStreamingSocket.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpAdapterStreamingSocket.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpAdapterStreamingSocket.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Socket diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/HttpClient.php --- a/web/lib/Zend/Gdata/HttpClient.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/HttpClient.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpClient.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpClient.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpClient extends Zend_Http_Client diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Kind/EventEntry.php --- a/web/lib/Zend/Gdata/Kind/EventEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Kind/EventEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -92,7 +92,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Kind_EventEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media.php --- a/web/lib/Zend/Gdata/Media.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Media.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Media.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media extends Zend_Gdata diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Entry.php --- a/web/lib/Zend/Gdata/Media/Entry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Entry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Entry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaCategory.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaCategory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaCategory.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCategory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCategory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCategory extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaContent.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaContent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaContent.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaContent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaContent.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaContent extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaCopyright.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaCopyright.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaCopyright.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCopyright.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCopyright.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCopyright extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaCredit.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaCredit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaCredit.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCredit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCredit.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCredit extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaDescription.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaDescription.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaDescription.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaDescription.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaDescription.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaDescription extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaGroup.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaGroup.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaGroup.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaGroup.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaGroup.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -106,7 +106,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaGroup extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaHash.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaHash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaHash.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaHash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaHash.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaHash extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaKeywords.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaKeywords.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaKeywords.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaKeywords.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaKeywords.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaKeywords extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaPlayer.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaPlayer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaPlayer.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaPlayer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaPlayer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaPlayer extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaRating.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaRating.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaRating.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaRating.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaRating.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaRating extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaRestriction.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaRestriction.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaRestriction.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaRestriction.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaRestriction.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaRestriction extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaText.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaText.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaText.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaText.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaText.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaText extends Zend_Gdata_Extension @@ -64,11 +64,11 @@ /** * Constructs a new MediaText element * - * @param $text string - * @param $type string - * @param $lang string - * @param $start string - * @param $end string + * @param string $text + * @param string $type + * @param string $lang + * @param string $start + * @param string $end */ public function __construct($text = null, $type = null, $lang = null, $start = null, $end = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaThumbnail.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaThumbnail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaThumbnail.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaThumbnail.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaThumbnail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaThumbnail extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Extension/MediaTitle.php --- a/web/lib/Zend/Gdata/Media/Extension/MediaTitle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Extension/MediaTitle.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaTitle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaTitle.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaTitle extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Media/Feed.php --- a/web/lib/Zend/Gdata/Media/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Media/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Feed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/MediaMimeStream.php --- a/web/lib/Zend/Gdata/MediaMimeStream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/MediaMimeStream.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaMimeStream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaMimeStream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MediaMimeStream diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/MimeBodyString.php --- a/web/lib/Zend/Gdata/MimeBodyString.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/MimeBodyString.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MimeBodyString.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MimeBodyString.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MimeBodyString diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/MimeFile.php --- a/web/lib/Zend/Gdata/MimeFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/MimeFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MimeFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MimeFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MimeFile diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos.php --- a/web/lib/Zend/Gdata/Photos.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Photos.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Photos.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -52,14 +52,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos extends Zend_Gdata { - const PICASA_BASE_URI = 'http://picasaweb.google.com/data'; - const PICASA_BASE_FEED_URI = 'http://picasaweb.google.com/data/feed'; + const PICASA_BASE_URI = 'https://picasaweb.google.com/data'; + const PICASA_BASE_FEED_URI = 'https://picasaweb.google.com/data/feed'; const AUTH_SERVICE_NAME = 'lh2'; /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/AlbumEntry.php --- a/web/lib/Zend/Gdata/Photos/AlbumEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/AlbumEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -98,7 +98,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/AlbumFeed.php --- a/web/lib/Zend/Gdata/Photos/AlbumFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/AlbumFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/AlbumQuery.php --- a/web/lib/Zend/Gdata/Photos/AlbumQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/AlbumQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/CommentEntry.php --- a/web/lib/Zend/Gdata/Photos/CommentEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/CommentEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -58,7 +58,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_CommentEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Access.php --- a/web/lib/Zend/Gdata/Photos/Extension/Access.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Access.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Access.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Access.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Access extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/AlbumId.php --- a/web/lib/Zend/Gdata/Photos/Extension/AlbumId.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/AlbumId.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumId.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_AlbumId extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/BytesUsed.php --- a/web/lib/Zend/Gdata/Photos/Extension/BytesUsed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/BytesUsed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BytesUsed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BytesUsed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_BytesUsed extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Checksum.php --- a/web/lib/Zend/Gdata/Photos/Extension/Checksum.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Checksum.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Checksum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Checksum.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Checksum extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Client.php --- a/web/lib/Zend/Gdata/Photos/Extension/Client.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Client extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/CommentCount.php --- a/web/lib/Zend/Gdata/Photos/Extension/CommentCount.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/CommentCount.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentCount.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentCount.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_CommentCount extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/CommentingEnabled.php --- a/web/lib/Zend/Gdata/Photos/Extension/CommentingEnabled.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/CommentingEnabled.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentingEnabled.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentingEnabled.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_CommentingEnabled extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Height.php --- a/web/lib/Zend/Gdata/Photos/Extension/Height.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Height.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Height.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Height.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Height extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Id.php --- a/web/lib/Zend/Gdata/Photos/Extension/Id.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Id.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Id.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Id.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Id extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Location.php --- a/web/lib/Zend/Gdata/Photos/Extension/Location.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Location.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Location.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Location.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Location extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php --- a/web/lib/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MaxPhotosPerAlbum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MaxPhotosPerAlbum.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Name.php --- a/web/lib/Zend/Gdata/Photos/Extension/Name.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Name.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Name extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Nickname.php --- a/web/lib/Zend/Gdata/Photos/Extension/Nickname.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Nickname.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nickname.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nickname.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Nickname extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/NumPhotos.php --- a/web/lib/Zend/Gdata/Photos/Extension/NumPhotos.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/NumPhotos.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumPhotos.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumPhotos.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_NumPhotos extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php --- a/web/lib/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumPhotosRemaining.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumPhotosRemaining.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_NumPhotosRemaining extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/PhotoId.php --- a/web/lib/Zend/Gdata/Photos/Extension/PhotoId.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/PhotoId.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoId.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_PhotoId extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Position.php --- a/web/lib/Zend/Gdata/Photos/Extension/Position.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Position.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Position.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Position.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Position extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/QuotaCurrent.php --- a/web/lib/Zend/Gdata/Photos/Extension/QuotaCurrent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/QuotaCurrent.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QuotaCurrent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QuotaCurrent.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_QuotaCurrent extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/QuotaLimit.php --- a/web/lib/Zend/Gdata/Photos/Extension/QuotaLimit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/QuotaLimit.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QuotaLimit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QuotaLimit.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_QuotaLimit extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Rotation.php --- a/web/lib/Zend/Gdata/Photos/Extension/Rotation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Rotation.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rotation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rotation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Rotation extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Size.php --- a/web/lib/Zend/Gdata/Photos/Extension/Size.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Size.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Size.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Size.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Size extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Thumbnail.php --- a/web/lib/Zend/Gdata/Photos/Extension/Thumbnail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Thumbnail.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Thumbnail.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Thumbnail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Thumbnail extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Timestamp.php --- a/web/lib/Zend/Gdata/Photos/Extension/Timestamp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Timestamp.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Timestamp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Timestamp.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Timestamp extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/User.php --- a/web/lib/Zend/Gdata/Photos/Extension/User.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/User.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: User.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: User.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_User extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Version.php --- a/web/lib/Zend/Gdata/Photos/Extension/Version.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Version.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Version.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Version.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Version extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Weight.php --- a/web/lib/Zend/Gdata/Photos/Extension/Weight.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Weight.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Weight extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/Extension/Width.php --- a/web/lib/Zend/Gdata/Photos/Extension/Width.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/Extension/Width.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Width.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Width.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Width extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/PhotoEntry.php --- a/web/lib/Zend/Gdata/Photos/PhotoEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/PhotoEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -113,7 +113,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoEntry extends Zend_Gdata_Media_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/PhotoFeed.php --- a/web/lib/Zend/Gdata/Photos/PhotoFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/PhotoFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/PhotoQuery.php --- a/web/lib/Zend/Gdata/Photos/PhotoQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/PhotoQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoQuery extends Zend_Gdata_Photos_AlbumQuery diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/TagEntry.php --- a/web/lib/Zend/Gdata/Photos/TagEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/TagEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -48,7 +48,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_TagEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/UserEntry.php --- a/web/lib/Zend/Gdata/Photos/UserEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/UserEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -78,7 +78,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/UserFeed.php --- a/web/lib/Zend/Gdata/Photos/UserFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/UserFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -66,7 +66,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Photos/UserQuery.php --- a/web/lib/Zend/Gdata/Photos/UserQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Photos/UserQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Query.php --- a/web/lib/Zend/Gdata/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets.php --- a/web/lib/Zend/Gdata/Spreadsheets.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Spreadsheets.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Spreadsheets.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -89,13 +89,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets extends Zend_Gdata { - const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds/spreadsheets'; - const SPREADSHEETS_POST_URI = 'http://spreadsheets.google.com/feeds/spreadsheets/private/full'; + const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds/spreadsheets'; + const SPREADSHEETS_POST_URI = 'https://spreadsheets.google.com/feeds/spreadsheets/private/full'; const WORKSHEETS_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#worksheetsfeed'; const LIST_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#listfeed'; const CELL_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#cellsfeed'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/CellEntry.php --- a/web/lib/Zend/Gdata/Spreadsheets/CellEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/CellEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CellEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CellEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellEntry extends Zend_Gdata_Entry @@ -92,7 +92,8 @@ /** * Sets the Cell element of this Cell Entry. - * @param $cell Zend_Gdata_Spreadsheets_Extension_Cell $cell + * @param Zend_Gdata_Spreadsheets_Extension_Cell $cell + * @return Zend_Gdata_Spreadsheets_CellEntry */ public function setCell($cell) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/CellFeed.php --- a/web/lib/Zend/Gdata/Spreadsheets/CellFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/CellFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CellFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CellFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/CellQuery.php --- a/web/lib/Zend/Gdata/Spreadsheets/CellQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/CellQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CellQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CellQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellQuery extends Zend_Gdata_Query { - const SPREADSHEETS_CELL_FEED_URI = 'http://spreadsheets.google.com/feeds/cells'; + const SPREADSHEETS_CELL_FEED_URI = 'https://spreadsheets.google.com/feeds/cells'; protected $_defaultFeedUri = self::SPREADSHEETS_CELL_FEED_URI; protected $_visibility = 'private'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/DocumentQuery.php --- a/web/lib/Zend/Gdata/Spreadsheets/DocumentQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/DocumentQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query { - const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds'; + const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds'; protected $_defaultFeedUri = self::SPREADSHEETS_FEED_URI; protected $_documentType; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/Extension/Cell.php --- a/web/lib/Zend/Gdata/Spreadsheets/Extension/Cell.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/Extension/Cell.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cell.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cell.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_Cell extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/Extension/ColCount.php --- a/web/lib/Zend/Gdata/Spreadsheets/Extension/ColCount.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/Extension/ColCount.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ColCount.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ColCount.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_ColCount extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/Extension/Custom.php --- a/web/lib/Zend/Gdata/Spreadsheets/Extension/Custom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/Extension/Custom.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Custom.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Custom.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_Custom extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/Extension/RowCount.php --- a/web/lib/Zend/Gdata/Spreadsheets/Extension/RowCount.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/Extension/RowCount.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RowCount.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RowCount.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_RowCount extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/ListEntry.php --- a/web/lib/Zend/Gdata/Spreadsheets/ListEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/ListEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/ListFeed.php --- a/web/lib/Zend/Gdata/Spreadsheets/ListFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/ListFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/ListQuery.php --- a/web/lib/Zend/Gdata/Spreadsheets/ListQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/ListQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query { - const SPREADSHEETS_LIST_FEED_URI = 'http://spreadsheets.google.com/feeds/list'; + const SPREADSHEETS_LIST_FEED_URI = 'https://spreadsheets.google.com/feeds/list'; protected $_defaultFeedUri = self::SPREADSHEETS_LIST_FEED_URI; protected $_visibility = 'private'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php --- a/web/lib/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SpreadsheetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SpreadsheetEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_SpreadsheetEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php --- a/web/lib/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SpreadsheetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SpreadsheetFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_SpreadsheetFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/WorksheetEntry.php --- a/web/lib/Zend/Gdata/Spreadsheets/WorksheetEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/WorksheetEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WorksheetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WorksheetEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_WorksheetEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/Spreadsheets/WorksheetFeed.php --- a/web/lib/Zend/Gdata/Spreadsheets/WorksheetFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/Spreadsheets/WorksheetFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WorksheetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WorksheetFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_WorksheetFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube.php --- a/web/lib/Zend/Gdata/YouTube.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: YouTube.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: YouTube.php 24796 2012-05-12 03:34:26Z adamlundrigan $ */ /** @@ -79,7 +79,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube extends Zend_Gdata_Media @@ -88,22 +88,22 @@ const AUTH_SERVICE_NAME = 'youtube'; const CLIENTLOGIN_URL = 'https://www.google.com/youtube/accounts/ClientLogin'; - const STANDARD_TOP_RATED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; - const STANDARD_MOST_VIEWED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; - const STANDARD_RECENTLY_FEATURED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; - const STANDARD_WATCH_ON_MOBILE_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; + const STANDARD_TOP_RATED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; + const STANDARD_MOST_VIEWED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; + const STANDARD_RECENTLY_FEATURED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; + const STANDARD_WATCH_ON_MOBILE_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; const STANDARD_TOP_RATED_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; const STANDARD_MOST_VIEWED_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; const STANDARD_RECENTLY_FEATURED_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; const STANDARD_WATCH_ON_MOBILE_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; - const USER_URI = 'http://gdata.youtube.com/feeds/api/users'; - const VIDEO_URI = 'http://gdata.youtube.com/feeds/api/videos'; + const USER_URI = 'https://gdata.youtube.com/feeds/api/users'; + const VIDEO_URI = 'https://gdata.youtube.com/feeds/api/videos'; const PLAYLIST_REL = 'http://gdata.youtube.com/schemas/2007#playlist'; const USER_UPLOADS_REL = 'http://gdata.youtube.com/schemas/2007#user.uploads'; const USER_PLAYLISTS_REL = 'http://gdata.youtube.com/schemas/2007#user.playlists'; @@ -113,9 +113,9 @@ const VIDEO_RESPONSES_REL = 'http://gdata.youtube.com/schemas/2007#video.responses'; const VIDEO_RATINGS_REL = 'http://gdata.youtube.com/schemas/2007#video.ratings'; const VIDEO_COMPLAINTS_REL = 'http://gdata.youtube.com/schemas/2007#video.complaints'; - const ACTIVITY_FEED_URI = 'http://gdata.youtube.com/feeds/api/events'; + const ACTIVITY_FEED_URI = 'https://gdata.youtube.com/feeds/api/events'; const FRIEND_ACTIVITY_FEED_URI = - 'http://gdata.youtube.com/feeds/api/users/default/friendsactivity'; + 'https://gdata.youtube.com/feeds/api/users/default/friendsactivity'; /** * The URI of the in-reply-to schema for comments in reply to @@ -132,7 +132,7 @@ * @var string */ const INBOX_FEED_URI = - 'http://gdata.youtube.com/feeds/api/users/default/inbox'; + 'https://gdata.youtube.com/feeds/api/users/default/inbox'; /** * The maximum number of users for which activity can be requested for, @@ -256,7 +256,7 @@ if ($location == null) { $uri = self::VIDEO_URI; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -286,7 +286,7 @@ $uri = self::VIDEO_URI . "/" . $videoId; } } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -324,7 +324,7 @@ $uri = self::VIDEO_URI . "/" . $videoId . "/" . self::RELATED_URI_SUFFIX; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -346,7 +346,7 @@ $uri = self::VIDEO_URI . "/" . $videoId . "/" . self::RESPONSES_URI_SUFFIX; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -367,7 +367,7 @@ if ($videoId !== null) { $uri = self::VIDEO_URI . "/" . $videoId . "/comments"; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -398,7 +398,7 @@ $location->setFeedType('top rated'); } } - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -430,7 +430,7 @@ $location->setFeedType('most viewed'); } } - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -461,7 +461,7 @@ $location->setFeedType('recently featured'); } } - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -493,7 +493,7 @@ $location->setFeedType('watch on mobile'); } } - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -513,7 +513,7 @@ if ($user !== null) { $uri = self::USER_URI . '/' . $user . '/playlists'; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -531,7 +531,7 @@ public function getPlaylistVideoFeed($location) { if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -551,7 +551,7 @@ if ($user !== null) { $uri = self::USER_URI . '/' . $user . '/subscriptions'; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -571,7 +571,7 @@ if ($user !== null) { $uri = self::USER_URI . '/' . $user . '/contacts'; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -592,7 +592,7 @@ $uri = self::USER_URI . '/' . $user . '/' . self::UPLOADS_URI_SUFFIX; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -613,7 +613,7 @@ $uri = self::USER_URI . '/' . $user . '/' . self::FAVORITES_URI_SUFFIX; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -633,7 +633,7 @@ if ($user !== null) { $uri = self::USER_URI . '/' . $user; } else if ($location instanceof Zend_Gdata_Query) { - $uri = $location->getQueryUrl(); + $uri = $location->getQueryUrl($this->getMajorProtocolVersion()); } else { $uri = $location; } @@ -697,7 +697,7 @@ * @return array An array containing a token and URL */ public function getFormUploadToken($videoEntry, - $url='http://gdata.youtube.com/action/GetUploadToken') + $url='https://gdata.youtube.com/action/GetUploadToken') { if ($url != null && is_string($url)) { // $response is a Zend_Http_response object @@ -729,7 +729,7 @@ $uri = null; if ($username instanceof Zend_Gdata_Query) { - $uri = $username->getQueryUrl(); + $uri = $username->getQueryUrl($this->getMajorProtocolVersion()); } else { if (count(explode(',', $username)) > self::ACTIVITY_FEED_MAX_USERS) { @@ -834,7 +834,7 @@ $messageEntry->setSummary($this->newSummary($body)); } - $insertUrl = 'http://gdata.youtube.com/feeds/api/users/' . + $insertUrl = 'https://gdata.youtube.com/feeds/api/users/' . $recipientUserName . '/inbox'; $response = $this->insertEntry($messageEntry, $insertUrl, 'Zend_Gdata_YouTube_InboxEntry'); @@ -844,11 +844,11 @@ /** * Post a comment in reply to an existing comment * - * @param $commentEntry Zend_Gdata_YouTube_CommentEntry The comment entry - * to reply to - * @param $commentText string The text of the comment to post - * @return A Zend_Gdata_YouTube_CommentEntry representing the posted - * comment + * @param Zend_Gdata_YouTube_CommentEntry $commentEntry The comment entry + * to reply to + * @param string $commentText The text of the + * comment to post + * @return Zend_Gdata_YouTube_CommentEntry the posted comment */ public function replyToCommentEntry($commentEntry, $commentText) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/ActivityEntry.php --- a/web/lib/Zend/Gdata/YouTube/ActivityEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/ActivityEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActivityEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActivityEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ActivityEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/ActivityFeed.php --- a/web/lib/Zend/Gdata/YouTube/ActivityFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/ActivityFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActivityFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActivityFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ActivityFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/CommentEntry.php --- a/web/lib/Zend/Gdata/YouTube/CommentEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/CommentEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_CommentEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/CommentFeed.php --- a/web/lib/Zend/Gdata/YouTube/CommentFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/CommentFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_CommentFeed extends Zend_Gdata_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/ContactEntry.php --- a/web/lib/Zend/Gdata/YouTube/ContactEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/ContactEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContactEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContactEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ContactEntry extends Zend_Gdata_YouTube_UserProfileEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/ContactFeed.php --- a/web/lib/Zend/Gdata/YouTube/ContactFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/ContactFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContactFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContactFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ContactFeed extends Zend_Gdata_Media_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/AboutMe.php --- a/web/lib/Zend/Gdata/YouTube/Extension/AboutMe.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/AboutMe.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AboutMe.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AboutMe.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_AboutMe extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Age.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Age.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Age.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Age.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Age.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Age extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Books.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Books.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Books.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Books.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Books.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Books extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Company.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Company.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Company.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Company.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Company.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Company extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Control.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Control.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Control.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Control.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Control.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Control extends Zend_Gdata_App_Extension_Control diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/CountHint.php --- a/web/lib/Zend/Gdata/YouTube/Extension/CountHint.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/CountHint.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CountHint.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CountHint.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_CountHint extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Description.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Description.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Description.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Description.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Description extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Duration.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Duration.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Duration.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Duration.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Duration.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Duration extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/FirstName.php --- a/web/lib/Zend/Gdata/YouTube/Extension/FirstName.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/FirstName.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FirstName.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FirstName.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_FirstName extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Gender.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Gender.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Gender.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gender.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Gender.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Gender extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Hobbies.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Hobbies.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Hobbies.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hobbies.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hobbies.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Hobbies extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Hometown.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Hometown.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Hometown.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hometown.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hometown.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Hometown extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/LastName.php --- a/web/lib/Zend/Gdata/YouTube/Extension/LastName.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/LastName.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LastName.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LastName.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_LastName extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Link.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Link.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Link.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Link extends Zend_Gdata_App_Extension_Link diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Location.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Location.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Location.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Location.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Location.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Location extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/MediaContent.php --- a/web/lib/Zend/Gdata/YouTube/Extension/MediaContent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/MediaContent.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaContent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaContent.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaContent extends Zend_Gdata_Media_Extension_MediaContent diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/MediaCredit.php --- a/web/lib/Zend/Gdata/YouTube/Extension/MediaCredit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/MediaCredit.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCredit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCredit.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaCredit extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/MediaGroup.php --- a/web/lib/Zend/Gdata/YouTube/Extension/MediaGroup.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/MediaGroup.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaGroup.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaGroup.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -70,7 +70,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaGroup extends Zend_Gdata_Media_Extension_MediaGroup diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/MediaRating.php --- a/web/lib/Zend/Gdata/YouTube/Extension/MediaRating.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/MediaRating.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaRating.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaRating.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaRating extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Movies.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Movies.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Movies.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Movies.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Movies.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Movies extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Music.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Music.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Music.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Music.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Music.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Music extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/NoEmbed.php --- a/web/lib/Zend/Gdata/YouTube/Extension/NoEmbed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/NoEmbed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NoEmbed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NoEmbed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_NoEmbed extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Occupation.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Occupation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Occupation.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Occupation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Occupation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Occupation extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/PlaylistId.php --- a/web/lib/Zend/Gdata/YouTube/Extension/PlaylistId.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/PlaylistId.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistId.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_PlaylistId extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/PlaylistTitle.php --- a/web/lib/Zend/Gdata/YouTube/Extension/PlaylistTitle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/PlaylistTitle.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistTitle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistTitle.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_PlaylistTitle extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Position.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Position.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Position.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Position.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Position.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Position extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Private.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Private.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Private.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Private.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Private.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Private extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/QueryString.php --- a/web/lib/Zend/Gdata/YouTube/Extension/QueryString.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/QueryString.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryString.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryString.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_QueryString extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Racy.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Racy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Racy.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Racy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Racy.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Racy extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Recorded.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Recorded.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Recorded.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Recorded.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Recorded.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Recorded extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Relationship.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Relationship.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Relationship.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Relationship.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Relationship.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Relationship extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/ReleaseDate.php --- a/web/lib/Zend/Gdata/YouTube/Extension/ReleaseDate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/ReleaseDate.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReleaseDate.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ReleaseDate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_ReleaseDate extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/School.php --- a/web/lib/Zend/Gdata/YouTube/Extension/School.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/School.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: School.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: School.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_School extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/State.php --- a/web/lib/Zend/Gdata/YouTube/Extension/State.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/State.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: State.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: State.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_State extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Statistics.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Statistics.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Statistics.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Statistics.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Statistics.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Status.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Status.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Status.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Status.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Status.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Status extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Token.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Token.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Token.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Token.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Token extends Zend_Gdata_App_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Uploaded.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Uploaded.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Uploaded.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uploaded.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Uploaded.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Uploaded extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/Username.php --- a/web/lib/Zend/Gdata/YouTube/Extension/Username.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/Username.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Username.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Username.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Username extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/Extension/VideoId.php --- a/web/lib/Zend/Gdata/YouTube/Extension/VideoId.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/Extension/VideoId.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoId.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_VideoId extends Zend_Gdata_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/InboxEntry.php --- a/web/lib/Zend/Gdata/YouTube/InboxEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/InboxEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InboxEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InboxEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_InboxEntry extends Zend_Gdata_Media_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/InboxFeed.php --- a/web/lib/Zend/Gdata/YouTube/InboxFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/InboxFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InboxFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InboxFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_InboxFeed extends Zend_Gdata_Media_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/MediaEntry.php --- a/web/lib/Zend/Gdata/YouTube/MediaEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/MediaEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_MediaEntry extends Zend_Gdata_Media_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/PlaylistListEntry.php --- a/web/lib/Zend/Gdata/YouTube/PlaylistListEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/PlaylistListEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistListEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/PlaylistListFeed.php --- a/web/lib/Zend/Gdata/YouTube/PlaylistListFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/PlaylistListFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistListFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistListFeed extends Zend_Gdata_Media_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/PlaylistVideoEntry.php --- a/web/lib/Zend/Gdata/YouTube/PlaylistVideoEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/PlaylistVideoEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistVideoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistVideoEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistVideoEntry extends Zend_Gdata_YouTube_VideoEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/PlaylistVideoFeed.php --- a/web/lib/Zend/Gdata/YouTube/PlaylistVideoFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/PlaylistVideoFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistVideoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistVideoFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistVideoFeed extends Zend_Gdata_Media_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/SubscriptionEntry.php --- a/web/lib/Zend/Gdata/YouTube/SubscriptionEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/SubscriptionEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubscriptionEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubscriptionEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -72,7 +72,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/SubscriptionFeed.php --- a/web/lib/Zend/Gdata/YouTube/SubscriptionFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/SubscriptionFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubscriptionFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubscriptionFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_SubscriptionFeed extends Zend_Gdata_Media_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/UserProfileEntry.php --- a/web/lib/Zend/Gdata/YouTube/UserProfileEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/UserProfileEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserProfileEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserProfileEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -132,7 +132,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/VideoEntry.php --- a/web/lib/Zend/Gdata/YouTube/VideoEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/VideoEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -92,7 +92,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/VideoFeed.php --- a/web/lib/Zend/Gdata/YouTube/VideoFeed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/VideoFeed.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoFeed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoFeed extends Zend_Gdata_Media_Feed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Gdata/YouTube/VideoQuery.php --- a/web/lib/Zend/Gdata/YouTube/VideoQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Gdata/YouTube/VideoQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoQuery.php 20097 2010-01-06 15:40:27Z bate $ + * @version $Id: VideoQuery.php 25185 2013-01-08 08:07:08Z frosch $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query @@ -92,7 +92,7 @@ 'Video ID must be set for feed of type: ' . $feedType); } else { $this->_url = Zend_Gdata_YouTube::VIDEO_URI . '/' . $videoId . - 'responses'; + '/responses'; } break; case 'comments': @@ -102,7 +102,7 @@ 'Video ID must be set for feed of type: ' . $feedType); } else { $this->_url = Zend_Gdata_YouTube::VIDEO_URI . '/' . - $videoId . 'comments'; + $videoId . '/comments'; if ($entry !== null) { $this->_url .= '/' . $entry; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client.php --- a/web/lib/Zend/Http/Client.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client - * @version $Id: Client.php 23443 2010-11-24 11:53:13Z shahar $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Client.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -60,7 +60,7 @@ * @package Zend_Http * @subpackage Client * @throws Zend_Http_Client_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client @@ -103,6 +103,12 @@ const ENC_FORMDATA = 'multipart/form-data'; /** + * Value types for Body key/value pairs + */ + const VTYPE_SCALAR = 'SCALAR'; + const VTYPE_FILE = 'FILE'; + + /** * Configuration array, set using the constructor or using ::setConfig() * * @var array @@ -203,6 +209,16 @@ protected $files = array(); /** + * Ordered list of keys from key/value pair data to include in body + * + * An associative array, where each element is of the format: + * '' => VTYPE_SCALAR | VTYPE_FILE + * + * @var array + */ + protected $body_field_order = array(); + + /** * The client's cookie jar * * @var Zend_Http_CookieJar @@ -231,6 +247,20 @@ protected $redirectCounter = 0; /** + * Status for unmasking GET array params + * + * @var boolean + */ + protected $_unmaskStatus = false; + + /** + * Status if the http_build_query function escapes brackets + * + * @var boolean + */ + protected $_queryBracketsEscaped = true; + + /** * Fileinfo magic database resource * * This variable is populated the first time _detectFileMimeType is called @@ -255,6 +285,8 @@ if ($config !== null) { $this->setConfig($config); } + + $this->_queryBracketsEscaped = version_compare(phpversion(), '5.1.3', '>='); } /** @@ -266,7 +298,10 @@ */ public function setUri($uri) { - if (is_string($uri)) { + if ($uri instanceof Zend_Uri_Http) { + // clone the URI in order to keep the passed parameter constant + $uri = clone $uri; + } elseif (is_string($uri)) { $uri = Zend_Uri::factory($uri); } @@ -355,7 +390,7 @@ throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method."); } - if ($method == self::POST && $this->enctype === null) { + if (($method == self::POST || $method == self::PUT || $method == self::DELETE) && $this->enctype === null) { $this->setEncType(self::ENC_URLENCODED); } @@ -501,6 +536,12 @@ break; case 'post': $parray = &$this->paramsPost; + if ( $value === null ) { + if (isset($this->body_field_order[$name])) + unset($this->body_field_order[$name]); + } else { + $this->body_field_order[$name] = self::VTYPE_SCALAR; + } break; } @@ -718,6 +759,8 @@ 'ctype' => $ctype, 'data' => $data ); + + $this->body_field_order[$formname] = self::VTYPE_FILE; return $this; } @@ -764,6 +807,35 @@ } /** + * Set the unmask feature for GET parameters as array + * + * Example: + * foo%5B0%5D=a&foo%5B1%5D=b + * becomes + * foo=a&foo=b + * + * This is usefull for some services + * + * @param boolean $status + * @return Zend_Http_Client + */ + public function setUnmaskStatus($status = true) + { + $this->_unmaskStatus = (BOOL)$status; + return $this; + } + + /** + * Returns the currently configured unmask status + * + * @return boolean + */ + public function getUnmaskStatus() + { + return $this->_unmaskStatus; + } + + /** * Clear all GET and POST parameters * * Should be used to reset the request parameters if the client is @@ -782,6 +854,7 @@ $this->paramsPost = array(); $this->files = array(); $this->raw_post_data = null; + $this->enctype = null; if($clearAll) { $this->headers = array(); @@ -866,6 +939,10 @@ */ public function getAdapter() { + if (null === $this->adapter) { + $this->setAdapter($this->config['adapter']); + } + return $this->adapter; } @@ -911,10 +988,10 @@ require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Could not open temp file {$this->_stream_name}"); } - + return $fp; } - + /** * Send the HTTP request and return an HTTP response object * @@ -955,6 +1032,15 @@ $query = str_replace('+', '%20', $query); } + // @see ZF-11671 to unmask for some services to foo=val1&foo=val2 + if ($this->getUnmaskStatus()) { + if ($this->_queryBracketsEscaped) { + $query = preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $query); + } else { + $query = preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $query); + } + } + $uri->setQuery($query); } @@ -994,7 +1080,10 @@ } if($this->config['output_stream']) { - rewind($stream); + $streamMetaData = stream_get_meta_data($stream); + if ($streamMetaData['seekable']) { + rewind($stream); + } // cleanup the adapter $this->adapter->setOutputStream(null); $response = Zend_Http_Response_Stream::fromStream($response, $stream); @@ -1019,6 +1108,10 @@ // If we got redirected, look for the Location header if ($response->isRedirect() && ($location = $response->getHeader('location'))) { + // Avoid problems with buggy servers that add whitespace at the + // end of some headers (See ZF-11283) + $location = trim($location); + // Check whether we send the exact same request again, or drop the parameters // and send a GET request if ($response->getStatus() == 303 || @@ -1030,7 +1123,7 @@ } // If we got a well formed absolute URI - if (Zend_Uri_Http::check($location)) { + if (($scheme = substr($location, 0, 6)) && ($scheme == 'http:/' || $scheme == 'https:')) { $this->setHeaders('host', null); $this->setUri($location); @@ -1198,16 +1291,30 @@ $boundary = '---ZENDHTTPCLIENT-' . md5(microtime()); $this->setHeaders(self::CONTENT_TYPE, self::ENC_FORMDATA . "; boundary={$boundary}"); - // Get POST parameters and encode them - $params = self::_flattenParametersArray($this->paramsPost); - foreach ($params as $pp) { - $body .= self::encodeFormData($boundary, $pp[0], $pp[1]); - } - - // Encode files - foreach ($this->files as $file) { - $fhead = array(self::CONTENT_TYPE => $file['ctype']); - $body .= self::encodeFormData($boundary, $file['formname'], $file['data'], $file['filename'], $fhead); + // Encode all files and POST vars in the order they were given + foreach ($this->body_field_order as $fieldName=>$fieldType) { + switch ($fieldType) { + case self::VTYPE_FILE: + foreach ($this->files as $file) { + if ($file['formname']===$fieldName) { + $fhead = array(self::CONTENT_TYPE => $file['ctype']); + $body .= self::encodeFormData($boundary, $file['formname'], $file['data'], $file['filename'], $fhead); + } + } + break; + case self::VTYPE_SCALAR: + if (isset($this->paramsPost[$fieldName])) { + if (is_array($this->paramsPost[$fieldName])) { + $flattened = self::_flattenParametersArray($this->paramsPost[$fieldName], $fieldName); + foreach ($flattened as $pp) { + $body .= self::encodeFormData($boundary, $pp[0], $pp[1]); + } + } else { + $body .= self::encodeFormData($boundary, $fieldName, $this->paramsPost[$fieldName]); + } + } + break; + } } $body .= "--{$boundary}--\r\n"; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Adapter/Curl.php --- a/web/lib/Zend/Http/Client/Adapter/Curl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Adapter/Curl.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Curl.php 22216 2010-05-20 21:12:05Z dragonbe $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Curl.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream @@ -334,7 +334,7 @@ $curlMethod = CURLOPT_CUSTOMREQUEST; $curlValue = "TRACE"; break; - + case Zend_Http_Client::HEAD: $curlMethod = CURLOPT_CUSTOMREQUEST; $curlValue = "HEAD"; @@ -393,6 +393,9 @@ } elseif ($method == Zend_Http_Client::PUT) { // This is a PUT by a setRawData string, not by file-handle curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body); + } elseif ($method == Zend_Http_Client::DELETE) { + // This is a DELETE by a setRawData string + curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body); } // set additional curl options diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Adapter/Exception.php --- a/web/lib/Zend/Http/Client/Adapter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Adapter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter_Exception - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Exception extends Zend_Http_Client_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Adapter/Interface.php --- a/web/lib/Zend/Http/Client/Adapter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Adapter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_Client_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Adapter/Proxy.php --- a/web/lib/Zend/Http/Client/Adapter/Proxy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Adapter/Proxy.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Proxy.php 21792 2010-04-08 00:27:06Z stas $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Proxy.php 25273 2013-03-06 08:02:21Z frosch $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket @@ -66,7 +66,7 @@ 'proxy_user' => '', 'proxy_pass' => '', 'proxy_auth' => Zend_Http_Client::AUTH_BASIC, - 'persistent' => false + 'persistent' => false, ); /** @@ -75,6 +75,13 @@ * @var boolean */ protected $negotiated = false; + + /** + * Stores the last CONNECT handshake request + * + * @var string + */ + protected $connectHandshakeRequest; /** * Connect to the remote server @@ -89,13 +96,13 @@ public function connect($host, $port = 80, $secure = false) { // If no proxy is set, fall back to Socket adapter - if (! $this->config['proxy_host']) { + if (!$this->config['proxy_host']) { return parent::connect($host, $port, $secure); } - + /* Url might require stream context even if proxy connection doesn't */ if ($secure) { - $this->config['sslusecontext'] = true; + $this->config['sslusecontext'] = true; } // Connect (a non-secure connection) to the proxy server @@ -115,36 +122,63 @@ * @param array $headers * @param string $body * @return string Request as string + * @throws Zend_Http_Client_Adapter_Exception */ - public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '') + public function write( + $method, $uri, $http_ver = '1.1', $headers = array(), $body = '' + ) { // If no proxy is set, fall back to default Socket adapter - if (! $this->config['proxy_host']) return parent::write($method, $uri, $http_ver, $headers, $body); + if (!$this->config['proxy_host']) { + return parent::write($method, $uri, $http_ver, $headers, $body); + } // Make sure we're properly connected - if (! $this->socket) { + if (!$this->socket) { require_once 'Zend/Http/Client/Adapter/Exception.php'; - throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected"); + throw new Zend_Http_Client_Adapter_Exception( + 'Trying to write but we are not connected' + ); } $host = $this->config['proxy_host']; $port = $this->config['proxy_port']; - if ($this->connected_to[0] != "tcp://$host" || $this->connected_to[1] != $port) { + if ($this->connected_to[0] != "tcp://$host" + || $this->connected_to[1] != $port + ) { require_once 'Zend/Http/Client/Adapter/Exception.php'; - throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong proxy server"); + throw new Zend_Http_Client_Adapter_Exception( + 'Trying to write but we are connected to the wrong proxy server' + ); } // Add Proxy-Authorization header - if ($this->config['proxy_user'] && ! isset($headers['proxy-authorization'])) { - $headers['proxy-authorization'] = Zend_Http_Client::encodeAuthHeader( - $this->config['proxy_user'], $this->config['proxy_pass'], $this->config['proxy_auth'] - ); + if ($this->config['proxy_user']) { + // Check to see if one already exists + $hasProxyAuthHeader = false; + foreach ($headers as $k => $v) { + if ((string) $k == 'proxy-authorization' + || preg_match("/^proxy-authorization:/i", $v) + ) { + $hasProxyAuthHeader = true; + break; + } + } + if (!$hasProxyAuthHeader) { + $headers[] = 'Proxy-authorization: ' + . Zend_Http_Client::encodeAuthHeader( + $this->config['proxy_user'], + $this->config['proxy_pass'], $this->config['proxy_auth'] + ); + } } // if we are proxying HTTPS, preform CONNECT handshake with the proxy - if ($uri->getScheme() == 'https' && (! $this->negotiated)) { - $this->connectHandshake($uri->getHost(), $uri->getPort(), $http_ver, $headers); + if ($uri->getScheme() == 'https' && (!$this->negotiated)) { + $this->connectHandshake( + $uri->getHost(), $uri->getPort(), $http_ver, $headers + ); $this->negotiated = true; } @@ -174,20 +208,24 @@ // Add the request body $request .= "\r\n" . $body; } - + // Send the request - if (! @fwrite($this->socket, $request)) { + if (!@fwrite($this->socket, $request)) { require_once 'Zend/Http/Client/Adapter/Exception.php'; - throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server"); + throw new Zend_Http_Client_Adapter_Exception( + 'Error writing request to proxy server' + ); } - + if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { require_once 'Zend/Http/Client/Adapter/Exception.php'; - throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); + throw new Zend_Http_Client_Adapter_Exception( + 'Error writing request to server' + ); } } - + return $request; } @@ -198,30 +236,41 @@ * @param integer $port * @param string $http_ver * @param array $headers + * @return void + * @throws Zend_Http_Client_Adapter_Exception */ - protected function connectHandshake($host, $port = 443, $http_ver = '1.1', array &$headers = array()) + protected function connectHandshake( + $host, $port = 443, $http_ver = '1.1', array &$headers = array() + ) { $request = "CONNECT $host:$port HTTP/$http_ver\r\n" . "Host: " . $this->config['proxy_host'] . "\r\n"; - // Add the user-agent header - if (isset($this->config['useragent'])) { - $request .= "User-agent: " . $this->config['useragent'] . "\r\n"; - } + // Process provided headers, including important ones to CONNECT request + foreach ($headers as $k => $v) { + switch (strtolower(substr($v,0,strpos($v,':')))) { + case 'proxy-authorization': + // break intentionally omitted - // If the proxy-authorization header is set, send it to proxy but remove - // it from headers sent to target host - if (isset($headers['proxy-authorization'])) { - $request .= "Proxy-authorization: " . $headers['proxy-authorization'] . "\r\n"; - unset($headers['proxy-authorization']); + case 'user-agent': + $request .= $v . "\r\n"; + break; + + default: + break; + } } - $request .= "\r\n"; + + // @see ZF-3189 + $this->connectHandshakeRequest = $request; // Send the request - if (! @fwrite($this->socket, $request)) { + if (!@fwrite($this->socket, $request)) { require_once 'Zend/Http/Client/Adapter/Exception.php'; - throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server"); + throw new Zend_Http_Client_Adapter_Exception( + 'Error writing request to proxy server' + ); } // Read response headers only @@ -231,14 +280,18 @@ $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false); if ($gotStatus) { $response .= $line; - if (!chop($line)) break; + if (!chop($line)) { + break; + } } } // Check that the response from the proxy is 200 if (Zend_Http_Response::extractCode($response) != 200) { require_once 'Zend/Http/Client/Adapter/Exception.php'; - throw new Zend_Http_Client_Adapter_Exception("Unable to connect to HTTPS proxy. Server response: " . $response); + throw new Zend_Http_Client_Adapter_Exception( + 'Unable to connect to HTTPS proxy. Server response: ' . $response + ); } // If all is good, switch socket to secure mode. We have to fall back @@ -253,13 +306,17 @@ $success = false; foreach($modes as $mode) { $success = stream_socket_enable_crypto($this->socket, true, $mode); - if ($success) break; + if ($success) { + break; + } } - if (! $success) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; - throw new Zend_Http_Client_Adapter_Exception("Unable to connect to" . - " HTTPS server through proxy: could not negotiate secure connection."); + if (!$success) { + require_once 'Zend/Http/Client/Adapter/Exception.php'; + throw new Zend_Http_Client_Adapter_Exception( + 'Unable to connect to HTTPS server through proxy: could not ' + . 'negotiate secure connection.' + ); } } @@ -279,6 +336,8 @@ */ public function __destruct() { - if ($this->socket) $this->close(); + if ($this->socket) { + $this->close(); + } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Adapter/Socket.php --- a/web/lib/Zend/Http/Client/Adapter/Socket.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Adapter/Socket.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Socket.php 22576 2010-07-16 15:49:24Z dragonbe $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Socket.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream @@ -62,11 +62,11 @@ /** * Stream for storing output - * + * * @var resource */ protected $out_stream = null; - + /** * Parameters array * @@ -124,17 +124,17 @@ } } - /** - * Retrieve the array of all configuration options - * - * @return array - */ - public function getConfig() - { - return $this->config; - } + /** + * Retrieve the array of all configuration options + * + * @return array + */ + public function getConfig() + { + return $this->config; + } - /** + /** * Set the stream context for the TCP connection to the server * * Can accept either a pre-existing stream context resource, or an array @@ -290,13 +290,13 @@ // Add the request body $request .= "\r\n" . $body; } - + // Send the request if (! @fwrite($this->socket, $request)) { require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } - + if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { require_once 'Zend/Http/Client/Adapter/Exception.php'; @@ -317,7 +317,6 @@ // First, read headers only $response = ''; $gotStatus = false; - $stream = !empty($this->config['stream']); while (($line = @fgets($this->socket)) !== false) { $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false); @@ -326,7 +325,7 @@ if (rtrim($line) === '') break; } } - + $this->_checkSocketReadTimeout(); $statusCode = Zend_Http_Response::extractCode($response); @@ -353,7 +352,7 @@ // If we got a 'transfer-encoding: chunked' header if (isset($headers['transfer-encoding'])) { - + if (strtolower($headers['transfer-encoding']) == 'chunked') { do { @@ -384,7 +383,7 @@ if($this->out_stream) { if(stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) { $this->_checkSocketReadTimeout(); - break; + break; } } else { $line = @fread($this->socket, $read_to - $current_pos); @@ -405,11 +404,11 @@ } while ($chunksize > 0); } else { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' . $headers['transfer-encoding'] . '" transfer encoding'); } - + // We automatically decode chunked-messages when writing to a stream // this means we have to disallow the Zend_Http_Response to do it again if ($this->out_stream) { @@ -421,11 +420,11 @@ // If we got more than one Content-Length header (see ZF-9404) use // the last value sent if (is_array($headers['content-length'])) { - $contentLength = $headers['content-length'][count($headers['content-length']) - 1]; + $contentLength = $headers['content-length'][count($headers['content-length']) - 1]; } else { $contentLength = $headers['content-length']; } - + $current_pos = ftell($this->socket); $chunk = ''; @@ -436,7 +435,7 @@ if($this->out_stream) { if(@stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) { $this->_checkSocketReadTimeout(); - break; + break; } } else { $chunk = @fread($this->socket, $read_to - $current_pos); @@ -459,7 +458,7 @@ if($this->out_stream) { if(@stream_copy_to_stream($this->socket, $this->out_stream) == 0) { $this->_checkSocketReadTimeout(); - break; + break; } } else { $buff = @fread($this->socket, 8192); @@ -516,19 +515,19 @@ } } } - + /** * Set output stream for the response - * + * * @param resource $stream * @return Zend_Http_Client_Adapter_Socket */ - public function setOutputStream($stream) + public function setOutputStream($stream) { $this->out_stream = $stream; return $this; } - + /** * Destructor: make sure the socket is disconnected * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Adapter/Stream.php --- a/web/lib/Zend/Http/Client/Adapter/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Adapter/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Stream.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,18 +29,18 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_Client_Adapter_Stream { /** * Set output stream - * + * * This function sets output stream where the result will be stored. - * + * * @param resource $stream Stream to write the output to - * + * */ - function setOutputStream($stream); + public function setOutputStream($stream); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Adapter/Test.php --- a/web/lib/Zend/Http/Client/Adapter/Test.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Adapter/Test.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Test.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Test.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interface @@ -235,4 +235,14 @@ } $this->responseIndex = $index; } + + /** + * Retrieve the array of all configuration options + * + * @return array + */ + public function getConfig() + { + return $this->config; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Client/Exception.php --- a/web/lib/Zend/Http/Client/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Client/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Exception - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Exception extends Zend_Http_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Cookie.php --- a/web/lib/Zend/Http/Cookie.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Cookie.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Cookie - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Cookie.php 23443 2010-11-24 11:53:13Z shahar $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Cookie.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ * * @category Zend * @package Zend_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Cookie diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/CookieJar.php --- a/web/lib/Zend/Http/CookieJar.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/CookieJar.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage CookieJar - * @version $Id: CookieJar.php 23443 2010-11-24 11:53:13Z shahar $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: CookieJar.php 24856 2012-06-01 01:10:47Z adamlundrigan $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -54,7 +54,7 @@ * @category Zend * @package Zend_Http * @subpackage CookieJar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_CookieJar implements Countable, IteratorAggregate @@ -78,6 +78,13 @@ const COOKIE_STRING_CONCAT = 2; /** + * Return all cookies as one long string (strict mode) + * - Single space after the semi-colon separating each cookie + * - Remove trailing semi-colon, if any + */ + const COOKIE_STRING_CONCAT_STRICT = 3; + + /** * Array storing cookies * * Cookies are stored according to domain and path: @@ -173,6 +180,9 @@ public function getAllCookies($ret_as = self::COOKIE_OBJECT) { $cookies = $this->_flattenCookiesArray($this->cookies, $ret_as); + if($ret_as == self::COOKIE_STRING_CONCAT_STRICT) { + $cookies = rtrim(trim($cookies), ';'); + } return $cookies; } @@ -209,6 +219,9 @@ // Now, use self::_flattenCookiesArray again - only to convert to the return format ;) $ret = $this->_flattenCookiesArray($ret, $ret_as); + if($ret_as == self::COOKIE_STRING_CONCAT_STRICT) { + $ret = rtrim(trim($ret), ';'); + } return $ret; } @@ -245,6 +258,10 @@ return $cookie; break; + case self::COOKIE_STRING_CONCAT_STRICT: + return rtrim(trim($cookie->__toString()), ';'); + break; + case self::COOKIE_STRING_ARRAY: case self::COOKIE_STRING_CONCAT: return $cookie->__toString(); @@ -270,9 +287,12 @@ */ protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT) { if (is_array($ptr)) { - $ret = ($ret_as == self::COOKIE_STRING_CONCAT ? '' : array()); + $ret = ($ret_as == self::COOKIE_STRING_CONCAT || $ret_as == self::COOKIE_STRING_CONCAT_STRICT) ? '' : array(); foreach ($ptr as $item) { - if ($ret_as == self::COOKIE_STRING_CONCAT) { + if ($ret_as == self::COOKIE_STRING_CONCAT_STRICT) { + $postfix_combine = (!is_array($item) ? ' ' : ''); + $ret .= $this->_flattenCookiesArray($item, $ret_as) . $postfix_combine; + } elseif ($ret_as == self::COOKIE_STRING_CONCAT) { $ret .= $this->_flattenCookiesArray($item, $ret_as); } else { $ret = array_merge($ret, $this->_flattenCookiesArray($item, $ret_as)); @@ -285,6 +305,9 @@ return array($ptr->__toString()); break; + case self::COOKIE_STRING_CONCAT_STRICT: + // break intentionally omitted + case self::COOKIE_STRING_CONCAT: return $ptr->__toString(); break; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Exception.php --- a/web/lib/Zend/Http/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Exception - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Header/Exception/InvalidArgumentException.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Http/Header/Exception/InvalidArgumentException.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,36 @@ +getName() === NULL) { + $header->setName($headerKey); + $header->setValue($headerValue); + continue; + } + + // Process the remanining elements + switch (str_replace(array('-', '_'), '', strtolower($headerKey))) { + case 'expires' : $header->setExpires($headerValue); break; + case 'domain' : $header->setDomain($headerValue); break; + case 'path' : $header->setPath($headerValue); break; + case 'secure' : $header->setSecure(true); break; + case 'httponly': $header->setHttponly(true); break; + case 'version' : $header->setVersion((int) $headerValue); break; + case 'maxage' : $header->setMaxAge((int) $headerValue); break; + default: + // Intentionally omitted + } + } + $headers[] = $header; + } + return count($headers) == 1 ? array_pop($headers) : $headers; + } + + /** + * Cookie object constructor + * + * @todo Add validation of each one of the parameters (legal domain, etc.) + * + * @param string $name + * @param string $value + * @param int $expires + * @param string $path + * @param string $domain + * @param bool $secure + * @param bool $httponly + * @param string $maxAge + * @param int $version + * @return SetCookie + */ + public function __construct($name = null, $value = null, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false, $maxAge = null, $version = null) + { + $this->type = 'Cookie'; + + if ($name) { + $this->setName($name); + } + + if ($value) { + $this->setValue($value); // in parent + } + + if ($version) { + $this->setVersion($version); + } + + if ($maxAge) { + $this->setMaxAge($maxAge); + } + + if ($domain) { + $this->setDomain($domain); + } + + if ($expires) { + $this->setExpires($expires); + } + + if ($path) { + $this->setPath($path); + } + + if ($secure) { + $this->setSecure($secure); + } + + if ($httponly) { + $this->setHttponly($httponly); + } + } + + /** + * @return string 'Set-Cookie' + */ + public function getFieldName() + { + return 'Set-Cookie'; + } + + /** + * @throws Zend_Http_Header_Exception_RuntimeException + * @return string + */ + public function getFieldValue() + { + if ($this->getName() == '') { + throw new Zend_Http_Header_Exception_RuntimeException('A cookie name is required to generate a field value for this cookie'); + } + + $value = $this->getValue(); + if (strpos($value,'"')!==false) { + $value = '"'.urlencode(str_replace('"', '', $value)).'"'; + } else { + $value = urlencode($value); + } + $fieldValue = $this->getName() . '=' . $value; + + $version = $this->getVersion(); + if ($version!==null) { + $fieldValue .= '; Version=' . $version; + } + + $maxAge = $this->getMaxAge(); + if ($maxAge!==null) { + $fieldValue .= '; Max-Age=' . $maxAge; + } + + $expires = $this->getExpires(); + if ($expires) { + $fieldValue .= '; Expires=' . $expires; + } + + $domain = $this->getDomain(); + if ($domain) { + $fieldValue .= '; Domain=' . $domain; + } + + $path = $this->getPath(); + if ($path) { + $fieldValue .= '; Path=' . $path; + } + + if ($this->isSecure()) { + $fieldValue .= '; Secure'; + } + + if ($this->isHttponly()) { + $fieldValue .= '; HttpOnly'; + } + + return $fieldValue; + } + + /** + * @param string $name + * @return SetCookie + */ + public function setName($name) + { + if (preg_match("/[=,; \t\r\n\013\014]/", $name)) { + throw new Zend_Http_Header_Exception_InvalidArgumentException("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})"); + } + + $this->name = $name; + return $this; + } + + /** + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * @param string $value + */ + public function setValue($value) + { + $this->value = $value; + return $this; + } + + /** + * @return string + */ + public function getValue() + { + return $this->value; + } + + /** + * Set version + * + * @param integer $version + */ + public function setVersion($version) + { + if (!is_int($version)) { + throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid Version number specified'); + } + $this->version = $version; + } + + /** + * Get version + * + * @return integer + */ + public function getVersion() + { + return $this->version; + } + + /** + * Set Max-Age + * + * @param integer $maxAge + */ + public function setMaxAge($maxAge) + { + if (!is_int($maxAge) || ($maxAge<0)) { + throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid Max-Age number specified'); + } + $this->maxAge = $maxAge; + } + + /** + * Get Max-Age + * + * @return integer + */ + public function getMaxAge() + { + return $this->maxAge; + } + + /** + * @param int $expires + * @return SetCookie + */ + public function setExpires($expires) + { + if (!empty($expires)) { + if (is_string($expires)) { + $expires = strtotime($expires); + } elseif (!is_int($expires)) { + throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid expires time specified'); + } + $this->expires = (int) $expires; + } + return $this; + } + + /** + * @return int + */ + public function getExpires($inSeconds = false) + { + if ($this->expires == null) { + return; + } + if ($inSeconds) { + return $this->expires; + } + return gmdate('D, d-M-Y H:i:s', $this->expires) . ' GMT'; + } + + /** + * @param string $domain + */ + public function setDomain($domain) + { + $this->domain = $domain; + return $this; + } + + /** + * @return string + */ + public function getDomain() + { + return $this->domain; + } + + /** + * @param string $path + */ + public function setPath($path) + { + $this->path = $path; + return $this; + } + + /** + * @return string + */ + public function getPath() + { + return $this->path; + } + + /** + * @param boolean $secure + */ + public function setSecure($secure) + { + $this->secure = $secure; + return $this; + } + + /** + * @return boolean + */ + public function isSecure() + { + return $this->secure; + } + + /** + * @param bool $httponly + */ + public function setHttponly($httponly) + { + $this->httponly = $httponly; + return $this; + } + + /** + * @return bool + */ + public function isHttponly() + { + return $this->httponly; + } + + /** + * Check whether the cookie has expired + * + * Always returns false if the cookie is a session cookie (has no expiry time) + * + * @param int $now Timestamp to consider as "now" + * @return boolean + */ + public function isExpired($now = null) + { + if ($now === null) { + $now = time(); + } + + if (is_int($this->expires) && $this->expires < $now) { + return true; + } else { + return false; + } + } + + /** + * Check whether the cookie is a session cookie (has no expiry time set) + * + * @return boolean + */ + public function isSessionCookie() + { + return ($this->expires === null); + } + + public function isValidForRequest($requestDomain, $path, $isSecure = false) + { + if ($this->getDomain() && (strrpos($requestDomain, $this->getDomain()) !== false)) { + return false; + } + + if ($this->getPath() && (strpos($path, $this->getPath()) !== 0)) { + return false; + } + + if ($this->secure && $this->isSecure()!==$isSecure) { + return false; + } + + return true; + + } + + public function toString() + { + return $this->getFieldName() . ': ' . $this->getFieldValue(); + } + + public function __toString() + { + return $this->toString(); + } + + public function toStringMultipleHeaders(array $headers) + { + $headerLine = $this->toString(); + /* @var $header SetCookie */ + foreach ($headers as $header) { + if (!$header instanceof Zend_Http_Header_SetCookie) { + throw new Zend_Http_Header_Exception_RuntimeException( + 'The SetCookie multiple header implementation can only accept an array of SetCookie headers' + ); + } + $headerLine .= ', ' . $header->getFieldValue(); + } + return $headerLine; + } + + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Response.php --- a/web/lib/Zend/Http/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Response - * @version $Id: Response.php 22810 2010-08-08 10:29:09Z shahar $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Response.php 25081 2012-11-06 20:59:47Z rob $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Http * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Response @@ -165,7 +165,7 @@ require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("'{$value}' is not a valid HTTP header"); } - + $name = trim($header[0]); $value = trim($header[1]); } @@ -641,7 +641,7 @@ * @link http://framework.zend.com/issues/browse/ZF-6040 */ $zlibHeader = unpack('n', substr($body, 0, 2)); - if ($zlibHeader[1] % 31 == 0) { + if ($zlibHeader[1] % 31 == 0 && ord($body[0]) == 0x78 && in_array(ord($body[1]), array(0x01, 0x5e, 0x9c, 0xda))) { return gzuncompress($body); } else { return gzinflate($body); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/Response/Stream.php --- a/web/lib/Zend/Http/Response/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/Response/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Response - * @version $Id: Stream.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Http * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Response_Stream extends Zend_Http_Response @@ -90,7 +90,7 @@ /** * Set the cleanup trigger * - * @param $cleanup Set cleanup trigger + * @param bool $cleanup Set cleanup trigger */ public function setCleanup($cleanup = true) { $this->_cleanup = $cleanup; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent.php --- a/web/lib/Zend/Http/UserAgent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http_UserAgent * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Http_UserAgent * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent implements Serializable @@ -52,17 +52,17 @@ const DEFAULT_BROWSER_TYPE = 'desktop'; /** - * Default User Agent chain to prevent empty value + * Default User Agent chain to prevent empty value */ const DEFAULT_HTTP_USER_AGENT = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)'; /** - * Default Http Accept param to prevent empty value + * Default Http Accept param to prevent empty value */ const DEFAULT_HTTP_ACCEPT = "application/xhtml+xml"; /** - * Default markup language + * Default markup language */ const DEFAULT_MARKUP_LANGUAGE = "xhtml"; @@ -85,9 +85,9 @@ /** * Array to store config * - * Default values are provided to ensure specific keys are present at + * Default values are provided to ensure specific keys are present at * instantiation. - * + * * @var array */ protected $_config = array( @@ -113,7 +113,7 @@ * - User-Agent (defined in $_server) * - HTTP Accept value (defined in $_server) * - $_storage - * + * * @var bool */ protected $_immutable = false; @@ -139,7 +139,7 @@ /** * Server variable - * + * * @var array */ protected $_server; @@ -153,8 +153,8 @@ /** * Constructor - * - * @param null|array|Zend_Config|ArrayAccess $options + * + * @param null|array|Zend_Config|ArrayAccess $options * @return void */ public function __construct($options = null) @@ -166,16 +166,17 @@ /** * Serialized representation of the object - * + * * @return string */ public function serialize() { + $device = $this->getDevice(); $spec = array( 'browser_type' => $this->_browserType, 'config' => $this->_config, - 'device_class' => get_class($this->_device), - 'device' => $this->_device->serialize(), + 'device_class' => get_class($device), + 'device' => $device->serialize(), 'user_agent' => $this->getServerValue('http_user_agent'), 'http_accept' => $this->getServerValue('http_accept'), ); @@ -184,7 +185,7 @@ /** * Unserialize a previous representation of the object - * + * * @param string $serialized * @return void */ @@ -209,8 +210,8 @@ /** * Configure instance - * - * @param array|Zend_Config|ArrayAccess $options + * + * @param array|Zend_Config|ArrayAccess $options * @return Zend_Http_UserAgent */ public function setOptions($options) @@ -219,8 +220,8 @@ $options = $options->toArray(); } - if (!is_array($options) - && !$options instanceof ArrayAccess + if (!is_array($options) + && !$options instanceof ArrayAccess && !$options instanceof Traversable ) { require_once 'Zend/Http/UserAgent/Exception.php'; @@ -273,7 +274,7 @@ /** * Comparison of the UserAgent chain and browser signatures. - * + * * The comparison is case-insensitive : the browser signatures must be in lower * case * @@ -295,8 +296,8 @@ // Call match method on device class return call_user_func( - array($deviceClass, 'match'), - $userAgent, + array($deviceClass, 'match'), + $userAgent, $this->getServer() ); } @@ -315,7 +316,7 @@ return $this->_browserTypeClass[$browserType]; } - if (isset($this->_config[$browserType]) + if (isset($this->_config[$browserType]) && isset($this->_config[$browserType]['device']) ) { $deviceConfig = $this->_config[$browserType]['device']; @@ -410,9 +411,9 @@ /** * Returns the persistent storage handler * - * Session storage is used by default unless a different storage adapter - * has been set via the "persistent_storage_adapter" key. That key should - * contain either a fully qualified class name, or a short name that + * Session storage is used by default unless a different storage adapter + * has been set via the "persistent_storage_adapter" key. That key should + * contain either a fully qualified class name, or a short name that * resolves via the plugin loader. * * @param string $browser Browser identifier (User Agent chain) @@ -482,20 +483,20 @@ /** * Config parameters is an Array or a Zend_Config object - * + * * The allowed parameters are : * - the identification sequence (can be empty) => desktop browser type is the * default browser type returned * $config['identification_sequence'] : ',' separated browser types - * - the persistent storage adapter + * - the persistent storage adapter * $config['persistent_storage_adapter'] = "Session" or "NonPersistent" - * - to add or replace a browser type device + * - to add or replace a browser type device * $config[(type)]['device']['path'] * $config[(type)]['device']['classname'] - * - to add or replace a browser type features adapter + * - to add or replace a browser type features adapter * $config[(type)]['features']['path'] * $config[(type)]['features']['classname'] - * + * * @param mixed $config (option) Config array * @return Zend_Http_UserAgent */ @@ -504,7 +505,7 @@ if ($config instanceof Zend_Config) { $config = $config->toArray(); } - + // Verify that Config parameters are in an array. if (!is_array($config) && !$config instanceof Traversable) { require_once 'Zend/Http/UserAgent/Exception.php'; @@ -528,7 +529,12 @@ } /** - * @return the $device + * Returns the device object + * + * This is the object that will contain the various discovered device + * capabilities. + * + * @return Zend_Http_UserAgent_Device $device */ public function getDevice() { @@ -540,9 +546,9 @@ // search an existing identification in the session $storage = $this->getStorage($userAgent); - + if (!$storage->isEmpty()) { - // If the user agent and features are already existing, the + // If the user agent and features are already existing, the // Zend_Http_UserAgent object is serialized in the session $object = $storage->read(); $this->unserialize($object); @@ -551,7 +557,7 @@ // Find the browser type: $this->setBrowserType($this->_matchUserAgent()); $this->_createDevice(); - + // put the result in storage: $this->getStorage($userAgent) ->write($this->serialize()); @@ -596,10 +602,10 @@ /** * Retrieve the "$_SERVER" array * - * Basically, the $_SERVER array or an equivalent container storing the + * Basically, the $_SERVER array or an equivalent container storing the * data that will be introspected. * - * If the value has not been previously set, it sets itself from the + * If the value has not been previously set, it sets itself from the * $_SERVER superglobal. * * @return array @@ -613,9 +619,9 @@ } /** - * Retrieve the "$_SERVER" array + * Set the "$_SERVER" array * - * Basically, the $_SERVER array or an equivalent container storing the + * Basically, the $_SERVER array or an equivalent container storing the * data that will be introspected. * * @param array|ArrayAccess $server @@ -660,7 +666,7 @@ /** * Retrieve a server value - * + * * @param string $key * @return mixed */ @@ -700,9 +706,9 @@ /** * Set plugin loader - * + * * @param string $type Type of plugin loader; one of 'storage', (?) - * @param string|Zend_Loader_PluginLoader $loader + * @param string|Zend_Loader_PluginLoader $loader * @return Zend_Http_UserAgent */ public function setPluginLoader($type, $loader) @@ -749,7 +755,7 @@ /** * Get a plugin loader - * + * * @param string $type A valid plugin loader type; see {@link $_loaderTypes} * @return Zend_Loader_PluginLoader */ @@ -766,10 +772,10 @@ /** * Validate a plugin loader type * - * Verifies that it is in {@link $_loaderTypes}, and returns a normalized + * Verifies that it is in {@link $_loaderTypes}, and returns a normalized * version of the type. - * - * @param string $type + * + * @param string $type * @return string * @throws Zend_Http_UserAgent_Exception on invalid type */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/AbstractDevice.php --- a/web/lib/Zend/Http/UserAgent/AbstractDevice.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/AbstractDevice.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Http_UserAgent_AbstractDevice @@ -49,7 +49,7 @@ /** * Configuration - * + * * @var array */ protected $_config; @@ -63,22 +63,22 @@ /** * Server variable - * + * * @var array */ protected $_server; /** * Image types - * + * * @var array */ protected $_images = array( - 'jpeg', - 'gif', - 'png', - 'pjpeg', - 'x-png', + 'jpeg', + 'gif', + 'png', + 'pjpeg', + 'x-png', 'bmp', ); @@ -100,8 +100,8 @@ * Constructor * * @param null|string|array $userAgent If array, restores from serialized version - * @param array $server - * @param array $config + * @param array $server + * @param array $config * @return void */ public function __construct($userAgent = null, array $server = array(), array $config = array()) @@ -121,7 +121,7 @@ /** * Serialize object - * + * * @return string */ public function serialize() @@ -139,8 +139,8 @@ /** * Unserialize - * - * @param string $serialized + * + * @param string $serialized * @return void */ public function unserialize($serialized) @@ -151,8 +151,8 @@ /** * Restore object state from array - * - * @param array $spec + * + * @param array $spec * @return void */ protected function _restoreFromArray(array $spec) @@ -176,7 +176,7 @@ if (is_array($features)) { $this->_aFeatures = array_merge($this->_aFeatures, $features); } - + return $this->_aFeatures; } @@ -195,7 +195,7 @@ */ public function hasFeature($feature) { - return (!empty($this->_aFeatures[$feature])); + return (isset($this->_aFeatures[$feature]) && !is_null($this->_aFeatures[$feature])); } /** @@ -286,16 +286,16 @@ protected function _getDefaultFeatures() { $server = array(); - - // gets info from user agent chain + + // gets info from user agent chain $uaExtract = $this->extractFromUserAgent($this->getUserAgent()); - + if (is_array($uaExtract)) { foreach ($uaExtract as $key => $info) { $this->setFeature($key, $info, 'product_info'); } } - + if (isset($uaExtract['browser_name'])) { $this->_browser = $uaExtract['browser_name']; } @@ -305,7 +305,7 @@ if (isset($uaExtract['device_os'])) { $this->device_os = $uaExtract['device_os_name']; } - + /* browser & device info */ $this->setFeature('is_wireless_device', false, 'product_info'); $this->setFeature('is_mobile', false, 'product_info'); @@ -315,9 +315,9 @@ $this->setFeature('is_email', false, 'product_info'); $this->setFeature('is_text', false, 'product_info'); $this->setFeature('device_claims_web_support', false, 'product_info'); - + $this->setFeature('is_' . strtolower($this->getType()), true, 'product_info'); - + /* sets the browser name */ if (isset($this->list) && empty($this->_browser)) { $lowerUserAgent = strtolower($this->getUserAgent()); @@ -328,7 +328,7 @@ } } } - + /* sets the client IP */ if (isset($this->_server['remote_addr'])) { $this->setFeature('client_ip', $this->_server['remote_addr'], 'product_info'); @@ -337,7 +337,7 @@ } elseif (isset($this->_server['http_client_ip'])) { $this->setFeature('client_ip', $this->_server['http_client_ip'], 'product_info'); } - + /* sets the server infos */ if (isset($this->_server['server_software'])) { if (strpos($this->_server['server_software'], 'Apache') !== false || strpos($this->_server['server_software'], 'LiteSpeed') !== false) { @@ -347,11 +347,11 @@ } $server['server'] = 'apache'; } - + if (strpos($this->_server['server_software'], 'Microsoft-IIS') !== false) { $server['server'] = 'iis'; } - + if (strpos($this->_server['server_software'], 'Unix') !== false) { $server['os'] = 'unix'; if (isset($_ENV['MACHTYPE'])) { @@ -362,7 +362,7 @@ } elseif (strpos($this->_server['server_software'], 'Win') !== false) { $server['os'] = 'windows'; } - + if (preg_match('/Apache\/([0-9\.]*)/', $this->_server['server_software'], $arr)) { if ($arr[1]) { $server['version'] = $arr[1]; @@ -370,7 +370,7 @@ } } } - + $this->setFeature('php_version', phpversion(), 'server_info'); if (isset($server['server'])) { $this->setFeature('server_os', $server['server'], 'server_info'); @@ -401,7 +401,7 @@ public static function extractFromUserAgent($userAgent) { $userAgent = trim($userAgent); - + /** * @see http://www.texsoft.it/index.php?c=software&m=sw.php.useragent&l=it */ @@ -412,13 +412,13 @@ if (isset($match[7])) { $comment = explode(';', $match[7]); } - + // second part if exists $end = substr($userAgent, strlen($match[0])); if (!empty($end)) { $result['others']['full'] = $end; } - + $match2 = array(); if (isset($result['others'])) { preg_match_all('/(([^\/\s]*)(\/)?([^\/\s]*)?)(\s$(([^$]*)*)\))?/i', $result['others']['full'], $match2); @@ -451,18 +451,18 @@ for ($i = 0; $i < $max; $i ++) { if (!empty($match2[0][$i])) { $result['others']['detail'][] = array( - $match2[0][$i], - $match2[2][$i], + $match2[0][$i], + $match2[2][$i], $match2[4][$i], ); } } } - + /** Security level */ $security = array( - 'N' => 'no security', - 'U' => 'strong security', + 'N' => 'no security', + 'U' => 'strong security', 'I' => 'weak security', ); if (!empty($result['browser_token'])) { @@ -471,9 +471,9 @@ unset($result['browser_token']); } } - + $product = strtolower($result['browser_name']); - + // Mozilla : true && false $compatibleOrIe = false; if (isset($result['compatibility_flag']) && isset($result['comment'])) { @@ -492,26 +492,28 @@ $real[1][0] = "Internet Explorer"; $temp = explode(' ', trim($v)); $real[3][0] = $temp[1]; - + } if (strpos($v, 'Win') !== false) { $result['device_os_token'] = trim($v); } } } - + if (!empty($real[0])) { $result['browser_name'] = $real[1][0]; $result['browser_version'] = $real[3][0]; } else { - $result['browser_name'] = $result['browser_token']; + if(isset($result['browser_token'])) { + $result['browser_name'] = $result['browser_token']; + } $result['browser_version'] = '??'; } } elseif ($product == 'mozilla' && $result['browser_version'] < 5.0) { // handles the real Mozilla (or old Netscape if version < 5.0) $result['browser_name'] = 'Netscape'; } - + /** windows */ if ($result['browser_name'] == 'MSIE') { $result['browser_engine'] = 'MSIE'; @@ -519,21 +521,21 @@ } if (isset($result['device_os_token'])) { if (strpos($result['device_os_token'], 'Win') !== false) { - + $windows = array( - 'Windows NT 6.1' => 'Windows 7', - 'Windows NT 6.0' => 'Windows Vista', - 'Windows NT 5.2' => 'Windows Server 2003', - 'Windows NT 5.1' => 'Windows XP', - 'Windows NT 5.01' => 'Windows 2000 SP1', - 'Windows NT 5.0' => 'Windows 2000', - 'Windows NT 4.0' => 'Microsoft Windows NT 4.0', - 'WinNT' => 'Microsoft Windows NT 4.0', - 'Windows 98; Win 9x 4.90' => 'Windows Me', - 'Windows 98' => 'Windows 98', - 'Win98' => 'Windows 98', - 'Windows 95' => 'Windows 95', - 'Win95' => 'Windows 95', + 'Windows NT 6.1' => 'Windows 7', + 'Windows NT 6.0' => 'Windows Vista', + 'Windows NT 5.2' => 'Windows Server 2003', + 'Windows NT 5.1' => 'Windows XP', + 'Windows NT 5.01' => 'Windows 2000 SP1', + 'Windows NT 5.0' => 'Windows 2000', + 'Windows NT 4.0' => 'Microsoft Windows NT 4.0', + 'WinNT' => 'Microsoft Windows NT 4.0', + 'Windows 98; Win 9x 4.90' => 'Windows Me', + 'Windows 98' => 'Windows 98', + 'Win98' => 'Windows 98', + 'Windows 95' => 'Windows 95', + 'Win95' => 'Windows 95', 'Windows CE' => 'Windows CE', ); if (isset($windows[$result['device_os_token']])) { @@ -543,19 +545,25 @@ } } } - - // iphone + + // iphone $apple_device = array( - 'iPhone', - 'iPod', + 'iPhone', + 'iPod', 'iPad', ); if (isset($result['compatibility_flag'])) { if (in_array($result['compatibility_flag'], $apple_device)) { $result['device'] = strtolower($result['compatibility_flag']); $result['device_os_token'] = 'iPhone OS'; - $result['browser_language'] = trim($comment[3]); - $result['browser_version'] = $result['others']['detail'][1][2]; + if (isset($comment[3])) { + $result['browser_language'] = trim($comment[3]); + } + if (isset($result['others']['detail'][1])) { + $result['browser_version'] = $result['others']['detail'][1][2]; + } elseif (isset($result['others']['detail']) && count($result['others']['detail'])) { + $result['browser_version'] = $result['others']['detail'][0][2]; + } if (!empty($result['others']['detail'][2])) { $result['firmware'] = $result['others']['detail'][2][2]; } @@ -565,12 +573,12 @@ } } } - + // Safari if (isset($result['others'])) { if ($result['others']['detail'][0][1] == 'AppleWebKit') { $result['browser_engine'] = 'AppleWebKit'; - if ($result['others']['detail'][1][1] == 'Version') { + if (isset($result['others']['detail'][1]) && $result['others']['detail'][1][1] == 'Version') { $result['browser_version'] = $result['others']['detail'][1][2]; } else { $result['browser_version'] = $result['others']['detail'][count($result['others']['detail']) - 1][2]; @@ -578,16 +586,21 @@ if (isset($comment[3])) { $result['browser_language'] = trim($comment[3]); } - + $last = $result['others']['detail'][count($result['others']['detail']) - 1][1]; - + if (empty($result['others']['detail'][2][1]) || $result['others']['detail'][2][1] == 'Safari') { - $result['browser_name'] = ($result['others']['detail'][1][1] && $result['others']['detail'][1][1] != 'Version' ? $result['others']['detail'][1][1] : 'Safari'); - $result['browser_version'] = ($result['others']['detail'][1][2] ? $result['others']['detail'][1][2] : $result['others']['detail'][0][2]); + if (isset($result['others']['detail'][1])) { + $result['browser_name'] = ($result['others']['detail'][1][1] && $result['others']['detail'][1][1] != 'Version' ? $result['others']['detail'][1][1] : 'Safari'); + $result['browser_version'] = ($result['others']['detail'][1][2] ? $result['others']['detail'][1][2] : $result['others']['detail'][0][2]); + } else { + $result['browser_name'] = ($result['others']['detail'][0][1] && $result['others']['detail'][0][1] != 'Version' ? $result['others']['detail'][0][1] : 'Safari'); + $result['browser_version'] = $result['others']['detail'][0][2]; + } } else { $result['browser_name'] = $result['others']['detail'][2][1]; $result['browser_version'] = $result['others']['detail'][2][2]; - + // mobile version if ($result['browser_name'] == 'Mobile') { $result['browser_name'] = 'Safari ' . $result['browser_name']; @@ -596,18 +609,18 @@ } } } - + // For Safari < 2.2, AppleWebKit version gives the Safari version if (strpos($result['browser_version'], '.') > 2 || (int) $result['browser_version'] > 20) { $temp = explode('.', $result['browser_version']); $build = (int) $temp[0]; $awkVersion = array( - 48 => '0.8', - 73 => '0.9', - 85 => '1.0', - 103 => '1.1', - 124 => '1.2', - 300 => '1.3', + 48 => '0.8', + 73 => '0.9', + 85 => '1.0', + 103 => '1.1', + 124 => '1.2', + 300 => '1.3', 400 => '2.0', ); foreach ($awkVersion as $k => $v) { @@ -617,28 +630,28 @@ } } } - + // Gecko (Firefox or compatible) if ($result['others']['detail'][0][1] == 'Gecko') { $searchRV = true; if (!empty($result['others']['detail'][1][1]) && !empty($result['others']['detail'][count($result['others']['detail']) - 1][2]) || strpos(strtolower($result['others']['full']), 'opera') !== false) { $searchRV = false; $result['browser_engine'] = $result['others']['detail'][0][1]; - - // the name of the application is at the end indepenently + + // the name of the application is at the end indepenently // of quantity of information in $result['others']['detail'] $last = count($result['others']['detail']) - 1; - - // exception : if the version of the last information is + + // exception : if the version of the last information is // empty we take the previous one if (empty($result['others']['detail'][$last][2])) { $last --; } - - // exception : if the last one is 'Red Hat' or 'Debian' => + + // exception : if the last one is 'Red Hat' or 'Debian' => // use rv: to find browser_version */ if (in_array($result['others']['detail'][$last][1], array( - 'Debian', + 'Debian', 'Hat', ))) { $searchRV = true; @@ -648,8 +661,10 @@ if (isset($comment[4])) { $result['browser_build'] = trim($comment[4]); } - $result['browser_language'] = trim($comment[3]); - + if (isset($comment[3])) { + $result['browser_language'] = trim($comment[3]); + } + // Netscape if ($result['browser_name'] == 'Navigator' || $result['browser_name'] == 'Netscape6') { $result['browser_name'] = 'Netscape'; @@ -667,14 +682,14 @@ } } } - + // Netscape if ($result['others']['detail'][0][1] == 'Netscape') { $result['browser_name'] = 'Netscape'; $result['browser_version'] = $result['others']['detail'][0][2]; } - - // Opera + + // Opera // Opera: engine Presto if ($result['others']['detail'][0][1] == 'Presto') { $result['browser_engine'] = 'Presto'; @@ -682,40 +697,46 @@ $result['browser_version'] = $result['others']['detail'][1][2]; } } - - // UA ends with 'Opera X.XX' + + // UA ends with 'Opera X.XX' or 'Opera/X.XX' if ($result['others']['detail'][0][1] == 'Opera') { $result['browser_name'] = $result['others']['detail'][0][1]; - $result['browser_version'] = $result['others']['detail'][1][1]; + // Opera X.XX + if (isset($result['others']['detail'][1][1])) { + $result['browser_version'] = $result['others']['detail'][1][1]; + // Opera/X.XX + } elseif (isset($result['others']['detail'][0][2])) { + $result['browser_version'] = $result['others']['detail'][0][2]; + } } - + // Opera Mini if (isset($result["browser_token"])) { if (strpos($result["browser_token"], 'Opera Mini') !== false) { $result['browser_name'] = 'Opera Mini'; } } - + // Symbian if ($result['others']['detail'][0][1] == 'SymbianOS') { $result['device_os_token'] = 'SymbianOS'; } } - + // UA ends with 'Opera X.XX' if (isset($result['browser_name']) && isset($result['browser_engine'])) { if ($result['browser_name'] == 'Opera' && $result['browser_engine'] == 'Gecko' && empty($result['browser_version'])) { $result['browser_version'] = $result['others']['detail'][count($result['others']['detail']) - 1][1]; } } - + // cleanup if (isset($result['browser_version']) && isset($result['browser_build'])) { if ($result['browser_version'] == $result['browser_build']) { unset($result['browser_build']); } } - + // compatibility $compatibility['AppleWebKit'] = 'Safari'; $compatibility['Gecko'] = 'Firefox'; @@ -726,7 +747,7 @@ $result['browser_compatibility'] = $compatibility[$result['browser_engine']]; } } - + ksort($result); return $result; } @@ -760,13 +781,13 @@ require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "path" config parameter defined'); } - + if (false === include_once ($path)) { require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter path that does not exist'); } } - + return call_user_func(array($className, 'getFromRequest'), $this->_server, $this->_config); } @@ -953,9 +974,9 @@ /** * Match a user agent string against a list of signatures - * - * @param string $userAgent - * @param array $signatures + * + * @param string $userAgent + * @param array $signatures * @return bool */ protected static function _matchAgentAgainstSignatures($userAgent, $signatures) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Bot.php --- a/web/lib/Zend/Http/UserAgent/Bot.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Bot.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ require_once 'Zend/Http/UserAgent/AbstractDevice.php'; @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -40,67 +40,68 @@ */ protected static $_uaSignatures = array( // The most common ones. - 'googlebot', - 'msnbot', - 'slurp', + 'googlebot', + 'msnbot', + 'slurp', 'yahoo', // The rest, alphabetically. - 'alexa', - 'appie', - 'archiver', - 'ask jeeves', - 'baiduspider', - 'bot', - 'crawl', - 'crawler', - 'curl', - 'eventbox', - 'facebookexternal', - 'fast', - 'feedfetcher-google', - 'firefly', - 'froogle', - 'gigabot', - 'girafabot', - 'google', - 'infoseek', - 'inktomi', - 'java', + 'alexa', + 'appie', + 'archiver', + 'ask jeeves', + 'baiduspider', + 'bot', + 'crawl', + 'crawler', + 'curl', + 'eventbox', + 'facebookexternal', + 'fast', + 'feedfetcher-google', + 'firefly', + 'froogle', + 'gigabot', + 'girafabot', + 'google', + 'htdig', + 'infoseek', + 'inktomi', + 'java', 'larbin', - 'looksmart', - 'mechanize', - 'mediapartners-google', - 'monitor', - 'nambu', - 'nationaldirectory', - 'novarra', - 'pear', - 'perl', - 'python', - 'rabaz', - 'radian', - 'rankivabot', - 'scooter', - 'sogou web spider', - 'spade', - 'sphere', - 'spider', - 'technoratisnoop', - 'tecnoseek', - 'teoma', - 'toolbar', - 'transcoder', - 'twitt', - 'url_spider_sql', - 'webalta crawler', - 'webbug', - 'webfindbot', - 'wordpress', - 'www.galaxy.com', - 'yahoo! searchmonkey', - 'yahoo! slurp', - 'yandex', + 'looksmart', + 'mechanize', + 'mediapartners-google', + 'monitor', + 'nambu', + 'nationaldirectory', + 'novarra', + 'pear', + 'perl', + 'python', + 'rabaz', + 'radian', + 'rankivabot', + 'scooter', + 'sogou web spider', + 'spade', + 'sphere', + 'spider', + 'technoratisnoop', + 'tecnoseek', + 'teoma', + 'toolbar', + 'transcoder', + 'twitt', + 'url_spider_sql', + 'webalta crawler', + 'webbug', + 'webfindbot', + 'wordpress', + 'www.galaxy.com', + 'yahoo! searchmonkey', + 'yahoo! slurp', + 'yandex', 'zyborg', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Checker.php --- a/web/lib/Zend/Http/UserAgent/Checker.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Checker.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ require_once 'Zend/Http/UserAgent/Desktop.php'; @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -40,15 +40,15 @@ */ protected static $_uaSignatures = array( 'abilogic', - 'checklink', - 'checker', - 'linksmanager', - 'mojoo', - 'notifixious', - 'ploetz', - 'zeller', - 'sitebar', - 'xenu', + 'checklink', + 'checker', + 'linksmanager', + 'mojoo', + 'notifixious', + 'ploetz', + 'zeller', + 'sitebar', + 'xenu', 'sleuth', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Console.php --- a/web/lib/Zend/Http/UserAgent/Console.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Console.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Console extends Zend_Http_UserAgent_Desktop @@ -38,8 +38,8 @@ * @var array */ protected static $_uaSignatures = array( - 'playstation', - 'wii', + 'playstation', + 'wii', 'libnup', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Desktop.php --- a/web/lib/Zend/Http/UserAgent/Desktop.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Desktop.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Browser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Desktop extends Zend_Http_UserAgent_AbstractDevice diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Device.php --- a/web/lib/Zend/Http/UserAgent/Device.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Device.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_UserAgent_Device extends Serializable @@ -33,13 +33,13 @@ /** * Constructor * - * Allows injecting user agent, server array, and/or config array. If an + * Allows injecting user agent, server array, and/or config array. If an * array is provided for the first argument, the assumption should be that * the device object is being seeded with cached values from serialization. - * - * @param null|string|array $userAgent - * @param array $server - * @param array $config + * + * @param null|string|array $userAgent + * @param array $server + * @param array $config * @return void */ public function __construct($userAgent = null, array $server = array(), array $config = array()); @@ -48,145 +48,145 @@ * Attempt to match the user agent * * Return either an array of browser signature strings, or a boolean. - * - * @param string $userAgent - * @param array $server + * + * @param string $userAgent + * @param array $server * @return bool|array */ public static function match($userAgent, $server); /** * Get all browser/device features - * + * * @return array */ public function getAllFeatures(); /** * Get all of the browser/device's features' groups - * + * * @return void */ public function getAllGroups(); /** * Whether or not the device has a given feature - * - * @param string $feature + * + * @param string $feature * @return bool */ public function hasFeature($feature); /** * Get the value of a specific device feature - * - * @param string $feature + * + * @param string $feature * @return mixed */ public function getFeature($feature); /** * Get the browser type - * + * * @return string */ public function getBrowser(); /** * Retrurn the browser version - * + * * @return string */ public function getBrowserVersion(); /** * Get an array of features associated with a group - * - * @param string $group + * + * @param string $group * @return array */ public function getGroup($group); /** * Retrieve image format support - * + * * @return array */ public function getImageFormatSupport(); /** * Get image types - * + * * @return array */ public function getImages(); /** * Get the maximum image height supported by this device - * + * * @return int */ public function getMaxImageHeight(); /** * Get the maximum image width supported by this device - * + * * @return int */ public function getMaxImageWidth(); /** * Get the physical screen height of this device - * + * * @return int */ public function getPhysicalScreenHeight(); /** * Get the physical screen width of this device - * + * * @return int */ public function getPhysicalScreenWidth(); /** * Get the preferred markup type - * + * * @return string */ public function getPreferredMarkup(); /** * Get the user agent string - * + * * @return string */ public function getUserAgent(); /** * Get supported X/HTML version - * + * * @return int */ public function getXhtmlSupportLevel(); /** * Does the device support Flash? - * + * * @return bool */ public function hasFlashSupport(); /** * Does the device support PDF? - * + * * @return bool */ public function hasPdfSupport(); /** * Does the device have a phone number associated with it? - * + * * @return bool */ public function hasPhoneNumber(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Email.php --- a/web/lib/Zend/Http/UserAgent/Email.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Email.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Email extends Zend_Http_UserAgent_Desktop diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Exception.php --- a/web/lib/Zend/Http/UserAgent/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Features/Adapter.php --- a/web/lib/Zend/Http/UserAgent/Features/Adapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Features/Adapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,17 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ /** - * The interface required by all Zend_Browser_Features Adapter classes to implement. + * The interface required by all Zend_Browser_Features Adapter classes to implement. * * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_UserAgent_Features_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Features/Adapter/Browscap.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Http/UserAgent/Features/Adapter/Browscap.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,90 @@ + $value) { + // For a few keys, we need to munge a bit for the device object + switch ($key) { + case 'browser': + $features['mobile_browser'] = $value; + break; + case 'version': + $features['mobile_browser_version'] = $value; + break; + case 'platform': + $features['device_os'] = $value; + break; + default: + $features[$key] = $value; + break; + } + } + return $features; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php --- a/web/lib/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,12 +26,12 @@ /** * Features adapter build with the Tera Wurfl Api - * See installation instruction here : http://deviceatlas.com/licences + * See installation instruction here : http://deviceatlas.com/licences * Download : http://deviceatlas.com/getAPI/php * * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Features_Adapter_DeviceAtlas implements Zend_Http_UserAgent_Features_Adapter @@ -50,9 +50,9 @@ throw new Zend_Http_UserAgent_Features_Exception('"DeviceAtlas" configuration is not defined'); } } - + $config = $config['deviceatlas']; - + if (!class_exists('Mobi_Mtld_DA_Api')) { if (empty($config['deviceatlas_lib_dir'])) { require_once 'Zend/Http/UserAgent/Features/Exception.php'; @@ -62,17 +62,17 @@ // Include the Device Atlas file from the specified lib_dir require_once ($config['deviceatlas_lib_dir'] . '/Mobi/Mtld/DA/Api.php'); } - + if (empty($config['deviceatlas_data'])) { require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_data" parameter is not defined'); } - + //load the device data-tree : e.g. 'json/DeviceAtlas.json $tree = Mobi_Mtld_DA_Api::getTreeFromFile($config['deviceatlas_data']); - + $properties = Mobi_Mtld_DA_Api::getProperties($tree, $request['http_user_agent']); - + return $properties; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php --- a/web/lib/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,12 +26,12 @@ /** * Features adapter build with the Tera Wurfl Api - * See installation instruction here : http://www.tera-wurfl.com/wiki/index.php/Installation + * See installation instruction here : http://www.tera-wurfl.com/wiki/index.php/Installation * Download : http://www.tera-wurfl.com/wiki/index.php/Downloads * * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Features_Adapter_TeraWurfl implements Zend_Http_UserAgent_Features_Adapter @@ -45,7 +45,7 @@ public static function getFromRequest($request, array $config) { if (!class_exists('TeraWurfl')) { - // If TeraWurfl class not found, see if we can load it from + // If TeraWurfl class not found, see if we can load it from // configuration // if (!isset($config['terawurfl'])) { @@ -53,7 +53,7 @@ require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('"TeraWurfl" configuration is not defined'); } - + $config = $config['terawurfl']; if (empty($config['terawurfl_lib_dir'])) { @@ -65,25 +65,25 @@ // Include the Tera-WURFL file require_once ($config['terawurfl_lib_dir'] . '/TeraWurfl.php'); } - - + + // instantiate the Tera-WURFL object $wurflObj = new TeraWurfl(); - + // Get the capabilities of the current client. $matched = $wurflObj->getDeviceCapabilitiesFromRequest(array_change_key_case($request, CASE_UPPER)); - + return self::getAllCapabilities($wurflObj); } /*** * Builds an array with all capabilities - * + * * @param TeraWurfl $wurflObj TeraWurfl object */ public static function getAllCapabilities(TeraWurfl $wurflObj) { - + foreach ($wurflObj->capabilities as $group) { if (!is_array($group)) { continue; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Features/Adapter/WurflApi.php --- a/web/lib/Zend/Http/UserAgent/Features/Adapter/WurflApi.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -wurflFile($c['wurfl']['main-file']) - ->wurflPatch($c['wurfl']['patches']) - ->persistence($c['persistence']['provider'], $c['persistence']['dir']); - } - - $wurflManagerFactory = new WURFL_WURFLManagerFactory($wurflConfig); - $wurflManager = $wurflManagerFactory->create(); - break; - default: - require_once 'Zend/Http/UserAgent/Features/Exception.php'; - throw new Zend_Http_UserAgent_Features_Exception(sprintf( - 'Unknown API version "%s"', - $config['wurfl_api_version'] - )); - } - - $device = $wurflManager->getDeviceForHttpRequest(array_change_key_case($request, CASE_UPPER)); - $features = $device->getAllCapabilities(); - return $features; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Features/Exception.php --- a/web/lib/Zend/Http/UserAgent/Features/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Features/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Features_Exception extends Zend_Http_UserAgent_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Feed.php --- a/web/lib/Zend/Http/UserAgent/Feed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Feed.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Feed extends Zend_Http_UserAgent_AbstractDevice @@ -38,9 +38,9 @@ * @var array */ protected static $_uaSignatures = array( - 'bloglines', - 'everyfeed', - 'feedfetcher', + 'bloglines', + 'everyfeed', + 'feedfetcher', 'gregarius', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Mobile.php --- a/web/lib/Zend/Http/UserAgent/Mobile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Mobile.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,534 +1,536 @@ -setFeature('is_wireless_device', false, 'product_info'); - - parent::_defineFeatures(); - - if (isset($this->_aFeatures["mobile_browser"])) { - $this->setFeature("browser_name", $this->_aFeatures["mobile_browser"]); - $this->_browser = $this->_aFeatures["mobile_browser"]; - } - if (isset($this->_aFeatures["mobile_browser_version"])) { - $this->setFeature("browser_version", $this->_aFeatures["mobile_browser_version"]); - $this->_browserVersion = $this->_aFeatures["mobile_browser_version"]; - } - - // markup - if ($this->getFeature('device_os') == 'iPhone OS' - || $this->getFeature('device_os_token') == 'iPhone OS' - ) { - $this->setFeature('markup', 'iphone'); - } else { - $this->setFeature('markup', $this->getMarkupLanguage($this->getFeature('preferred_markup'))); - } - - // image format - $this->_images = array(); - - if ($this->getFeature('png')) { - $this->_images[] = 'png'; - } - if ($this->getFeature('jpg')) { - $this->_images[] = 'jpg'; - } - if ($this->getFeature('gif')) { - $this->_images[] = 'gif'; - } - if ($this->getFeature('wbmp')) { - $this->_images[] = 'wbmp'; - } - - return $this->_aFeatures; - } - - /** - * Determine markup language expected - * - * @access public - * @return __TYPE__ - */ - public function getMarkupLanguage($preferredMarkup = null) - { - $return = ''; - switch ($preferredMarkup) { - case 'wml_1_1': - case 'wml_1_2': - case 'wml_1_3': - $return = 'wml'; //text/vnd.wap.wml encoding="ISO-8859-15" - case 'html_wi_imode_compact_generic': - case 'html_wi_imode_html_1': - case 'html_wi_imode_html_2': - case 'html_wi_imode_html_3': - case 'html_wi_imode_html_4': - case 'html_wi_imode_html_5': - $return = 'chtml'; //text/html - case 'html_wi_oma_xhtmlmp_1_0': //application/vnd.wap.xhtml+xml - case 'html_wi_w3_xhtmlbasic': //application/xhtml+xml DTD XHTML Basic 1.0 - $return = 'xhtml'; - case 'html_web_3_2': //text/html DTD Html 3.2 Final - case 'html_web_4_0': //text/html DTD Html 4.01 Transitional - $return = ''; - } - return $return; - } - - /** - * Determine image format support - * - * @return array - */ - public function getImageFormatSupport() - { - return $this->_images; - } - - /** - * Determine maximum image height supported - * - * @return int - */ - public function getMaxImageHeight() - { - return $this->getFeature('max_image_height'); - } - - /** - * Determine maximum image width supported - * - * @return int - */ - public function getMaxImageWidth() - { - return $this->getFeature('max_image_width'); - } - - /** - * Determine physical screen height - * - * @return int - */ - public function getPhysicalScreenHeight() - { - return $this->getFeature('physical_screen_height'); - } - - /** - * Determine physical screen width - * - * @return int - */ - public function getPhysicalScreenWidth() - { - return $this->getFeature('physical_screen_width'); - } - - /** - * Determine preferred markup - * - * @return string - */ - public function getPreferredMarkup() - { - return $this->getFeature("markup"); - } - - /** - * Determine X/HTML support level - * - * @return int - */ - public function getXhtmlSupportLevel() - { - return $this->getFeature('xhtml_support_level'); - } - - /** - * Does the device support Flash? - * - * @return bool - */ - public function hasFlashSupport() - { - return $this->getFeature('fl_browser'); - } - - /** - * Does the device support PDF? - * - * @return bool - */ - public function hasPdfSupport() - { - return $this->getFeature('pdf_support'); - } - - /** - * Does the device have an associated phone number? - * - * @return bool - */ - public function hasPhoneNumber() - { - return $this->getFeature('can_assign_phone_number'); - } - - /** - * Does the device support HTTPS? - * - * @return bool - */ - public function httpsSupport() - { - return ($this->getFeature('https_support') == 'supported'); - } -} +setFeature('is_wireless_device', false, 'product_info'); + + parent::_defineFeatures(); + + if (isset($this->_aFeatures["mobile_browser"])) { + $this->setFeature("browser_name", $this->_aFeatures["mobile_browser"]); + $this->_browser = $this->_aFeatures["mobile_browser"]; + } + if (isset($this->_aFeatures["mobile_browser_version"])) { + $this->setFeature("browser_version", $this->_aFeatures["mobile_browser_version"]); + $this->_browserVersion = $this->_aFeatures["mobile_browser_version"]; + } + + // markup + if ($this->getFeature('device_os') == 'iPhone OS' + || $this->getFeature('device_os_token') == 'iPhone OS' + ) { + $this->setFeature('markup', 'iphone'); + } else { + $this->setFeature('markup', $this->getMarkupLanguage($this->getFeature('preferred_markup'))); + } + + // image format + $this->_images = array(); + + if ($this->getFeature('png')) { + $this->_images[] = 'png'; + } + if ($this->getFeature('jpg')) { + $this->_images[] = 'jpg'; + } + if ($this->getFeature('gif')) { + $this->_images[] = 'gif'; + } + if ($this->getFeature('wbmp')) { + $this->_images[] = 'wbmp'; + } + + return $this->_aFeatures; + } + + /** + * Determine markup language expected + * + * @access public + * @return __TYPE__ + */ + public function getMarkupLanguage($preferredMarkup = null) + { + $return = ''; + switch ($preferredMarkup) { + case 'wml_1_1': + case 'wml_1_2': + case 'wml_1_3': + $return = 'wml'; //text/vnd.wap.wml encoding="ISO-8859-15" + case 'html_wi_imode_compact_generic': + case 'html_wi_imode_html_1': + case 'html_wi_imode_html_2': + case 'html_wi_imode_html_3': + case 'html_wi_imode_html_4': + case 'html_wi_imode_html_5': + $return = 'chtml'; //text/html + case 'html_wi_oma_xhtmlmp_1_0': //application/vnd.wap.xhtml+xml + case 'html_wi_w3_xhtmlbasic': //application/xhtml+xml DTD XHTML Basic 1.0 + $return = 'xhtml'; + case 'html_web_3_2': //text/html DTD Html 3.2 Final + case 'html_web_4_0': //text/html DTD Html 4.01 Transitional + $return = ''; + } + return $return; + } + + /** + * Determine image format support + * + * @return array + */ + public function getImageFormatSupport() + { + return $this->_images; + } + + /** + * Determine maximum image height supported + * + * @return int + */ + public function getMaxImageHeight() + { + return $this->getFeature('max_image_height'); + } + + /** + * Determine maximum image width supported + * + * @return int + */ + public function getMaxImageWidth() + { + return $this->getFeature('max_image_width'); + } + + /** + * Determine physical screen height + * + * @return int + */ + public function getPhysicalScreenHeight() + { + return $this->getFeature('physical_screen_height'); + } + + /** + * Determine physical screen width + * + * @return int + */ + public function getPhysicalScreenWidth() + { + return $this->getFeature('physical_screen_width'); + } + + /** + * Determine preferred markup + * + * @return string + */ + public function getPreferredMarkup() + { + return $this->getFeature("markup"); + } + + /** + * Determine X/HTML support level + * + * @return int + */ + public function getXhtmlSupportLevel() + { + return $this->getFeature('xhtml_support_level'); + } + + /** + * Does the device support Flash? + * + * @return bool + */ + public function hasFlashSupport() + { + return $this->getFeature('fl_browser'); + } + + /** + * Does the device support PDF? + * + * @return bool + */ + public function hasPdfSupport() + { + return $this->getFeature('pdf_support'); + } + + /** + * Does the device have an associated phone number? + * + * @return bool + */ + public function hasPhoneNumber() + { + return $this->getFeature('can_assign_phone_number'); + } + + /** + * Does the device support HTTPS? + * + * @return bool + */ + public function httpsSupport() + { + return ($this->getFeature('https_support') == 'supported'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Offline.php --- a/web/lib/Zend/Http/UserAgent/Offline.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Offline.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Offline extends Zend_Http_UserAgent_Desktop @@ -38,11 +38,11 @@ * @var array */ protected static $_uaSignatures = array( - 'wget', - 'webzip', - 'webcopier', - 'downloader', - 'superbot', + 'wget', + 'webzip', + 'webcopier', + 'downloader', + 'superbot', 'offline', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Probe.php --- a/web/lib/Zend/Http/UserAgent/Probe.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Probe.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Probe extends Zend_Http_UserAgent_AbstractDevice @@ -38,10 +38,10 @@ * @var array */ protected static $_uaSignatures = array( - 'witbe', + 'witbe', 'netvigie', ); - + /** * Comparison of the UserAgent chain and User Agent signatures * @@ -54,7 +54,7 @@ return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures); } - + /** * Gives the current browser type * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Spam.php --- a/web/lib/Zend/Http/UserAgent/Spam.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Spam.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Spam extends Zend_Http_UserAgent_AbstractDevice diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Storage.php --- a/web/lib/Zend/Http/UserAgent/Storage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Storage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_UserAgent_Storage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Storage/Exception.php --- a/web/lib/Zend/Http/UserAgent/Storage/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Storage/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Storage_Exception extends Zend_Http_UserAgent_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Storage/NonPersistent.php --- a/web/lib/Zend/Http/UserAgent/Storage/NonPersistent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Storage/NonPersistent.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: NonPersistent.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -36,10 +36,10 @@ * * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Http_UserAgent_Storage_NonPersistent +class Zend_Http_UserAgent_Storage_NonPersistent implements Zend_Http_UserAgent_Storage { /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Storage/Session.php --- a/web/lib/Zend/Http/UserAgent/Storage/Session.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Storage/Session.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,42 +32,42 @@ /** * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Http_UserAgent_Storage_Session implements Zend_Http_UserAgent_Storage +class Zend_Http_UserAgent_Storage_Session implements Zend_Http_UserAgent_Storage { /** * Default session namespace */ const NAMESPACE_DEFAULT = 'Zend_Http_UserAgent'; - + /** * Default session object member name */ const MEMBER_DEFAULT = 'storage'; - + /** * Object to proxy $_SESSION storage * * @var Zend_Session_Namespace */ protected $_session; - + /** * Session namespace * * @var mixed */ protected $_namespace; - + /** * Session object member * * @var mixed */ protected $_member; - + /** * Sets session storage options and initializes session namespace object * @@ -79,7 +79,7 @@ * @return void * @throws Zend_Http_UserAgent_Storage_Exception on invalid $options argument */ - public function __construct($options = null) + public function __construct($options = null) { if (is_object($options) && method_exists($options, 'toArray')) { $options = $options->toArray(); @@ -95,71 +95,71 @@ } // add '.' to prevent the message ''Session namespace must not start with a number' - $this->_namespace = '.' - . (isset($options['browser_type']) - ? $options['browser_type'] + $this->_namespace = '.' + . (isset($options['browser_type']) + ? $options['browser_type'] : self::NAMESPACE_DEFAULT); $this->_member = isset($options['member']) ? $options['member'] : self::MEMBER_DEFAULT; $this->_session = new Zend_Session_Namespace($this->_namespace); } - + /** * Returns the session namespace name * * @return string */ - public function getNamespace() + public function getNamespace() { return $this->_namespace; } - + /** * Returns the name of the session object member * * @return string */ - public function getMember() + public function getMember() { return $this->_member; } - + /** * Defined by Zend_Http_UserAgent_Storage * * @return boolean */ - public function isEmpty() + public function isEmpty() { return empty($this->_session->{$this->_member}); } - + /** * Defined by Zend_Http_UserAgent_Storage * * @return mixed */ - public function read() + public function read() { return $this->_session->{$this->_member}; } - + /** * Defined by Zend_Http_UserAgent_Storage * * @param mixed $contents * @return void */ - public function write($content) + public function write($content) { $this->_session->{$this->_member} = $content; } - + /** * Defined by Zend_Http_UserAgent_Storage * * @return void */ - public function clear() + public function clear() { unset($this->_session->{$this->_member}); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Text.php --- a/web/lib/Zend/Http/UserAgent/Text.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Text.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Text extends Zend_Http_UserAgent_AbstractDevice @@ -38,8 +38,8 @@ * @var array */ protected static $_uaSignatures = array( - 'lynx', - 'retawq', + 'lynx', + 'retawq', 'w3m', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Http/UserAgent/Validator.php --- a/web/lib/Zend/Http/UserAgent/Validator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Http/UserAgent/Validator.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Validator extends Zend_Http_UserAgent_Desktop @@ -38,14 +38,14 @@ * @var array */ protected static $_uaSignatures = array( - 'htmlvalidator', - 'csscheck', - 'cynthia', - 'htmlparser', - 'validator', - 'jfouffa', - 'jigsaw', - 'w3c_validator', + 'htmlvalidator', + 'csscheck', + 'cynthia', + 'htmlparser', + 'validator', + 'jfouffa', + 'jigsaw', + 'w3c_validator', 'wdg_validator', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard.php --- a/web/lib/Zend/InfoCard.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InfoCard.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InfoCard.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -52,7 +52,7 @@ /** * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Adapter/Default.php --- a/web/lib/Zend/InfoCard/Adapter/Default.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Adapter/Default.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Adapter_Default implements Zend_InfoCard_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Adapter/Exception.php --- a/web/lib/Zend/InfoCard/Adapter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Adapter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Adapter_Exception extends Zend_InfoCard_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Adapter/Interface.php --- a/web/lib/Zend/InfoCard/Adapter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Adapter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher.php --- a/web/lib/Zend/InfoCard/Cipher.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cipher.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cipher.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Exception.php --- a/web/lib/Zend/InfoCard/Cipher/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Exception extends Zend_InfoCard_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php --- a/web/lib/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Cipher_Pki_Adapter_Abstract implements Zend_InfoCard_Cipher_Pki_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php --- a/web/lib/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rsa.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rsa.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Pki_Adapter_Rsa diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Pki/Interface.php --- a/web/lib/Zend/InfoCard/Cipher/Pki/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Pki/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Pki_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php --- a/web/lib/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Pki_Rsa_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php --- a/web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Cipher_Symmetric_Adapter_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php --- a/web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Aes128cbc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Aes128cbc.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Symmetric_Adapter_Aes128cbc diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php --- a/web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Aes256cbc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Aes256cbc.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Symmetric_Adapter_Aes256cbc diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php --- a/web/lib/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Symmetric_Aes128cbc_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php --- a/web/lib/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Symmetric_Aes256cbc_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Cipher/Symmetric/Interface.php --- a/web/lib/Zend/InfoCard/Cipher/Symmetric/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Cipher/Symmetric/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Symmetric_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Claims.php --- a/web/lib/Zend/InfoCard/Claims.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Claims.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Claims.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Claims.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Claims diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Exception.php --- a/web/lib/Zend/InfoCard/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ if (class_exists("Zend_Exception")) { @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Exception extends Zend_InfoCard_Exception_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Assertion.php --- a/web/lib/Zend/InfoCard/Xml/Assertion.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Assertion.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Assertion.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Assertion.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_InfoCard_Xml_Assertion diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Assertion/Interface.php --- a/web/lib/Zend/InfoCard/Xml/Assertion/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Assertion/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_Assertion_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Assertion/Saml.php --- a/web/lib/Zend/InfoCard/Xml/Assertion/Saml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Assertion/Saml.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Saml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Saml.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Assertion_Saml diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Element.php --- a/web/lib/Zend/InfoCard/Xml/Element.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Element.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Element.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Xml_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Element/Interface.php --- a/web/lib/Zend/InfoCard/Xml/Element/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Element/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_Element_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/EncryptedData.php --- a/web/lib/Zend/InfoCard/Xml/EncryptedData.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/EncryptedData.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EncryptedData.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EncryptedData.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_InfoCard_Xml_EncryptedData diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/EncryptedData/Abstract.php --- a/web/lib/Zend/InfoCard/Xml/EncryptedData/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/EncryptedData/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Xml_EncryptedData_Abstract extends Zend_InfoCard_Xml_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php --- a/web/lib/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlEnc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XmlEnc.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_EncryptedData_XmlEnc extends Zend_InfoCard_Xml_EncryptedData_Abstract @@ -52,7 +52,7 @@ if(!($cipherdata instanceof Zend_InfoCard_Xml_Element)) { throw new Zend_InfoCard_Xml_Exception("Unable to find the enc:CipherData block"); } - + $cipherdata->registerXPathNamespace('enc', 'http://www.w3.org/2001/04/xmlenc#'); list(,$ciphervalue) = $cipherdata->xpath("//enc:CipherValue"); if(!($ciphervalue instanceof Zend_InfoCard_Xml_Element)) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/EncryptedKey.php --- a/web/lib/Zend/InfoCard/Xml/EncryptedKey.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/EncryptedKey.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EncryptedKey.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EncryptedKey.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_EncryptedKey diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Exception.php --- a/web/lib/Zend/InfoCard/Xml/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Exception extends Zend_InfoCard_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/KeyInfo.php --- a/web/lib/Zend/InfoCard/Xml/KeyInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/KeyInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: KeyInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: KeyInfo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_KeyInfo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/KeyInfo/Abstract.php --- a/web/lib/Zend/InfoCard/Xml/KeyInfo/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/KeyInfo/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Xml_KeyInfo_Abstract extends Zend_InfoCard_Xml_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/KeyInfo/Default.php --- a/web/lib/Zend/InfoCard/Xml/KeyInfo/Default.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/KeyInfo/Default.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_KeyInfo_Default extends Zend_InfoCard_Xml_KeyInfo_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/KeyInfo/Interface.php --- a/web/lib/Zend/InfoCard/Xml/KeyInfo/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/KeyInfo/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_KeyInfo_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php --- a/web/lib/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlDSig.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XmlDSig.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_KeyInfo_XmlDSig diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Security.php --- a/web/lib/Zend/InfoCard/Xml/Security.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Security.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Security.php 23280 2010-10-31 10:28:58Z ramon $ + * @version $Id: Security.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Security/Exception.php --- a/web/lib/Zend/InfoCard/Xml/Security/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Security/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Exception extends Zend_InfoCard_Xml_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Security/Transform.php --- a/web/lib/Zend/InfoCard/Xml/Security/Transform.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Security/Transform.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Transform.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Transform.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php --- a/web/lib/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EnvelopedSignature.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EnvelopedSignature.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform_EnvelopedSignature diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Security/Transform/Exception.php --- a/web/lib/Zend/InfoCard/Xml/Security/Transform/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Security/Transform/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform_Exception extends Zend_InfoCard_Xml_Security_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Security/Transform/Interface.php --- a/web/lib/Zend/InfoCard/Xml/Security/Transform/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Security/Transform/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_Security_Transform_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php --- a/web/lib/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlExcC14N.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XmlExcC14N.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform_XmlExcC14N diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/InfoCard/Xml/SecurityTokenReference.php --- a/web/lib/Zend/InfoCard/Xml/SecurityTokenReference.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/InfoCard/Xml/SecurityTokenReference.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SecurityTokenReference.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SecurityTokenReference.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_SecurityTokenReference extends Zend_InfoCard_Xml_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json.php --- a/web/lib/Zend/Json.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 20615 2010-01-25 19:54:12Z matthew $ + * @version $Id: Json.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Json * @uses Zend_Json_Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json @@ -125,8 +125,12 @@ */ public static function encode($valueToEncode, $cycleCheck = false, $options = array()) { - if (is_object($valueToEncode) && method_exists($valueToEncode, 'toJson')) { - return $valueToEncode->toJson(); + if (is_object($valueToEncode)) { + if (method_exists($valueToEncode, 'toJson')) { + return $valueToEncode->toJson(); + } elseif (method_exists($valueToEncode, 'toArray')) { + return self::encode($valueToEncode->toArray(), $cycleCheck, $options); + } } // Pre-encoding look for Zend_Json_Expr objects and replacing by tmp ids @@ -179,12 +183,15 @@ * NOTE: This method is used internally by the encode method. * * @see encode - * @param mixed $valueToCheck a string - object property to be encoded + * @param array|object|Zend_Json_Expr $value a string - object property to be encoded + * @param array $javascriptExpressions + * @param null $currentKey + * + * @internal param mixed $valueToCheck * @return void */ - protected static function _recursiveJsonExprFinder( - &$value, array &$javascriptExpressions, $currentKey = null - ) { + protected static function _recursiveJsonExprFinder(&$value, array &$javascriptExpressions, $currentKey = null) + { if ($value instanceof Zend_Json_Expr) { // TODO: Optimize with ascii keys, if performance is bad $magicKey = "____" . $currentKey . "_" . (count($javascriptExpressions)); @@ -208,6 +215,104 @@ } /** + * Return the value of an XML attribute text or the text between + * the XML tags + * + * In order to allow Zend_Json_Expr from xml, we check if the node + * matchs the pattern that try to detect if it is a new Zend_Json_Expr + * if it matches, we return a new Zend_Json_Expr instead of a text node + * + * @param SimpleXMLElement $simpleXmlElementObject + * @return Zend_Json_Expr|string + */ + protected static function _getXmlValue($simpleXmlElementObject) { + $pattern = '/^[\s]*new Zend_Json_Expr[\s]*$[\s]*[\"\']{1}(.*)[\"\']{1}[\s]*$[\s]*$/'; + $matchings = array(); + $match = preg_match ($pattern, $simpleXmlElementObject, $matchings); + if ($match) { + return new Zend_Json_Expr($matchings[1]); + } else { + return (trim(strval($simpleXmlElementObject))); + } + } + /** + * _processXml - Contains the logic for xml2json + * + * The logic in this function is a recursive one. + * + * The main caller of this function (i.e. fromXml) needs to provide + * only the first two parameters i.e. the SimpleXMLElement object and + * the flag for ignoring or not ignoring XML attributes. The third parameter + * will be used internally within this function during the recursive calls. + * + * This function converts the SimpleXMLElement object into a PHP array by + * calling a recursive (protected static) function in this class. Once all + * the XML elements are stored in the PHP array, it is returned to the caller. + * + * Throws a Zend_Json_Exception if the XML tree is deeper than the allowed limit. + * + * @param SimpleXMLElement $simpleXmlElementObject + * @param boolean $ignoreXmlAttributes + * @param integer $recursionDepth + * @return array + */ + protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttributes, $recursionDepth=0) + { + // Keep an eye on how deeply we are involved in recursion. + if ($recursionDepth > self::$maxRecursionDepthAllowed) { + // XML tree is too deep. Exit now by throwing an exception. + require_once 'Zend/Json/Exception.php'; + throw new Zend_Json_Exception( + "Function _processXml exceeded the allowed recursion depth of " . + self::$maxRecursionDepthAllowed); + } // End of if ($recursionDepth > self::$maxRecursionDepthAllowed) + + $children = $simpleXmlElementObject->children(); + $name = $simpleXmlElementObject->getName(); + $value = self::_getXmlValue($simpleXmlElementObject); + $attributes = (array) $simpleXmlElementObject->attributes(); + + if (count($children) == 0) { + if (!empty($attributes) && !$ignoreXmlAttributes) { + foreach ($attributes['@attributes'] as $k => $v) { + $attributes['@attributes'][$k]= self::_getXmlValue($v); + } + if (!empty($value)) { + $attributes['@text'] = $value; + } + return array($name => $attributes); + } else { + return array($name => $value); + } + } else { + $childArray= array(); + foreach ($children as $child) { + $childname = $child->getName(); + $element = self::_processXml($child,$ignoreXmlAttributes,$recursionDepth+1); + if (array_key_exists($childname, $childArray)) { + if (empty($subChild[$childname])) { + $childArray[$childname] = array($childArray[$childname]); + $subChild[$childname] = true; + } + $childArray[$childname][] = $element[$childname]; + } else { + $childArray[$childname] = $element[$childname]; + } + } + if (!empty($attributes) && !$ignoreXmlAttributes) { + foreach ($attributes['@attributes'] as $k => $v) { + $attributes['@attributes'][$k] = self::_getXmlValue($v); + } + $childArray['@attributes'] = $attributes['@attributes']; + } + if (!empty($value)) { + $childArray['@text'] = $value; + } + return array($name => $childArray); + } + } + + /** * fromXml - Converts XML to JSON * * Converts a XML formatted string into a JSON formatted string. @@ -233,7 +338,8 @@ * @return mixed - JSON formatted string on success * @throws Zend_Json_Exception */ - public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true) { + public static function fromXml($xmlStringContents, $ignoreXmlAttributes=true) + { // Load the XML formatted string into a Simple XML Element object. $simpleXmlElementObject = simplexml_load_string($xmlStringContents); @@ -252,120 +358,16 @@ // It is just that simple. $jsonStringOutput = self::encode($resultArray); return($jsonStringOutput); - } // End of function fromXml. + } + + /** - * _processXml - Contains the logic for xml2json - * - * The logic in this function is a recursive one. - * - * The main caller of this function (i.e. fromXml) needs to provide - * only the first two parameters i.e. the SimpleXMLElement object and - * the flag for ignoring or not ignoring XML attributes. The third parameter - * will be used internally within this function during the recursive calls. - * - * This function converts the SimpleXMLElement object into a PHP array by - * calling a recursive (protected static) function in this class. Once all - * the XML elements are stored in the PHP array, it is returned to the caller. - * - * Throws a Zend_Json_Exception if the XML tree is deeper than the allowed limit. + * Pretty-print JSON string * - * @static - * @access protected - * @param SimpleXMLElement $simpleXmlElementObject XML element to be converted - * @param boolean $ignoreXmlAttributes Include or exclude XML attributes in - * the xml2json conversion process. - * @param int $recursionDepth Current recursion depth of this function - * @return mixed - On success, a PHP associative array of traversed XML elements - * @throws Zend_Json_Exception - */ - protected static function _processXml ($simpleXmlElementObject, $ignoreXmlAttributes, $recursionDepth=0) { - // Keep an eye on how deeply we are involved in recursion. - if ($recursionDepth > self::$maxRecursionDepthAllowed) { - // XML tree is too deep. Exit now by throwing an exception. - require_once 'Zend/Json/Exception.php'; - throw new Zend_Json_Exception( - "Function _processXml exceeded the allowed recursion depth of " . - self::$maxRecursionDepthAllowed); - } // End of if ($recursionDepth > self::$maxRecursionDepthAllowed) - - if ($recursionDepth == 0) { - // Store the original SimpleXmlElementObject sent by the caller. - // We will need it at the very end when we return from here for good. - $callerProvidedSimpleXmlElementObject = $simpleXmlElementObject; - } // End of if ($recursionDepth == 0) - - if ($simpleXmlElementObject instanceof SimpleXMLElement) { - // Get a copy of the simpleXmlElementObject - $copyOfSimpleXmlElementObject = $simpleXmlElementObject; - // Get the object variables in the SimpleXmlElement object for us to iterate. - $simpleXmlElementObject = get_object_vars($simpleXmlElementObject); - } // End of if (get_class($simpleXmlElementObject) == "SimpleXMLElement") - - // It needs to be an array of object variables. - if (is_array($simpleXmlElementObject)) { - // Initialize a result array. - $resultArray = array(); - // Is the input array size 0? Then, we reached the rare CDATA text if any. - if (count($simpleXmlElementObject) <= 0) { - // Let us return the lonely CDATA. It could even be - // an empty element or just filled with whitespaces. - return (trim(strval($copyOfSimpleXmlElementObject))); - } // End of if (count($simpleXmlElementObject) <= 0) - - // Let us walk through the child elements now. - foreach($simpleXmlElementObject as $key=>$value) { - // Check if we need to ignore the XML attributes. - // If yes, you can skip processing the XML attributes. - // Otherwise, add the XML attributes to the result array. - if(($ignoreXmlAttributes == true) && (is_string($key)) && ($key == "@attributes")) { - continue; - } // End of if(($ignoreXmlAttributes == true) && ($key == "@attributes")) - - // Let us recursively process the current XML element we just visited. - // Increase the recursion depth by one. - $recursionDepth++; - $resultArray[$key] = self::_processXml ($value, $ignoreXmlAttributes, $recursionDepth); - - // Decrease the recursion depth by one. - $recursionDepth--; - } // End of foreach($simpleXmlElementObject as $key=>$value) { - - if ($recursionDepth == 0) { - // That is it. We are heading to the exit now. - // Set the XML root element name as the root [top-level] key of - // the associative array that we are going to return to the original - // caller of this recursive function. - $tempArray = $resultArray; - $resultArray = array(); - $resultArray[$callerProvidedSimpleXmlElementObject->getName()] = $tempArray; - } // End of if ($recursionDepth == 0) - - return($resultArray); - } else { - // We are now looking at either the XML attribute text or - // the text between the XML tags. - - // In order to allow Zend_Json_Expr from xml, we check if the node - // matchs the pattern that try to detect if it is a new Zend_Json_Expr - // if it matches, we return a new Zend_Json_Expr instead of a text node - $pattern = '/^[\s]*new Zend_Json_Expr[\s]*$[\s]*[\"\']{1}(.*)[\"\']{1}[\s]*$[\s]*$/'; - $matchings = array(); - $match = preg_match ($pattern, $simpleXmlElementObject, $matchings); - if ($match) { - return new Zend_Json_Expr($matchings[1]); - } else { - return (trim(strval($simpleXmlElementObject))); - } - - } // End of if (is_array($simpleXmlElementObject)) - } // End of function _processXml. - - /** - * Pretty-print JSON string - * - * Use 'indent' option to select indentation string - by default it's a tab - * + * Use 'format' option to select output format - currently html and txt supported, txt is default + * Use 'indent' option to override the indentation string set in the format - by default for the 'txt' format it's a tab + * * @param string $json Original JSON string * @param array $options Encoding options * @return string @@ -373,32 +375,62 @@ public static function prettyPrint($json, $options = array()) { $tokens = preg_split('|([\{\}\]\[,])|', $json, -1, PREG_SPLIT_DELIM_CAPTURE); - $result = ""; + $result = ''; $indent = 0; - + + $format= 'txt'; + $ind = "\t"; - if(isset($options['indent'])) { + + if (isset($options['format'])) { + $format = $options['format']; + } + + switch ($format) { + case 'html': + $lineBreak = '
'; + $ind = ' '; + break; + default: + case 'txt': + $lineBreak = "\n"; + $ind = "\t"; + break; + } + + // override the defined indent setting with the supplied option + if (isset($options['indent'])) { $ind = $options['indent']; } - + + $inLiteral = false; foreach($tokens as $token) { - if($token == "") continue; - + if($token == '') { + continue; + } + $prefix = str_repeat($ind, $indent); - if($token == "{" || $token == "[") { + if (!$inLiteral && ($token == '{' || $token == '[')) { $indent++; - if($result != "" && $result[strlen($result)-1] == "\n") { + if (($result != '') && ($result[(strlen($result)-1)] == $lineBreak)) { $result .= $prefix; } - $result .= "$token\n"; - } else if($token == "}" || $token == "]") { + $result .= $token . $lineBreak; + } elseif (!$inLiteral && ($token == '}' || $token == ']')) { $indent--; $prefix = str_repeat($ind, $indent); - $result .= "\n$prefix$token"; - } else if($token == ",") { - $result .= "$token\n"; + $result .= $lineBreak . $prefix . $token; + } elseif (!$inLiteral && $token == ',') { + $result .= $token . $lineBreak; } else { - $result .= $prefix.$token; + $result .= ( $inLiteral ? '' : $prefix ) . $token; + + // Count # of unescaped double-quotes in token, subtract # of + // escaped double-quotes and if the result is odd then we are + // inside a string literal + if ((substr_count($token, "\"")-substr_count($token, "\\\"")) % 2 != 0) { + $inLiteral = !$inLiteral; + } } } return $result; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Decoder.php --- a/web/lib/Zend/Json/Decoder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Decoder.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decoder.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Decoder.php 24799 2012-05-12 19:27:07Z adamlundrigan $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Decoder @@ -236,6 +236,9 @@ // Create new StdClass and populate with $members $result = new StdClass(); foreach ($members as $key => $value) { + if ($key === '') { + $key = '_empty_'; + } $result->$key = $value; } break; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Encoder.php --- a/web/lib/Zend/Json/Encoder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Encoder.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Encoder.php 22452 2010-06-18 18:13:23Z ralph $ + * @version $Id: Encoder.php 25059 2012-11-02 21:01:06Z rob $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Encoder @@ -74,7 +74,6 @@ public static function encode($value, $cycleCheck = false, $options = array()) { $encoder = new self(($cycleCheck) ? true : false, $options); - return $encoder->_encodeValue($value); } @@ -85,7 +84,7 @@ * - arrays (returns from {@link _encodeArray()}) * - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()}) * - * @param $value mixed The value to be encoded + * @param mixed $value The value to be encoded * @return string Encoded value */ protected function _encodeValue(&$value) @@ -108,7 +107,7 @@ * that contains the name of the class of $value. This is used to decode * the object on the client into a specific class. * - * @param $value object + * @param object $value * @return string * @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously */ @@ -135,23 +134,28 @@ } $props = ''; - - if ($value instanceof Iterator) { - $propCollection = $value; + if (method_exists($value, 'toJson')) { + $props =',' . preg_replace("/^\{(.*)\}$/","\\1",$value->toJson()); } else { - $propCollection = get_object_vars($value); - } + if ($value instanceof IteratorAggregate) { + $propCollection = $value->getIterator(); + } elseif ($value instanceof Iterator) { + $propCollection = $value; + } else { + $propCollection = get_object_vars($value); + } - foreach ($propCollection as $name => $propValue) { - if (isset($propValue)) { - $props .= ',' - . $this->_encodeString($name) - . ':' - . $this->_encodeValue($propValue); + foreach ($propCollection as $name => $propValue) { + if (isset($propValue)) { + $props .= ',' + . $this->_encodeString($name) + . ':' + . $this->_encodeValue($propValue); + } } } - - return '{"__className":"' . get_class($value) . '"' + $className = get_class($value); + return '{"__className":' . $this->_encodeString($className) . $props . '}'; } @@ -182,7 +186,7 @@ * the last index is (count($array) -1); any deviation from that is * considered an associative array, and will be encoded as such. * - * @param $array array + * @param array& $array * @return string */ protected function _encodeArray(&$array) @@ -222,7 +226,7 @@ * If value type is not a string, number, boolean, or null, the string * 'null' is returned. * - * @param $value mixed + * @param mixed& $value * @return string */ protected function _encodeDatum(&$value) @@ -245,7 +249,7 @@ /** * JSON encode a string value by escaping characters as necessary * - * @param $value string + * @param string& $value * @return string */ protected function _encodeString(&$string) @@ -270,7 +274,7 @@ * Encode the constants associated with the ReflectionClass * parameter. The encoding format is based on the class2 format * - * @param $cls ReflectionClass + * @param ReflectionClass $cls * @return string Encoded constant block in class2 format */ private static function _encodeConstants(ReflectionClass $cls) @@ -295,7 +299,7 @@ * Encode the public methods of the ReflectionClass in the * class2 format * - * @param $cls ReflectionClass + * @param ReflectionClass $cls * @return string Encoded method fragment * */ @@ -359,7 +363,7 @@ * Encode the public properties of the ReflectionClass in the class2 * format. * - * @param $cls ReflectionClass + * @param ReflectionClass $cls * @return string Encode properties list * */ @@ -391,10 +395,10 @@ * NOTE: Currently only public methods and variables are proxied onto * the client machine * - * @param $className string The name of the class, the class must be - * instantiable using a null constructor - * @param $package string Optional package name appended to JavaScript - * proxy class name + * @param string $className The name of the class, the class must be + * instantiable using a null constructor + * @param string $package Optional package name appended to JavaScript + * proxy class name * @return string The class2 (JavaScript) encoding of the class * @throws Zend_Json_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Exception.php --- a/web/lib/Zend/Json/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Expr.php --- a/web/lib/Zend/Json/Expr.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Expr.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Json * @subpackage Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Expr.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Expr.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -45,7 +45,7 @@ * @category Zend * @package Zend_Json * @subpackage Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Expr diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server.php --- a/web/lib/Zend/Json/Server.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 22237 2010-05-21 23:58:00Z andyfowler $ + * @version $Id: Server.php 25085 2012-11-06 21:11:41Z rob $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server extends Zend_Server_Abstract @@ -534,8 +534,8 @@ $reflection = new ReflectionFunction( $callback->getFunction() ); $refParams = $reflection->getParameters(); } else { - - $reflection = new ReflectionMethod( + + $reflection = new ReflectionMethod( $callback->getClass(), $callback->getMethod() ); @@ -547,11 +547,11 @@ if( isset( $params[ $refParam->getName() ] ) ) { $orderedParams[ $refParam->getName() ] = $params[ $refParam->getName() ]; } elseif( $refParam->isOptional() ) { - $orderedParams[ $refParam->getName() ] = null; + $orderedParams[ $refParam->getName() ] = $refParam->getDefaultValue(); } else { - throw new Zend_Server_Exception( - 'Missing required parameter: ' . $refParam->getName() - ); + throw new Zend_Server_Exception( + 'Missing required parameter: ' . $refParam->getName() + ); } } $params = $orderedParams; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Cache.php --- a/web/lib/Zend/Json/Server/Cache.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Cache.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cache.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Server_Cache */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Cache extends Zend_Server_Cache diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Error.php --- a/web/lib/Zend/Json/Server/Error.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Error.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Error.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Error diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Exception.php --- a/web/lib/Zend/Json/Server/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Json_Exception */ @@ -28,7 +28,7 @@ * @uses Zend_Json_Exception * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Exception extends Zend_Json_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Request.php --- a/web/lib/Zend/Json/Server/Request.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Request.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Request.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Request diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Request/Http.php --- a/web/lib/Zend/Json/Server/Request/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Request/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Request_Http extends Zend_Json_Server_Request diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Response.php --- a/web/lib/Zend/Json/Server/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24807 2012-05-15 12:10:42Z adamlundrigan $ */ /** * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Response @@ -144,13 +144,14 @@ */ public function setVersion($version) { - $version = (string) $version; - if ('2.0' == $version) { + $version = is_array($version) + ? implode(' ', $version) + : $version; + if ((string)$version == '2.0') { $this->_version = '2.0'; } else { $this->_version = null; } - return $this; } @@ -173,7 +174,6 @@ { if ($this->isError()) { $response = array( - 'result' => null, 'error' => $this->getError()->toArray(), 'id' => $this->getId(), ); @@ -181,7 +181,6 @@ $response = array( 'result' => $this->getResult(), 'id' => $this->getId(), - 'error' => null, ); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Response/Http.php --- a/web/lib/Zend/Json/Server/Response/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Response/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Response_Http extends Zend_Json_Server_Response diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Smd.php --- a/web/lib/Zend/Json/Server/Smd.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Smd.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smd.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Smd.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Smd diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Json/Server/Smd/Service.php --- a/web/lib/Zend/Json/Server/Smd/Service.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Json/Server/Smd/Service.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,8 +28,8 @@ * * @package Zend_Json * @subpackage Server - * @version $Id: Service.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Service.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Smd_Service diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Layout.php --- a/web/lib/Zend/Layout.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Layout.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Layout.php 25263 2013-02-18 11:48:02Z frosch $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Layout @@ -174,12 +174,12 @@ { if (null === self::$_mvcInstance) { self::$_mvcInstance = new self($options, true); - } - - if (is_string($options)) { - self::$_mvcInstance->setLayoutPath($options); - } elseif (is_array($options) || $options instanceof Zend_Config) { - self::$_mvcInstance->setOptions($options); + } else { + if (is_string($options)) { + self::$_mvcInstance->setLayoutPath($options); + } elseif (is_array($options) || $options instanceof Zend_Config) { + self::$_mvcInstance->setOptions($options); + } } return self::$_mvcInstance; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Layout/Controller/Action/Helper/Layout.php --- a/web/lib/Zend/Layout/Controller/Action/Helper/Layout.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Layout/Controller/Action/Helper/Layout.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Layout.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Layout/Controller/Plugin/Layout.php --- a/web/lib/Zend/Layout/Controller/Plugin/Layout.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Layout/Controller/Plugin/Layout.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Layout.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Layout_Controller_Plugin_Layout extends Zend_Controller_Plugin_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Layout/Exception.php --- a/web/lib/Zend/Layout/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Layout/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Layout_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap.php --- a/web/lib/Zend/Ldap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ldap.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Ldap.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap @@ -922,8 +922,8 @@ * @param array $attributes * @param string|null $sort * @param string|null $collectionClass - * @param integer $sizelimit - * @param integer $timelimit + * @param integer $sizelimit + * @param integer $timelimit * @return Zend_Ldap_Collection * @throws Zend_Ldap_Exception */ @@ -1008,8 +1008,8 @@ /** * Extension point for collection creation * - * @param Zend_Ldap_Collection_Iterator_Default $iterator - * @param string|null $collectionClass + * @param Zend_Ldap_Collection_Iterator_Default $iterator + * @param string|null $collectionClass * @return Zend_Ldap_Collection * @throws Zend_Ldap_Exception */ @@ -1107,8 +1107,8 @@ * @param array $attributes * @param string|null $sort * @param boolean $reverseSort - * @param integer $sizelimit - * @param integer $timelimit + * @param integer $sizelimit + * @param integer $timelimit * @return array * @throws Zend_Ldap_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Attribute.php --- a/web/lib/Zend/Ldap/Attribute.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Attribute.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Attribute.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Attribute.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Attribute @@ -214,9 +214,9 @@ /** * Converts a PHP data type into its LDAP representation * - * @deprected use Zend_Ldap_Converter instead - * @param mixed $value - * @return string|null - null if the PHP data type cannot be converted. + * @deprected use Zend_Ldap_Converter instead + * @param mixed $value + * @return string|null - null if the PHP data type cannot be converted. */ public static function convertToLdapValue($value) { @@ -226,9 +226,9 @@ /** * Converts an LDAP value into its PHP data type * - * @deprected use Zend_Ldap_Converter instead - * @param string $value - * @return mixed + * @deprected use Zend_Ldap_Converter instead + * @param string $value + * @return mixed */ public static function convertFromLdapValue($value) { @@ -392,9 +392,9 @@ } } else { - $newVal = self::_valueFromLdapDateTime($values); - if ($newVal !== null) $values = $newVal; - } + $newVal = self::_valueFromLdapDateTime($values); + if ($newVal !== null) $values = $newVal; + } return $values; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Collection.php --- a/web/lib/Zend/Ldap/Collection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Collection.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Collection.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Collection implements Iterator, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Collection/Iterator/Default.php --- a/web/lib/Zend/Ldap/Collection/Iterator/Default.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Collection/Iterator/Default.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24612 2012-01-21 14:42:30Z sgehrig $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Collection_Iterator_Default implements Iterator, Countable @@ -260,7 +260,7 @@ */ public function next() { - if (is_resource($this->_current)) { + if (is_resource($this->_current) && $this->_itemCount > 0) { $this->_current = @ldap_next_entry($this->_ldap->getResource(), $this->_current); /** @see Zend_Ldap_Exception */ require_once 'Zend/Ldap/Exception.php'; @@ -273,6 +273,8 @@ throw new Zend_Ldap_Exception($this->_ldap, 'getting next entry (' . $msg . ')'); } } + } else { + $this->_current = false; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Converter.php --- a/web/lib/Zend/Ldap/Converter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Converter.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Converter.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Converter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Converter @@ -73,7 +73,7 @@ return $string; } - /** + /** * Convert any value to an LDAP-compatible value. * * By setting the $type-parameter the conversion of a certain @@ -81,10 +81,10 @@ * * @todo write more tests * - * @param mixed $value The value to convert - * @param int $ytpe The conversion type to use - * @return string - * @throws Zend_Ldap_Converter_Exception + * @param mixed $value The value to convert + * @param int $ytpe The conversion type to use + * @return string + * @throws Zend_Ldap_Converter_Exception */ public static function toLdap($value, $type = self::STANDARD) { @@ -132,11 +132,11 @@ * DateTime Object, a string that is parseable by strtotime() or a Zend_Date * Object. * - * @param integer|string|DateTimt|Zend_Date $date The date-entity - * @param boolean $asUtc Whether to return the LDAP-compatible date-string - * as UTC or as local value - * @return string - * @throws InvalidArgumentException + * @param integer|string|DateTimt|Zend_Date $date The date-entity + * @param boolean $asUtc Whether to return the LDAP-compatible date-string + * as UTC or as local value + * @return string + * @throws InvalidArgumentException */ public static function toLdapDateTime($date, $asUtc = true) { @@ -170,8 +170,8 @@ * case-insensitive string 'true' to an LDAP-compatible 'TRUE'. All other * other values are converted to an LDAP-compatible 'FALSE'. * - * @param boolean|integer|string $value The boolean value to encode - * @return string + * @param boolean|integer|string $value The boolean value to encode + * @return string */ public static function toLdapBoolean($value) { @@ -188,8 +188,8 @@ /** * Serialize any value for storage in LDAP * - * @param mixed $value The value to serialize - * @return string + * @param mixed $value The value to serialize + * @return string */ public static function toLdapSerialize($value) { @@ -202,11 +202,11 @@ * By setting the $type-parameter the conversion of a certain * type can be forced * . - * @param string $value The value to convert - * @param int $ytpe The conversion type to use - * @param boolean $dateTimeAsUtc Return DateTime values in UTC timezone - * @return mixed - * @throws Zend_Ldap_Converter_Exception + * @param string $value The value to convert + * @param int $ytpe The conversion type to use + * @param boolean $dateTimeAsUtc Return DateTime values in UTC timezone + * @return mixed + * @throws Zend_Ldap_Converter_Exception */ public static function fromLdap($value, $type = self::STANDARD, $dateTimeAsUtc = true) { @@ -219,7 +219,8 @@ break; default: if (is_numeric($value)) { - return (float)$value; + // prevent numeric values to be treated as date/time + return $value; } else if ('TRUE' === $value || 'FALSE' === $value) { return self::fromLdapBoolean($value); } @@ -239,10 +240,10 @@ * * CAVEAT: The DateTime-Object returned will alwasy be set to UTC-Timezone. * - * @param string $date The generalized-Time - * @param boolean $asUtc Return the DateTime with UTC timezone - * @return DateTime - * @throws InvalidArgumentException if a non-parseable-format is given + * @param string $date The generalized-Time + * @param boolean $asUtc Return the DateTime with UTC timezone + * @return DateTime + * @throws InvalidArgumentException if a non-parseable-format is given */ public static function fromLdapDateTime($date, $asUtc = true) { @@ -265,7 +266,7 @@ 'second' => 0, 'offdir' => '+', 'offsethours' => 0, - 'offsetminutes' => 0 + 'offsetminutes' => 0 ); $length = strlen($date); @@ -363,9 +364,9 @@ /** * Convert an LDAP-compatible boolean value into a PHP-compatible one * - * @param string $value The value to convert - * @return boolean - * @throws InvalidArgumentException + * @param string $value The value to convert + * @return boolean + * @throws InvalidArgumentException */ public static function fromLdapBoolean($value) { @@ -381,9 +382,9 @@ /** * Unserialize a serialized value to return the corresponding object * - * @param string $value The value to convert - * @return mixed - * @throws UnexpectedValueException + * @param string $value The value to convert + * @return mixed + * @throws UnexpectedValueException */ public static function fromLdapUnserialize($value) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Converter/Exception.php --- a/web/lib/Zend/Ldap/Converter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Converter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Converter_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Dn.php --- a/web/lib/Zend/Ldap/Dn.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Dn.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dn.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Dn.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Dn implements ArrayAccess diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Exception.php --- a/web/lib/Zend/Ldap/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Ldap * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter.php --- a/web/lib/Zend/Ldap/Filter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Filter.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Filter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter extends Zend_Ldap_Filter_String diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/Abstract.php --- a/web/lib/Zend/Ldap/Filter/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Filter_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/And.php --- a/web/lib/Zend/Ldap/Filter/And.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/And.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: And.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: And.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_And extends Zend_Ldap_Filter_Logical diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/Exception.php --- a/web/lib/Zend/Ldap/Filter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/Logical.php --- a/web/lib/Zend/Ldap/Filter/Logical.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/Logical.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Logical.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Logical.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Filter_Logical extends Zend_Ldap_Filter_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/Mask.php --- a/web/lib/Zend/Ldap/Filter/Mask.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/Mask.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mask.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mask.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Mask extends Zend_Ldap_Filter_String diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/Not.php --- a/web/lib/Zend/Ldap/Filter/Not.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/Not.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Not.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Not.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Not extends Zend_Ldap_Filter_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/Or.php --- a/web/lib/Zend/Ldap/Filter/Or.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/Or.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Or.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Or.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Or extends Zend_Ldap_Filter_Logical diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Filter/String.php --- a/web/lib/Zend/Ldap/Filter/String.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Filter/String.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: String.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_String extends Zend_Ldap_Filter_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Ldif/Encoder.php --- a/web/lib/Zend/Ldap/Ldif/Encoder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Ldif/Encoder.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Ldif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Encoder.php 21005 2010-02-09 13:16:26Z sgehrig $ + * @version $Id: Encoder.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Ldif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Ldif_Encoder diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node.php --- a/web/lib/Zend/Ldap/Node.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Node.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Node.php 24610 2012-01-21 13:54:27Z sgehrig $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, RecursiveIterator @@ -171,6 +171,7 @@ $this->_ldap = $ldap; if (is_array($this->_children)) { foreach ($this->_children as $child) { + /* @var Zend_Ldap_Node $child */ $child->attachLdap($ldap); } } @@ -190,6 +191,7 @@ $this->_ldap = null; if (is_array($this->_children)) { foreach ($this->_children as $child) { + /* @var Zend_Ldap_Node $child */ $child->detachLdap(); } } @@ -319,12 +321,17 @@ /** * Ensures that teh RDN attributes are correctly set. * + * @param boolean $overwrite True to overwrite the RDN attributes * @return void */ - protected function _ensureRdnAttributeValues() + protected function _ensureRdnAttributeValues($overwrite = false) { foreach ($this->getRdnArray() as $key => $value) { - Zend_Ldap_Attribute::setAttribute($this->_currentData, $key, $value, false); + if (!array_key_exists($key, $this->_currentData) || $overwrite) { + Zend_Ldap_Attribute::setAttribute($this->_currentData, $key, $value, false); + } else if (!in_array($value, $this->_currentData[$key])) { + Zend_Ldap_Attribute::setAttribute($this->_currentData, $key, $value, true); + } } } @@ -428,20 +435,25 @@ if ($this->willBeDeleted()) { if ($ldap->exists($this->_dn)) { + $this->_preDelete(); $ldap->delete($this->_dn); + $this->_postDelete(); } return $this; } if ($this->isNew()) { + $this->_preAdd(); $data = $this->getData(); $ldap->add($this->_getDn(), $data); $this->_loadData($data, true); + $this->_postAdd(); return $this; } $changedData = $this->getChangedData(); if ($this->willBeMoved()) { + $this->_preRename(); $recursive = $this->hasChildren(); $ldap->rename($this->_dn, $this->_newDn, $recursive, false); foreach ($this->_newDn->getRdn() as $key => $value) { @@ -451,9 +463,12 @@ } $this->_dn = $this->_newDn; $this->_newDn = null; + $this->_postRename(); } if (count($changedData) > 0) { + $this->_preUpdate(); $ldap->update($this->_getDn(), $changedData); + $this->_postUpdate(); } $this->_originalData = $this->_currentData; return $this; @@ -501,7 +516,7 @@ } else { $this->_newDn = Zend_Ldap_Dn::factory($newDn); } - $this->_ensureRdnAttributeValues(); + $this->_ensureRdnAttributeValues(true); return $this; } @@ -1019,6 +1034,7 @@ if ($this->isAttached()) { $children = $this->searchChildren('(objectClass=*)', null); foreach ($children as $child) { + /* @var Zend_Ldap_Node $child */ $this->_children[$child->getRdnString(Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER)] = $child; } } @@ -1098,4 +1114,72 @@ { return $this->_iteratorRewind; } + + #################################################### + # Empty method bodies for overriding in subclasses # + #################################################### + + /** + * Allows pre-delete logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _preDelete() { } + + /** + * Allows post-delete logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _postDelete() { } + + /** + * Allows pre-add logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _preAdd() { } + + /** + * Allows post-add logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _postAdd() { } + + /** + * Allows pre-rename logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _preRename() { } + + /** + * Allows post-rename logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _postRename() { } + + /** + * Allows pre-update logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _preUpdate() { } + + /** + * Allows post-update logic to be applied to node. + * Subclasses may override this method. + * + * @return void + */ + protected function _postUpdate() { } } \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Abstract.php --- a/web/lib/Zend/Ldap/Node/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/ChildrenIterator.php --- a/web/lib/Zend/Ldap/Node/ChildrenIterator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/ChildrenIterator.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ChildrenIterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ChildrenIterator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_ChildrenIterator implements Iterator, Countable, RecursiveIterator, ArrayAccess diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Collection.php --- a/web/lib/Zend/Ldap/Node/Collection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Collection.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Collection.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Collection extends Zend_Ldap_Collection diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/RootDse.php --- a/web/lib/Zend/Ldap/Node/RootDse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/RootDse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RootDse.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RootDse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse extends Zend_Ldap_Node_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/RootDse/ActiveDirectory.php --- a/web/lib/Zend/Ldap/Node/RootDse/ActiveDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/RootDse/ActiveDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse_ActiveDirectory extends Zend_Ldap_Node_RootDse diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/RootDse/OpenLdap.php --- a/web/lib/Zend/Ldap/Node/RootDse/OpenLdap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/RootDse/OpenLdap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse_OpenLdap extends Zend_Ldap_Node_RootDse diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/RootDse/eDirectory.php --- a/web/lib/Zend/Ldap/Node/RootDse/eDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/RootDse/eDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: eDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: eDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse_eDirectory extends Zend_Ldap_Node_RootDse diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema.php --- a/web/lib/Zend/Ldap/Node/Schema.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Schema.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Schema.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema extends Zend_Ldap_Node_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/ActiveDirectory.php --- a/web/lib/Zend/Ldap/Node/Schema/ActiveDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/ActiveDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_ActiveDirectory extends Zend_Ldap_Node_Schema diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php --- a/web/lib/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory extends Zend_Ldap_Node_Schema_Item diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/AttributeType/Interface.php --- a/web/lib/Zend/Ldap/Node/Schema/AttributeType/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/AttributeType/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Ldap_Node_Schema_AttributeType_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php --- a/web/lib/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_AttributeType_OpenLdap extends Zend_Ldap_Node_Schema_Item diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/Item.php --- a/web/lib/Zend/Ldap/Node/Schema/Item.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/Item.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Item.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Item.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Node_Schema_Item implements ArrayAccess, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php --- a/web/lib/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory extends Zend_Ldap_Node_Schema_Item diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/ObjectClass/Interface.php --- a/web/lib/Zend/Ldap/Node/Schema/ObjectClass/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/ObjectClass/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Ldap_Node_Schema_ObjectClass_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php --- a/web/lib/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_ObjectClass_OpenLdap extends Zend_Ldap_Node_Schema_Item diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Ldap/Node/Schema/OpenLdap.php --- a/web/lib/Zend/Ldap/Node/Schema/OpenLdap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Ldap/Node/Schema/OpenLdap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader.php --- a/web/lib/Zend/Loader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Loader.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Loader.php 22019 2010-04-27 16:33:31Z matthew $ + * @version $Id: Loader.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader @@ -60,19 +60,7 @@ throw new Zend_Exception('Directory argument must be a string or an array'); } - // Autodiscover the path from the class name - // Implementation is PHP namespace-aware, and based on - // Framework Interop Group reference implementation: - // http://groups.google.com/group/php-standards/web/psr-0-final-proposal - $className = ltrim($class, '\\'); - $file = ''; - $namespace = ''; - if ($lastNsPos = strripos($className, '\\')) { - $namespace = substr($className, 0, $lastNsPos); - $className = substr($className, $lastNsPos + 1); - $file = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR; - } - $file .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php'; + $file = self::standardiseFile($class); if (!empty($dirs)) { // use the autodiscovered path @@ -174,7 +162,7 @@ public static function isReadable($filename) { if (is_readable($filename)) { - // Return early if the filename is readable without needing the + // Return early if the filename is readable without needing the // include_path return true; } @@ -182,7 +170,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' && preg_match('/^[a-z]:/i', $filename) ) { - // If on windows, and path provided is clearly an absolute path, + // If on windows, and path provided is clearly an absolute path, // return false immediately return false; } @@ -207,8 +195,8 @@ * * If no path provided, uses current include_path. Works around issues that * occur when the path includes stream schemas. - * - * @param string|null $path + * + * @param string|null $path * @return array */ public static function explodeIncludePath($path = null) @@ -218,7 +206,7 @@ } if (PATH_SEPARATOR == ':') { - // On *nix systems, include_paths which include paths with a stream + // On *nix systems, include_paths which include paths with a stream // schema cannot be safely explode'd, so we have to be a bit more // intelligent in the approach. $paths = preg_split('#:(?!//)#', $path); @@ -326,4 +314,30 @@ return include $filespec ; } } + + /** + * Standardise the filename. + * + * Convert the supplied filename into the namespace-aware standard, + * based on the Framework Interop Group reference implementation: + * http://groups.google.com/group/php-standards/web/psr-0-final-proposal + * + * The filename must be formatted as "$file.php". + * + * @param string $file - The file name to be loaded. + * @return string + */ + public static function standardiseFile($file) + { + $fileName = ltrim($file, '\\'); + $file = ''; + $namespace = ''; + if ($lastNsPos = strripos($fileName, '\\')) { + $namespace = substr($fileName, 0, $lastNsPos); + $fileName = substr($fileName, $lastNsPos + 1); + $file = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR; + } + $file .= str_replace('_', DIRECTORY_SEPARATOR, $fileName) . '.php'; + return $file; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/Autoloader.php --- a/web/lib/Zend/Loader/Autoloader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Loader/Autoloader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Autoloader.php 23161 2010-10-19 16:08:36Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Autoloader.php 25024 2012-07-30 15:08:15Z rob $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_Loader_Autoloader * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_Autoloader @@ -335,9 +335,10 @@ continue; } if (0 === strpos($class, $ns)) { - $namespace = $ns; - $autoloaders = $autoloaders + $this->getNamespaceAutoloaders($ns); - break; + if ((false === $namespace) || (strlen($ns) > strlen($namespace))) { + $namespace = $ns; + $autoloaders = $this->getNamespaceAutoloaders($ns); + } } } @@ -351,7 +352,13 @@ } // Add non-namespaced autoloaders - $autoloaders = $autoloaders + $this->getNamespaceAutoloaders(''); + $autoloadersNonNamespace = $this->getNamespaceAutoloaders(''); + if (count($autoloadersNonNamespace)) { + foreach ($autoloadersNonNamespace as $ns) { + $autoloaders[] = $ns; + } + unset($autoloadersNonNamespace); + } // Add fallback autoloader if (!$namespace && $this->isFallbackAutoloader()) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/Autoloader/Interface.php --- a/web/lib/Zend/Loader/Autoloader/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Loader/Autoloader/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Interface.php 22913 2010-08-29 00:28:02Z ramon $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Loader_Autoloader_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/Autoloader/Resource.php --- a/web/lib/Zend/Loader/Autoloader/Resource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Loader/Autoloader/Resource.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_Loader_Autoloader_Interface * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interface @@ -88,6 +88,7 @@ if (!empty($namespace)) { $namespace .= '_'; } + require_once 'Zend/Loader/Autoloader.php'; Zend_Loader_Autoloader::getInstance()->unshiftAutoloader($this, $namespace); } @@ -144,7 +145,12 @@ $namespace = ''; if (!empty($namespaceTopLevel)) { - $namespace = array_shift($segments); + $namespace = array(); + $topLevelSegments = count(explode('_', $namespaceTopLevel)); + for ($i = 0; $i < $topLevelSegments; $i++) { + $namespace[] = array_shift($segments); + } + $namespace = implode('_', $namespace); if ($namespace != $namespaceTopLevel) { // wrong prefix? we're done return false; @@ -205,6 +211,12 @@ */ public function setOptions(array $options) { + // Set namespace first, see ZF-10836 + if (isset($options['namespace'])) { + $this->setNamespace($options['namespace']); + unset($options['namespace']); + } + $methods = get_class_methods($this); foreach ($options as $key => $value) { $method = 'set' . ucfirst($key); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/AutoloaderFactory.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Loader/AutoloaderFactory.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,211 @@ + + * array( + * '' => $autoloaderOptions, + * ) + * + * + * The factory will then loop through and instantiate each autoloader with + * the specified options, and register each with the spl_autoloader. + * + * You may retrieve the concrete autoloader instances later using + * {@link getRegisteredAutoloaders()}. + * + * Note that the class names must be resolvable on the include_path or via + * the Zend library, using PSR-0 rules (unless the class has already been + * loaded). + * + * @param array|Traversable $options (optional) options to use. Defaults to Zend_Loader_StandardAutoloader + * @return void + * @throws Zend_Loader_Exception_InvalidArgumentException for invalid options + * @throws Zend_Loader_Exception_InvalidArgumentException for unloadable autoloader classes + */ + public static function factory($options = null) + { + if (null === $options) { + if (!isset(self::$loaders[self::STANDARD_AUTOLOADER])) { + $autoloader = self::getStandardAutoloader(); + $autoloader->register(); + self::$loaders[self::STANDARD_AUTOLOADER] = $autoloader; + } + + // Return so we don't hit the next check's exception (we're done here anyway) + return; + } + + if (!is_array($options) && !($options instanceof Traversable)) { + require_once 'Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException( + 'Options provided must be an array or Traversable' + ); + } + + foreach ($options as $class => $options) { + if (!isset(self::$loaders[$class])) { + $autoloader = self::getStandardAutoloader(); + if (!class_exists($class) && !$autoloader->autoload($class)) { + require_once 'Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException(sprintf( + 'Autoloader class "%s" not loaded', + $class + )); + } + + // unfortunately is_subclass_of is broken on some 5.3 versions + // additionally instanceof is also broken for this use case + if (version_compare(PHP_VERSION, '5.3.7', '>=')) { + if (!is_subclass_of($class, 'Zend_Loader_SplAutoloader')) { + require_once 'Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException(sprintf( + 'Autoloader class %s must implement Zend\\Loader\\SplAutoloader', + $class + )); + } + } + + if ($class === self::STANDARD_AUTOLOADER) { + $autoloader->setOptions($options); + } else { + $autoloader = new $class($options); + } + $autoloader->register(); + self::$loaders[$class] = $autoloader; + } else { + self::$loaders[$class]->setOptions($options); + } + } + } + + /** + * Get an list of all autoloaders registered with the factory + * + * Returns an array of autoloader instances. + * + * @return array + */ + public static function getRegisteredAutoloaders() + { + return self::$loaders; + } + + /** + * Retrieves an autoloader by class name + * + * @param string $class + * @return Zend_Loader_SplAutoloader + * @throws Zend_Loader_Exception_InvalidArgumentException for non-registered class + */ + public static function getRegisteredAutoloader($class) + { + if (!isset(self::$loaders[$class])) { + require_once 'Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException(sprintf('Autoloader class "%s" not loaded', $class)); + } + return self::$loaders[$class]; + } + + /** + * Unregisters all autoloaders that have been registered via the factory. + * This will NOT unregister autoloaders registered outside of the fctory. + * + * @return void + */ + public static function unregisterAutoloaders() + { + foreach (self::getRegisteredAutoloaders() as $class => $autoloader) { + spl_autoload_unregister(array($autoloader, 'autoload')); + unset(self::$loaders[$class]); + } + } + + /** + * Unregister a single autoloader by class name + * + * @param string $autoloaderClass + * @return bool + */ + public static function unregisterAutoloader($autoloaderClass) + { + if (!isset(self::$loaders[$autoloaderClass])) { + return false; + } + + $autoloader = self::$loaders[$autoloaderClass]; + spl_autoload_unregister(array($autoloader, 'autoload')); + unset(self::$loaders[$autoloaderClass]); + return true; + } + + /** + * Get an instance of the standard autoloader + * + * Used to attempt to resolve autoloader classes, using the + * StandardAutoloader. The instance is marked as a fallback autoloader, to + * allow resolving autoloaders not under the "Zend" or "Zend" namespaces. + * + * @return Zend_Loader_SplAutoloader + */ + protected static function getStandardAutoloader() + { + if (null !== self::$standardAutoloader) { + return self::$standardAutoloader; + } + + // Extract the filename from the classname + $stdAutoloader = substr(strrchr(self::STANDARD_AUTOLOADER, '_'), 1); + + if (!class_exists(self::STANDARD_AUTOLOADER)) { + require_once dirname(__FILE__) . "/$stdAutoloader.php"; + } + $loader = new Zend_Loader_StandardAutoloader(); + self::$standardAutoloader = $loader; + return self::$standardAutoloader; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/ClassMapAutoloader.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Loader/ClassMapAutoloader.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,248 @@ +setOptions($options); + } + } + + /** + * Configure the autoloader + * + * Proxies to {@link registerAutoloadMaps()}. + * + * @param array|Traversable $options + * @return Zend_Loader_ClassMapAutoloader + */ + public function setOptions($options) + { + $this->registerAutoloadMaps($options); + return $this; + } + + /** + * Register an autoload map + * + * An autoload map may be either an associative array, or a file returning + * an associative array. + * + * An autoload map should be an associative array containing + * classname/file pairs. + * + * @param string|array $location + * @return Zend_Loader_ClassMapAutoloader + */ + public function registerAutoloadMap($map) + { + if (is_string($map)) { + $location = $map; + if ($this === ($map = $this->loadMapFromFile($location))) { + return $this; + } + } + + if (!is_array($map)) { + require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not return a map'); + } + + $this->map = array_merge($this->map, $map); + + if (isset($location)) { + $this->mapsLoaded[] = $location; + } + + return $this; + } + + /** + * Register many autoload maps at once + * + * @param array $locations + * @return Zend_Loader_ClassMapAutoloader + */ + public function registerAutoloadMaps($locations) + { + if (!is_array($locations) && !($locations instanceof Traversable)) { + require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException('Map list must be an array or implement Traversable'); + } + foreach ($locations as $location) { + $this->registerAutoloadMap($location); + } + return $this; + } + + /** + * Retrieve current autoload map + * + * @return array + */ + public function getAutoloadMap() + { + return $this->map; + } + + /** + * Defined by Autoloadable + * + * @param string $class + * @return void + */ + public function autoload($class) + { + if (isset($this->map[$class])) { + require_once $this->map[$class]; + } + } + + /** + * Register the autoloader with spl_autoload registry + * + * @return void + */ + public function register() + { + if (version_compare(PHP_VERSION, '5.3.0', '>=')) { + spl_autoload_register(array($this, 'autoload'), true, true); + } else { + spl_autoload_register(array($this, 'autoload'), true); + } + } + + /** + * Load a map from a file + * + * If the map has been previously loaded, returns the current instance; + * otherwise, returns whatever was returned by calling include() on the + * location. + * + * @param string $location + * @return Zend_Loader_ClassMapAutoloader|mixed + * @throws Zend_Loader_Exception_InvalidArgumentException for nonexistent locations + */ + protected function loadMapFromFile($location) + { + if (!file_exists($location)) { + require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not exist'); + } + + if (!$path = self::realPharPath($location)) { + $path = realpath($location); + } + + if (in_array($path, $this->mapsLoaded)) { + // Already loaded this map + return $this; + } + + $map = include $path; + + return $map; + } + + /** + * Resolve the real_path() to a file within a phar. + * + * @see https://bugs.php.net/bug.php?id=52769 + * @param string $path + * @return string + */ + public static function realPharPath($path) + { + if (strpos($path, 'phar:///') !== 0) { + return; + } + + $parts = explode('/', str_replace(array('/','\\'), '/', substr($path, 8))); + $parts = array_values(array_filter($parts, array(__CLASS__, 'concatPharParts'))); + + array_walk($parts, array(__CLASS__, 'resolvePharParentPath'), $parts); + + if (file_exists($realPath = 'phar:///' . implode('/', $parts))) { + return $realPath; + } + } + + /** + * Helper callback for filtering phar paths + * + * @param string $part + * @return bool + */ + public static function concatPharParts($part) + { + return ($part !== '' && $part !== '.'); + } + + /** + * Helper callback to resolve a parent path in a Phar archive + * + * @param string $value + * @param int $key + * @param array $parts + * @return void + */ + public static function resolvePharParentPath($value, $key, &$parts) + { + if ($value !== '...') { + return; + } + unset($parts[$key], $parts[$key-1]); + $parts = array_values($parts); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/Exception.php --- a/web/lib/Zend/Loader/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Loader/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Loader * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/Exception/InvalidArgumentException.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Loader/Exception/InvalidArgumentException.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,34 @@ + $paths) { $className = $prefix . $name; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/PluginLoader/Exception.php --- a/web/lib/Zend/Loader/PluginLoader/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Loader/PluginLoader/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_PluginLoader_Exception extends Zend_Loader_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/PluginLoader/Interface.php --- a/web/lib/Zend/Loader/PluginLoader/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Loader/PluginLoader/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Loader_PluginLoader_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/SplAutoloader.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Loader/SplAutoloader.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,75 @@ + + * spl_autoload_register(array($this, 'autoload')); + * + * + * @return void + */ + public function register(); +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Loader/StandardAutoloader.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Loader/StandardAutoloader.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,368 @@ +setOptions($options); + } + } + + /** + * Configure autoloader + * + * Allows specifying both "namespace" and "prefix" pairs, using the + * following structure: + * + * array( + * 'namespaces' => array( + * 'Zend' => '/path/to/Zend/library', + * 'Doctrine' => '/path/to/Doctrine/library', + * ), + * 'prefixes' => array( + * 'Phly_' => '/path/to/Phly/library', + * ), + * 'fallback_autoloader' => true, + * ) + * + * + * @param array|Traversable $options + * @return Zend_Loader_StandardAutoloader + */ + public function setOptions($options) + { + if (!is_array($options) && !($options instanceof Traversable)) { + require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException('Options must be either an array or Traversable'); + } + + foreach ($options as $type => $pairs) { + switch ($type) { + case self::AUTOREGISTER_ZF: + if ($pairs) { + $this->registerPrefix('Zend', dirname(dirname(__FILE__))); + } + break; + case self::LOAD_NS: + if (is_array($pairs) || $pairs instanceof Traversable) { + $this->registerNamespaces($pairs); + } + break; + case self::LOAD_PREFIX: + if (is_array($pairs) || $pairs instanceof Traversable) { + $this->registerPrefixes($pairs); + } + break; + case self::ACT_AS_FALLBACK: + $this->setFallbackAutoloader($pairs); + break; + default: + // ignore + } + } + return $this; + } + + /** + * Set flag indicating fallback autoloader status + * + * @param bool $flag + * @return Zend_Loader_StandardAutoloader + */ + public function setFallbackAutoloader($flag) + { + $this->fallbackAutoloaderFlag = (bool) $flag; + return $this; + } + + /** + * Is this autoloader acting as a fallback autoloader? + * + * @return bool + */ + public function isFallbackAutoloader() + { + return $this->fallbackAutoloaderFlag; + } + + /** + * Register a namespace/directory pair + * + * @param string $namespace + * @param string $directory + * @return Zend_Loader_StandardAutoloader + */ + public function registerNamespace($namespace, $directory) + { + $namespace = rtrim($namespace, self::NS_SEPARATOR). self::NS_SEPARATOR; + $this->namespaces[$namespace] = $this->normalizeDirectory($directory); + return $this; + } + + /** + * Register many namespace/directory pairs at once + * + * @param array $namespaces + * @return Zend_Loader_StandardAutoloader + */ + public function registerNamespaces($namespaces) + { + if (!is_array($namespaces) && !$namespaces instanceof Traversable) { + require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException('Namespace pairs must be either an array or Traversable'); + } + + foreach ($namespaces as $namespace => $directory) { + $this->registerNamespace($namespace, $directory); + } + return $this; + } + + /** + * Register a prefix/directory pair + * + * @param string $prefix + * @param string $directory + * @return Zend_Loader_StandardAutoloader + */ + public function registerPrefix($prefix, $directory) + { + $prefix = rtrim($prefix, self::PREFIX_SEPARATOR). self::PREFIX_SEPARATOR; + $this->prefixes[$prefix] = $this->normalizeDirectory($directory); + return $this; + } + + /** + * Register many namespace/directory pairs at once + * + * @param array $prefixes + * @return Zend_Loader_StandardAutoloader + */ + public function registerPrefixes($prefixes) + { + if (!is_array($prefixes) && !$prefixes instanceof Traversable) { + require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException('Prefix pairs must be either an array or Traversable'); + } + + foreach ($prefixes as $prefix => $directory) { + $this->registerPrefix($prefix, $directory); + } + return $this; + } + + /** + * Defined by Autoloadable; autoload a class + * + * @param string $class + * @return false|string + */ + public function autoload($class) + { + $isFallback = $this->isFallbackAutoloader(); + if (false !== strpos($class, self::NS_SEPARATOR)) { + if ($this->loadClass($class, self::LOAD_NS)) { + return $class; + } elseif ($isFallback) { + return $this->loadClass($class, self::ACT_AS_FALLBACK); + } + return false; + } + if (false !== strpos($class, self::PREFIX_SEPARATOR)) { + if ($this->loadClass($class, self::LOAD_PREFIX)) { + return $class; + } elseif ($isFallback) { + return $this->loadClass($class, self::ACT_AS_FALLBACK); + } + return false; + } + if ($isFallback) { + return $this->loadClass($class, self::ACT_AS_FALLBACK); + } + return false; + } + + /** + * Register the autoloader with spl_autoload + * + * @return void + */ + public function register() + { + spl_autoload_register(array($this, 'autoload')); + } + + /** + * Error handler + * + * Used by {@link loadClass} during fallback autoloading in PHP versions + * prior to 5.3.0. + * + * @param mixed $errno + * @param mixed $errstr + * @return void + */ + public function handleError($errno, $errstr) + { + $this->error = true; + } + + /** + * Transform the class name to a filename + * + * @param string $class + * @param string $directory + * @return string + */ + protected function transformClassNameToFilename($class, $directory) + { + // $class may contain a namespace portion, in which case we need + // to preserve any underscores in that portion. + $matches = array(); + preg_match('/(?P.+\\\)?(?P[^\\\]+$)/', $class, $matches); + + $class = (isset($matches['class'])) ? $matches['class'] : ''; + $namespace = (isset($matches['namespace'])) ? $matches['namespace'] : ''; + + return $directory + . str_replace(self::NS_SEPARATOR, '/', $namespace) + . str_replace(self::PREFIX_SEPARATOR, '/', $class) + . '.php'; + } + + /** + * Load a class, based on its type (namespaced or prefixed) + * + * @param string $class + * @param string $type + * @return void + */ + protected function loadClass($class, $type) + { + if (!in_array($type, array(self::LOAD_NS, self::LOAD_PREFIX, self::ACT_AS_FALLBACK))) { + require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + throw new Zend_Loader_Exception_InvalidArgumentException(); + } + + // Fallback autoloading + if ($type === self::ACT_AS_FALLBACK) { + // create filename + $filename = $this->transformClassNameToFilename($class, ''); + if (version_compare(PHP_VERSION, '5.3.2', '>=')) { + $resolvedName = stream_resolve_include_path($filename); + if ($resolvedName !== false) { + return include $resolvedName; + } + return false; + } + $this->error = false; + set_error_handler(array($this, 'handleError'), E_WARNING); + include $filename; + restore_error_handler(); + if ($this->error) { + return false; + } + return class_exists($class, false); + } + + // Namespace and/or prefix autoloading + foreach ($this->$type as $leader => $path) { + if (0 === strpos($class, $leader)) { + // Trim off leader (namespace or prefix) + $trimmedClass = substr($class, strlen($leader)); + + // create filename + $filename = $this->transformClassNameToFilename($trimmedClass, $path); + if (file_exists($filename)) { + return include $filename; + } + return false; + } + } + return false; + } + + /** + * Normalize the directory to include a trailing directory separator + * + * @param string $directory + * @return string + */ + protected function normalizeDirectory($directory) + { + $last = $directory[strlen($directory) - 1]; + if (in_array($last, array('/', '\\'))) { + $directory[strlen($directory) - 1] = DIRECTORY_SEPARATOR; + return $directory; + } + $directory .= DIRECTORY_SEPARATOR; + return $directory; + } + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale.php --- a/web/lib/Zend/Locale.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Locale.php 22712 2010-07-29 08:24:28Z thomas $ + * @version $Id: Locale.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale @@ -666,7 +666,7 @@ require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $result = Zend_Locale_Data::getContent($locale, $path, $value); - if (empty($result) === true) { + if (empty($result) === true && '0' !== $result) { return false; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Data.php --- a/web/lib/Zend/Locale/Data.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Data.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Locale * @subpackage Data - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Data.php 22712 2010-07-29 08:24:28Z thomas $ + * @version $Id: Data.php 24766 2012-05-06 02:51:42Z adamlundrigan $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Locale * @subpackage Data - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Data @@ -361,7 +361,7 @@ break; case 'type': - if (empty($type)) { + if (empty($value)) { $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type', 'type'); } else { if (($value == 'calendar') or @@ -1139,6 +1139,10 @@ $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field/relative[@type=\'' . $value[1] . '\']', '', $value[1]); break; + case 'defaultnumberingsystem': + $temp = self::_getFile($locale, '/ldml/numbers/defaultNumberingSystem', '', 'default'); + break; + case 'decimalnumber': $temp = self::_getFile($locale, '/ldml/numbers/decimalFormats/decimalFormatLength/decimalFormat/pattern', '', 'default'); break; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Data/Translation.php --- a/web/lib/Zend/Locale/Data/Translation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Data/Translation.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Translation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Data_Translation diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Data/cy.xml --- a/web/lib/Zend/Locale/Data/cy.xml Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Data/cy.xml Sun Apr 21 21:54:24 2013 +0200 @@ -427,7 +427,7 @@ Ebrill Mai Mehefin - Gorffenaf + Gorffennaf Awst Medi Hydref diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Exception.php --- a/web/lib/Zend/Locale/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Format.php --- a/web/lib/Zend/Locale/Format.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Format.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Locale * @subpackage Format - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Format.php 22808 2010-08-08 09:38:42Z thomas $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Format.php 24807 2012-05-15 12:10:42Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Locale * @subpackage Format - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Format @@ -99,8 +99,9 @@ $options['number_format'] = Zend_Locale_Data::getContent($locale, 'decimalnumber'); } else if ((gettype($value) !== 'string') and ($value !== NULL)) { require_once 'Zend/Locale/Exception.php'; + $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value); throw new Zend_Locale_Exception("Unknown number format type '" . gettype($value) . "'. " - . "Format '$value' must be a valid number format string."); + . "Format '$stringValue' must be a valid number format string."); } break; @@ -113,8 +114,9 @@ $options['date_format'] = Zend_Locale_Format::getDateFormat($locale); } else if ((gettype($value) !== 'string') and ($value !== NULL)) { require_once 'Zend/Locale/Exception.php'; + $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value); throw new Zend_Locale_Exception("Unknown dateformat type '" . gettype($value) . "'. " - . "Format '$value' must be a valid ISO or PHP date format string."); + . "Format '$stringValue' must be a valid ISO or PHP date format string."); } else { if (((isset($options['format_type']) === true) and ($options['format_type'] == 'php')) or ((isset($options['format_type']) === false) and (self::$_options['format_type'] == 'php'))) { @@ -300,8 +302,8 @@ // load class within method for speed require_once 'Zend/Locale/Math.php'; + $value = Zend_Locale_Math::floatalize($value); $value = Zend_Locale_Math::normalize($value); - $value = Zend_Locale_Math::floatalize($value); $options = self::_checkOptions($options) + self::$_options; $options['locale'] = (string) $options['locale']; @@ -1137,7 +1139,7 @@ if (empty($options['date_format'])) { $options['format_type'] = 'iso'; - $options['date_format'] = self::getDateFormat($options['locale']); + $options['date_format'] = self::getDateFormat(isset($options['locale']) ? $options['locale'] : null); } $options = self::_checkOptions($options) + self::$_options; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Math.php --- a/web/lib/Zend/Locale/Math.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Math.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Math.php 21180 2010-02-23 22:00:29Z matthew $ + * @version $Id: Math.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Math/Exception.php --- a/web/lib/Zend/Locale/Math/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Math/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Math_Exception extends Zend_Locale_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Locale/Math/PhpMath.php --- a/web/lib/Zend/Locale/Math/PhpMath.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Locale/Math/PhpMath.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhpMath.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhpMath.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log.php --- a/web/lib/Zend/Log.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,17 +14,17 @@ * * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Log.php 22976 2010-09-19 11:57:26Z intiilapa $ + * @version $Id: Log.php 25131 2012-11-16 15:29:18Z rob $ */ /** * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Log.php 22976 2010-09-19 11:57:26Z intiilapa $ + * @version $Id: Log.php 25131 2012-11-16 15:29:18Z rob $ */ class Zend_Log { @@ -72,6 +72,12 @@ /** * + * @var string + */ + protected $_defaultFormatterNamespace = 'Zend_Log_Formatter'; + + /** + * * @var callback */ protected $_origErrorHandler = null; @@ -84,7 +90,7 @@ /** * - * @var array + * @var array|boolean */ protected $_errorHandlerMap = false; @@ -98,6 +104,7 @@ * Class constructor. Create a new logger * * @param Zend_Log_Writer_Abstract|null $writer default writer + * @return void */ public function __construct(Zend_Log_Writer_Abstract $writer = null) { @@ -115,6 +122,7 @@ * * @param array|Zend_Config Array or instance of Zend_Config * @return Zend_Log + * @throws Zend_Log_Exception */ static public function factory($config = array()) { @@ -130,6 +138,13 @@ $log = new self; + if (array_key_exists('timestampFormat', $config)) { + if (null != $config['timestampFormat'] && '' != $config['timestampFormat']) { + $log->setTimestampFormat($config['timestampFormat']); + } + unset($config['timestampFormat']); + } + if (!is_array(current($config))) { $log->addWriter(current($config)); } else { @@ -147,6 +162,7 @@ * * @param array $spec config array with writer spec * @return Zend_Log_Writer_Abstract + * @throws Zend_Log_Exception */ protected function _constructWriterFromConfig($config) { @@ -166,6 +182,11 @@ $writer->addFilter($filter); } + if (isset($config['formatterName'])) { + $formatter = $this->_constructFormatterFromConfig($config); + $writer->setFormatter($formatter); + } + return $writer; } @@ -174,6 +195,7 @@ * * @param array|Zend_Config $config Zend_Config or Array * @return Zend_Log_Filter_Interface + * @throws Zend_Log_Exception */ protected function _constructFilterFromConfig($config) { @@ -191,6 +213,29 @@ return $filter; } + /** + * Construct formatter object from configuration array or Zend_Config object + * + * @param array|Zend_Config $config Zend_Config or Array + * @return Zend_Log_Formatter_Interface + * @throws Zend_Log_Exception + */ + protected function _constructFormatterFromConfig($config) + { + $formatter = $this->_constructFromConfig('formatter', $config, $this->_defaultFormatterNamespace); + + if (!$formatter instanceof Zend_Log_Formatter_Interface) { + $formatterName = is_object($formatter) + ? get_class($formatter) + : 'The specified formatter'; + /** @see Zend_Log_Exception */ + require_once 'Zend/Log/Exception.php'; + throw new Zend_Log_Exception($formatterName . ' does not implement Zend_Log_Formatter_Interface'); + } + + return $formatter; + } + /** * Construct a filter or writer from config * @@ -198,6 +243,7 @@ * @param mixed $config Zend_Config or Array * @param string $namespace * @return object + * @throws Zend_Log_Exception */ protected function _constructFromConfig($type, $config, $namespace) { @@ -223,7 +269,7 @@ if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) { require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( - 'Driver does not implement Zend_Log_FactoryInterface and can not be constructed from config.' + $className . ' does not implement Zend_Log_FactoryInterface and can not be constructed from config.' ); } @@ -237,22 +283,33 @@ * @param string $type filter|writer * @param string $defaultNamespace * @return string full classname + * @throws Zend_Log_Exception */ protected function getClassName($config, $type, $defaultNamespace) { - if (!isset($config[ $type . 'Name' ])) { + if (!isset($config[$type . 'Name'])) { require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Specify {$type}Name in the configuration array"); } - $className = $config[ $type . 'Name' ]; + $className = $config[$type . 'Name']; $namespace = $defaultNamespace; - if (isset($config[ $type . 'Namespace' ])) { - $namespace = $config[ $type . 'Namespace' ]; + + if (isset($config[$type . 'Namespace'])) { + $namespace = $config[$type . 'Namespace']; } - $fullClassName = $namespace . '_' . $className; - return $fullClassName; + // PHP >= 5.3.0 namespace given? + if (substr($namespace, -1) == '\\') { + return $namespace . $className; + } + + // emtpy namespace given? + if (strlen($namespace) === 0) { + return $className; + } + + return $namespace . '_' . $className; } /** @@ -261,7 +318,7 @@ * @param string $message Message to log * @param integer $priority Priority of message * @return array Event array - **/ + */ protected function _packEvent($message, $priority) { return array_merge(array( @@ -387,7 +444,7 @@ * * @param string $name Name of priority * @param integer $priority Numeric priority - * @throws Zend_Log_InvalidArgumentException + * @throws Zend_Log_Exception */ public function addPriority($name, $priority) { @@ -410,12 +467,13 @@ * Before a message will be received by any of the writers, it * must be accepted by all filters added with this method. * - * @param int|Zend_Log_Filter_Interface $filter - * @return void + * @param int|Zend_Config|array|Zend_Log_Filter_Interface $filter + * @return Zend_Log + * @throws Zend_Log_Exception */ public function addFilter($filter) { - if (is_integer($filter)) { + if (is_int($filter)) { /** @see Zend_Log_Filter_Priority */ require_once 'Zend/Log/Filter/Priority.php'; $filter = new Zend_Log_Filter_Priority($filter); @@ -438,7 +496,7 @@ * message and writing it out to storage. * * @param mixed $writer Zend_Log_Writer_Abstract or Config array - * @return void + * @return Zend_Log */ public function addWriter($writer) { @@ -462,9 +520,9 @@ /** * Set an extra item to pass to the log writers. * - * @param $name Name of the field - * @param $value Value of the field - * @return void + * @param string $name Name of the field + * @param string $value Value of the field + * @return Zend_Log */ public function setEventItem($name, $value) { @@ -491,7 +549,7 @@ { // Only register once. Avoids loop issues if it gets registered twice. if ($this->_registeredErrorHandler) { - return $this; + return $this; } $this->_origErrorHandler = set_error_handler(array($this, 'errorHandler')); @@ -537,7 +595,7 @@ { $errorLevel = error_reporting(); - if ($errorLevel && $errno) { + if ($errorLevel & $errno) { if (isset($this->_errorHandlerMap[$errno])) { $priority = $this->_errorHandlerMap[$errno]; } else { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Exception.php --- a/web/lib/Zend/Log/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Exception */ @@ -25,9 +25,9 @@ /** * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Exception extends Zend_Exception {} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/FactoryInterface.php --- a/web/lib/Zend/Log/FactoryInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/FactoryInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,25 +14,25 @@ * * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FactoryInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: FactoryInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FactoryInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: FactoryInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ interface Zend_Log_FactoryInterface { /** * Construct a Zend_Log driver - * - * @param array|Zen_Config $config + * + * @param array|Zend_Config $config * @return Zend_Log_FactoryInterface */ static public function factory($config); -} +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Filter/Abstract.php --- a/web/lib/Zend/Log/Filter/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Filter/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21892 2010-04-16 19:15:20Z juokaz $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Log_Filter_Interface */ @@ -30,16 +30,16 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21892 2010-04-16 19:15:20Z juokaz $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ -abstract class Zend_Log_Filter_Abstract +abstract class Zend_Log_Filter_Abstract implements Zend_Log_Filter_Interface, Zend_Log_FactoryInterface { /** * Validate and optionally convert the config to array - * + * * @param array|Zend_Config $config Zend_Config or Array * @return array * @throws Zend_Log_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Filter/Interface.php --- a/web/lib/Zend/Log/Filter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Filter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,18 +15,18 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ interface Zend_Log_Filter_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Filter/Message.php --- a/web/lib/Zend/Log/Filter/Message.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Filter/Message.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20981 2010-02-08 15:51:02Z matthew $ + * @version $Id: Message.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Filter_Abstract */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20981 2010-02-08 15:51:02Z matthew $ + * @version $Id: Message.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract { @@ -42,6 +42,7 @@ * Filter out any log messages not matching $regexp. * * @param string $regexp Regular expression to test the log message + * @return void * @throws Zend_Log_Exception */ public function __construct($regexp) @@ -55,12 +56,11 @@ /** * Create a new instance of Zend_Log_Filter_Message - * + * * @param array|Zend_Config $config * @return Zend_Log_Filter_Message - * @throws Zend_Log_Exception */ - static public function factory($config) + static public function factory($config) { $config = self::_parseConfig($config); $config = array_merge(array( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Filter/Priority.php --- a/web/lib/Zend/Log/Filter/Priority.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Filter/Priority.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Priority.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Priority.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Filter_Abstract */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Priority.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Priority.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract { @@ -49,11 +49,12 @@ * * @param integer $priority Priority * @param string $operator Comparison operator + * @return void * @throws Zend_Log_Exception */ - public function __construct($priority, $operator = NULL) + public function __construct($priority, $operator = null) { - if (! is_integer($priority)) { + if (! is_int($priority)) { require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Priority must be an integer'); } @@ -64,16 +65,15 @@ /** * Create a new instance of Zend_Log_Filter_Priority - * + * * @param array|Zend_Config $config * @return Zend_Log_Filter_Priority - * @throws Zend_Log_Exception */ - static public function factory($config) + static public function factory($config) { $config = self::_parseConfig($config); $config = array_merge(array( - 'priority' => null, + 'priority' => null, 'operator' => null, ), $config); @@ -83,7 +83,7 @@ } return new self( - (int) $config['priority'], + (int) $config['priority'], $config['operator'] ); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Filter/Suppress.php --- a/web/lib/Zend/Log/Filter/Suppress.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Filter/Suppress.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Suppress.php 22977 2010-09-19 12:44:00Z intiilapa $ + * @version $Id: Suppress.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Filter_Interface */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Suppress.php 22977 2010-09-19 12:44:00Z intiilapa $ + * @version $Id: Suppress.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Filter_Suppress extends Zend_Log_Filter_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Formatter/Abstract.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Log/Formatter/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,40 @@ +toArray(); + } + + if (array_key_exists('format', $options)) { + $format = $options['format']; + } + } + + return new self($format); + } + + /** * Formats data into a single line to be written by the writer. * * @param array $event event data @@ -69,17 +92,17 @@ public function format($event) { $output = $this->_format; + foreach ($event as $name => $value) { - if ((is_object($value) && !method_exists($value,'__toString')) - || is_array($value)) { - + || is_array($value) + ) { $value = gettype($value); } $output = str_replace("%$name%", $value, $output); } + return $output; } - -} +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Formatter/Xml.php --- a/web/lib/Zend/Log/Formatter/Xml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Formatter/Xml.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,31 +15,31 @@ * @category Zend * @package Zend_Log * @subpackage Formatter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ */ -/** Zend_Log_Formatter_Interface */ -require_once 'Zend/Log/Formatter/Interface.php'; +/** Zend_Log_Formatter_Abstract */ +require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend * @package Zend_Log * @subpackage Formatter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ */ -class Zend_Log_Formatter_Xml implements Zend_Log_Formatter_Interface +class Zend_Log_Formatter_Xml extends Zend_Log_Formatter_Abstract { /** - * @var Relates XML elements to log data field keys. + * @var string Name of root element */ protected $_rootElement; /** - * @var Relates XML elements to log data field keys. + * @var array Relates XML elements to log data field keys. */ protected $_elementMap; @@ -50,16 +50,56 @@ /** * Class constructor + * (the default encoding is UTF-8) * - * @param string $rootElement Name of root element - * @param array $elementMap - * @param string $encoding Encoding to use (defaults to UTF-8) + * @param array|Zend_Config $options + * @return void */ - public function __construct($rootElement = 'logEntry', $elementMap = null, $encoding = 'UTF-8') + public function __construct($options = array()) { - $this->_rootElement = $rootElement; - $this->_elementMap = $elementMap; - $this->setEncoding($encoding); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } elseif (!is_array($options)) { + $args = func_get_args(); + + $options = array( + 'rootElement' => array_shift($args) + ); + + if (count($args)) { + $options['elementMap'] = array_shift($args); + } + + if (count($args)) { + $options['encoding'] = array_shift($args); + } + } + + if (!array_key_exists('rootElement', $options)) { + $options['rootElement'] = 'logEntry'; + } + + if (!array_key_exists('encoding', $options)) { + $options['encoding'] = 'UTF-8'; + } + + $this->_rootElement = $options['rootElement']; + $this->setEncoding($options['encoding']); + + if (array_key_exists('elementMap', $options)) { + $this->_elementMap = $options['elementMap']; + } + } + + /** + * Factory for Zend_Log_Formatter_Xml classe + * + * @param array|Zend_Config $options + * @return Zend_Log_Formatter_Xml + */ + public static function factory($options) + { + return new self($options); } /** @@ -106,10 +146,15 @@ $elt = $dom->appendChild(new DOMElement($this->_rootElement)); foreach ($dataToInsert as $key => $value) { - if($key == "message") { - $value = htmlspecialchars($value, ENT_COMPAT, $enc); + if (empty($value) + || is_scalar($value) + || (is_object($value) && method_exists($value,'__toString')) + ) { + if($key == "message") { + $value = htmlspecialchars($value, ENT_COMPAT, $enc); + } + $elt->appendChild(new DOMElement($key, (string)$value)); } - $elt->appendChild(new DOMElement($key, $value)); } $xml = $dom->saveXML(); @@ -117,5 +162,4 @@ return $xml . PHP_EOL; } - } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Abstract.php --- a/web/lib/Zend/Log/Writer/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22567 2010-07-16 03:32:31Z ramon $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Filter_Priority */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22567 2010-07-16 03:32:31Z ramon $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface { @@ -40,6 +40,7 @@ /** * Formats the log message before writing. + * * @var Zend_Log_Formatter_Interface */ protected $_formatter; @@ -48,11 +49,11 @@ * Add a filter specific to this writer. * * @param Zend_Log_Filter_Interface $filter - * @return void + * @return Zend_Log_Writer_Abstract */ public function addFilter($filter) { - if (is_integer($filter)) { + if (is_int($filter)) { $filter = new Zend_Log_Filter_Priority($filter); } @@ -69,7 +70,7 @@ /** * Log a message to this writer. * - * @param array $event log data event + * @param array $event log data event * @return void */ public function write($event) @@ -88,7 +89,7 @@ * Set a new formatter for this writer * * @param Zend_Log_Formatter_Interface $formatter - * @return void + * @return Zend_Log_Writer_Abstract */ public function setFormatter(Zend_Log_Formatter_Interface $formatter) { @@ -128,8 +129,8 @@ if (!is_array($config)) { require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( - 'Configuration must be an array or instance of Zend_Config' - ); + 'Configuration must be an array or instance of Zend_Config' + ); } return $config; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Db.php --- a/web/lib/Zend/Log/Writer/Db.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Db.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 22513 2010-07-01 13:48:39Z ramon $ + * @version $Id: Db.php 25247 2013-02-01 17:49:40Z frosch $ */ /** Zend_Log_Writer_Abstract */ @@ -27,30 +27,32 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 22513 2010-07-01 13:48:39Z ramon $ + * @version $Id: Db.php 25247 2013-02-01 17:49:40Z frosch $ */ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract { /** * Database adapter instance + * * @var Zend_Db_Adapter */ - private $_db; + protected $_db; /** * Name of the log table in the database + * * @var string */ - private $_table; + protected $_table; /** * Relates database columns names to log data field keys. * * @var null|array */ - private $_columnMap; + protected $_columnMap; /** * Class constructor @@ -58,6 +60,7 @@ * @param Zend_Db_Adapter $db Database adapter instance * @param string $table Log table in database * @param array $columnMap + * @return void */ public function __construct($db, $table, $columnMap = null) { @@ -71,7 +74,6 @@ * * @param array|Zend_Config $config * @return Zend_Log_Writer_Db - * @throws Zend_Log_Exception */ static public function factory($config) { @@ -95,6 +97,9 @@ /** * Formatting is not possible on this writer + * + * @return void + * @throws Zend_Log_Exception */ public function setFormatter(Zend_Log_Formatter_Interface $formatter) { @@ -117,6 +122,7 @@ * * @param array $event event data * @return void + * @throws Zend_Log_Exception */ protected function _write($event) { @@ -130,7 +136,9 @@ } else { $dataToInsert = array(); foreach ($this->_columnMap as $columnName => $fieldKey) { - $dataToInsert[$columnName] = $event[$fieldKey]; + if (isset($event[$fieldKey])) { + $dataToInsert[$columnName] = $event[$fieldKey]; + } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Firebug.php --- a/web/lib/Zend/Log/Writer/Firebug.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Firebug.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Firebug.php 23066 2010-10-09 23:29:20Z cadorn $ + * @version $Id: Firebug.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log */ @@ -38,14 +38,14 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract { - /** * Maps logging priorities to logging display styles + * * @var array */ protected $_priorityStyles = array(Zend_Log::EMERG => Zend_Wildfire_Plugin_FirePhp::ERROR, @@ -59,18 +59,22 @@ /** * The default logging style for un-mapped priorities + * * @var string */ protected $_defaultPriorityStyle = Zend_Wildfire_Plugin_FirePhp::LOG; /** * Flag indicating whether the log writer is enabled + * * @var boolean */ protected $_enabled = true; /** * Class constructor + * + * @return void */ public function __construct() { @@ -80,13 +84,12 @@ $this->_formatter = new Zend_Log_Formatter_Firebug(); } - + /** * Create a new instance of Zend_Log_Writer_Firebug - * + * * @param array|Zend_Config $config * @return Zend_Log_Writer_Firebug - * @throws Zend_Log_Exception */ static public function factory($config) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Mail.php --- a/web/lib/Zend/Log/Writer/Mail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Mail.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 22971 2010-09-18 20:32:24Z mikaelkael $ + * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -39,9 +39,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 22971 2010-09-18 20:32:24Z mikaelkael $ + * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Writer_Mail extends Zend_Log_Writer_Abstract { @@ -106,7 +106,7 @@ * @var array */ protected static $_methodMapHeaders = array( - 'from' => 'setFrom', + 'from' => 'setFrom', 'to' => 'addTo', 'cc' => 'addCc', 'bcc' => 'addBcc', @@ -148,7 +148,7 @@ $writer->setLayout($config); } if (isset($config['layoutFormatter'])) { - $layoutFormatter = new $config['layoutFormatter']; + $layoutFormatter = new $config['layoutFormatter']; $writer->setLayoutFormatter($layoutFormatter); } if (isset($config['subjectPrependText'])) { @@ -185,6 +185,7 @@ * * @param array $config * @return Zend_Mail + * @throws Zend_Log_Exception */ protected static function _constructMailFromConfig(array $config) { @@ -213,8 +214,8 @@ && !is_numeric($address['name']) ) { $params = array( - $address['email'], - $address['name'] + $address['email'], + $address['name'] ); } else if (is_array($address) && isset($address['email'])) { $params = array($address['email']); @@ -233,6 +234,7 @@ * * @param array $config * @return Zend_Layout + * @throws Zend_Log_Exception */ protected function _constructLayoutFromConfig(array $config) { @@ -331,6 +333,7 @@ * * @param string $subject Subject prepend text. * @return Zend_Log_Writer_Mail + * @throws Zend_Log_Exception */ public function setSubjectPrependText($subject) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Mock.php --- a/web/lib/Zend/Log/Writer/Mock.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Mock.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mock.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mock.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -27,19 +27,23 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mock.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mock.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Writer_Mock extends Zend_Log_Writer_Abstract { /** * array of log events + * + * @var array */ public $events = array(); /** * shutdown called? + * + * @var boolean */ public $shutdown = false; @@ -66,12 +70,11 @@ /** * Create a new instance of Zend_Log_Writer_Mock - * + * * @param array|Zend_Config $config * @return Zend_Log_Writer_Mock - * @throws Zend_Log_Exception */ - static public function factory($config) + static public function factory($config) { return new self(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Null.php --- a/web/lib/Zend/Log/Writer/Null.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Null.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Writer_Null extends Zend_Log_Writer_Abstract { @@ -42,13 +42,12 @@ protected function _write($event) { } - + /** * Create a new instance of Zend_Log_Writer_Null - * + * * @param array|Zend_Config $config * @return Zend_Log_Writer_Null - * @throws Zend_Log_Exception */ static public function factory($config) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Stream.php --- a/web/lib/Zend/Log/Writer/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -30,14 +30,15 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract { /** * Holds the PHP stream to log to. + * * @var null|stream */ protected $_stream = null; @@ -45,13 +46,15 @@ /** * Class Constructor * - * @param streamOrUrl Stream or URL to open as a stream - * @param mode Mode, only applicable if a URL is given + * @param array|string|resource $streamOrUrl Stream or URL to open as a stream + * @param string|null $mode Mode, only applicable if a URL is given + * @return void + * @throws Zend_Log_Exception */ - public function __construct($streamOrUrl, $mode = NULL) + public function __construct($streamOrUrl, $mode = null) { // Setting the default - if ($mode === NULL) { + if (null === $mode) { $mode = 'a'; } @@ -81,30 +84,29 @@ $this->_formatter = new Zend_Log_Formatter_Simple(); } - + /** - * Create a new instance of Zend_Log_Writer_Mock - * + * Create a new instance of Zend_Log_Writer_Stream + * * @param array|Zend_Config $config - * @return Zend_Log_Writer_Mock - * @throws Zend_Log_Exception + * @return Zend_Log_Writer_Stream */ static public function factory($config) { $config = self::_parseConfig($config); $config = array_merge(array( - 'stream' => null, + 'stream' => null, 'mode' => null, ), $config); - $streamOrUrl = isset($config['url']) ? $config['url'] : $config['stream']; - + $streamOrUrl = isset($config['url']) ? $config['url'] : $config['stream']; + return new self( - $streamOrUrl, + $streamOrUrl, $config['mode'] ); } - + /** * Close the stream resource. * @@ -122,6 +124,7 @@ * * @param array $event event data * @return void + * @throws Zend_Log_Exception */ protected function _write($event) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/Syslog.php --- a/web/lib/Zend/Log/Writer/Syslog.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/Syslog.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Syslog.php 22977 2010-09-19 12:44:00Z intiilapa $ + * @version $Id: Syslog.php 25024 2012-07-30 15:08:15Z rob $ */ /** Zend_Log */ @@ -32,13 +32,14 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract { /** * Maps Zend_Log priorities to PHP's syslog priorities + * * @var array */ protected $_priorities = array( @@ -54,36 +55,41 @@ /** * The default log priority - for unmapped custom priorities + * * @var string */ protected $_defaultPriority = LOG_NOTICE; /** * Last application name set by a syslog-writer instance + * * @var string */ protected static $_lastApplication; /** * Last facility name set by a syslog-writer instance + * * @var string */ protected static $_lastFacility; /** * Application name used by this syslog-writer instance + * * @var string */ protected $_application = 'Zend_Log'; /** * Facility used by this syslog-writer instance + * * @var int */ protected $_facility = LOG_USER; /** - * _validFacilities + * Types of program available to logging of message * * @var array */ @@ -92,7 +98,7 @@ /** * Class constructor * - * @param array $options Array of options; may include "application" and "facility" keys + * @param array $params Array of options; may include "application" and "facility" keys * @return void */ public function __construct(array $params = array()) @@ -103,7 +109,7 @@ $runInitializeSyslog = true; if (isset($params['facility'])) { - $this->_facility = $this->setFacility($params['facility']); + $this->setFacility($params['facility']); $runInitializeSyslog = false; } @@ -117,7 +123,6 @@ * * @param array|Zend_Config $config * @return Zend_Log_Writer_Syslog - * @throws Zend_Log_Exception */ static public function factory($config) { @@ -176,7 +181,7 @@ * Set syslog facility * * @param int $facility Syslog facility - * @return void + * @return Zend_Log_Writer_Syslog * @throws Zend_Log_Exception for invalid log facility */ public function setFacility($facility) @@ -210,7 +215,7 @@ * Set application name * * @param string $application Application name - * @return void + * @return Zend_Log_Writer_Syslog */ public function setApplicationName($application) { @@ -235,7 +240,7 @@ /** * Write a message to syslog. * - * @param array $event event data + * @param array $event event data * @return void */ protected function _write($event) @@ -252,6 +257,11 @@ $this->_initializeSyslog(); } - syslog($priority, $event['message']); + $message = $event['message']; + if ($this->_formatter instanceof Zend_Log_Formatter_Interface) { + $message = $this->_formatter->format($event); + } + + syslog($priority, $message); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Log/Writer/ZendMonitor.php --- a/web/lib/Zend/Log/Writer/ZendMonitor.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Log/Writer/ZendMonitor.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendMonitor.php 23351 2010-11-16 18:09:45Z matthew $ + * @version $Id: ZendMonitor.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -27,26 +27,28 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendMonitor.php 23351 2010-11-16 18:09:45Z matthew $ + * @version $Id: ZendMonitor.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Writer_ZendMonitor extends Zend_Log_Writer_Abstract { /** * Is Zend Monitor enabled? - * @var bool + * + * @var boolean */ protected $_isEnabled = true; /** * Is this for a Zend Server intance? - * @var bool + * + * @var boolean */ protected $_isZendServer = false; /** - * @throws Zend_Log_Exception if Zend Monitor extension not present + * @return void */ public function __construct() { @@ -62,8 +64,7 @@ * Create a new instance of Zend_Log_Writer_ZendMonitor * * @param array|Zend_Config $config - * @return Zend_Log_Writer_Syslog - * @throws Zend_Log_Exception + * @return Zend_Log_Writer_ZendMonitor */ static public function factory($config) { @@ -77,7 +78,7 @@ * fail silently. You can query this method to determine if the log * writer is enabled. * - * @return bool + * @return boolean */ public function isEnabled() { @@ -87,7 +88,7 @@ /** * Log a message to this writer. * - * @param array $event log data event + * @param array $event log data event * @return void */ public function write($event) @@ -102,7 +103,7 @@ /** * Write a message to the log. * - * @param array $event log data event + * @param array $event log data event * @return void */ protected function _write($event) @@ -116,10 +117,10 @@ // On Zend Server; third argument should be the event zend_monitor_custom_event($priority, $message, $event); } else { - // On Zend Platform; third argument is severity -- either + // On Zend Platform; third argument is severity -- either // 0 or 1 -- and fourth is optional (event) // Severity is either 0 (normal) or 1 (severe); classifying - // notice, info, and debug as "normal", and all others as + // notice, info, and debug as "normal", and all others as // "severe" monitor_custom_event($priority, $message, ($priority > 4) ? 0 : 1, $event); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail.php --- a/web/lib/Zend/Mail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 23251 2010-10-26 12:47:55Z matthew $ + * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -46,7 +46,7 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail extends Zend_Mime_Message @@ -1264,8 +1264,7 @@ return $email; } else { $encodedName = $this->_encodeHeader($name); - if ($encodedName === $name && - ((strpos($name, '@') !== false) || (strpos($name, ',') !== false))) { + if ($encodedName === $name && strcspn($name, '()<>[]:;@\\,') != strlen($name)) { $format = '"%s" <%s>'; } else { $format = '%s <%s>'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Exception.php --- a/web/lib/Zend/Mail/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Message.php --- a/web/lib/Zend/Mail/Message.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Message.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Message extends Zend_Mail_Part implements Zend_Mail_Message_Interface @@ -73,7 +73,7 @@ if (!empty($params['flags'])) { // set key and value to the same value for easy lookup - $this->_flags = array_combine($params['flags'], $params['flags']); + $this->_flags = array_merge($this->_flags, array_combine($params['flags'],$params['flags'])); } parent::__construct($params); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Message/File.php --- a/web/lib/Zend/Mail/Message/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Message/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Message_File extends Zend_Mail_Part_File implements Zend_Mail_Message_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Message/Interface.php --- a/web/lib/Zend/Mail/Message/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Message/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Part.php --- a/web/lib/Zend/Mail/Part.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Part.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Part.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Part.php 24759 2012-05-05 02:58:55Z adamlundrigan $ */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface @@ -86,6 +86,12 @@ * @var int */ protected $_messageNum = 0; + + /** + * Class to use when creating message parts + * @var string + */ + protected $_partClass; /** * Public constructor @@ -122,6 +128,10 @@ $this->_mail = $params['handler']; $this->_messageNum = $params['id']; } + + if (isset($params['partclass'])) { + $this->setPartClass($params['partclass']); + } if (isset($params['raw'])) { Zend_Mime_Decode::splitMessage($params['raw'], $this->_headers, $this->_content); @@ -140,6 +150,44 @@ } } } + + /** + * Set name pf class used to encapsulate message parts + * @param string $class + * @return Zend_Mail_Part + */ + public function setPartClass($class) + { + if ( !class_exists($class) ) { + /** + * @see Zend_Mail_Exception + */ + require_once 'Zend/Mail/Exception.php'; + throw new Zend_Mail_Exception("Class '{$class}' does not exist"); + } + if ( !is_subclass_of($class, 'Zend_Mail_Part_Interface') ) { + /** + * @see Zend_Mail_Exception + */ + require_once 'Zend/Mail/Exception.php'; + throw new Zend_Mail_Exception("Class '{$class}' must implement Zend_Mail_Part_Interface"); + } + + $this->_partClass = $class; + return $this; + } + + /** + * Retrieve the class name used to encapsulate message parts + * @return string + */ + public function getPartClass() + { + if ( !$this->_partClass ) { + $this->_partClass = __CLASS__; + } + return $this->_partClass; + } /** * Check if part is a multipart message @@ -223,9 +271,10 @@ if ($parts === null) { return; } + $partClass = $this->getPartClass(); $counter = 1; foreach ($parts as $part) { - $this->_parts[$counter++] = new self(array('headers' => $part['header'], 'content' => $part['body'])); + $this->_parts[$counter++] = new $partClass(array('headers' => $part['header'], 'content' => $part['body'])); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Part/File.php --- a/web/lib/Zend/Mail/Part/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Part/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Part_File extends Zend_Mail_Part diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Part/Interface.php --- a/web/lib/Zend/Mail/Part/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Part/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Abstract.php --- a/web/lib/Zend/Mail/Protocol/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22602 2010-07-16 22:37:31Z freak $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -42,9 +42,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22602 2010-07-16 22:37:31Z freak $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ * @todo Implement proxy settings */ abstract class Zend_Mail_Protocol_Abstract @@ -161,8 +161,8 @@ } /** - * Set the maximum log size - * + * Set the maximum log size + * * @param integer $maximumLog Maximum log size * @return void */ @@ -170,18 +170,18 @@ { $this->_maximumLog = (int) $maximumLog; } - - + + /** - * Get the maximum log size - * + * Get the maximum log size + * * @return int the maximum log size */ public function getMaximumLog() { return $this->_maximumLog; } - + /** * Create a connection to the remote host @@ -277,7 +277,7 @@ throw new Zend_Mail_Protocol_Exception($errorStr); } - if (($result = stream_set_timeout($this->_socket, self::TIMEOUT_CONNECTION)) === false) { + if (($result = $this->_setStreamTimeout(self::TIMEOUT_CONNECTION)) === false) { /** * @see Zend_Mail_Protocol_Exception */ @@ -357,7 +357,7 @@ // Adapters may wish to supply per-commend timeouts according to appropriate RFC if ($timeout !== null) { - stream_set_timeout($this->_socket, $timeout); + $this->_setStreamTimeout($timeout); } // Retrieve response @@ -428,9 +428,20 @@ * @see Zend_Mail_Protocol_Exception */ require_once 'Zend/Mail/Protocol/Exception.php'; - throw new Zend_Mail_Protocol_Exception($errMsg); + throw new Zend_Mail_Protocol_Exception($errMsg, $cmd); } return $msg; } + + /** + * Set stream timeout + * + * @param integer $timeout + * @return boolean + */ + protected function _setStreamTimeout($timeout) + { + return stream_set_timeout($this->_socket, $timeout); + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Exception.php --- a/web/lib/Zend/Mail/Protocol/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Exception extends Zend_Mail_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Imap.php --- a/web/lib/Zend/Mail/Protocol/Imap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Imap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imap.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Imap diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Pop3.php --- a/web/lib/Zend/Mail/Protocol/Pop3.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Pop3.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pop3.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Pop3 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Smtp.php --- a/web/lib/Zend/Mail/Protocol/Smtp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Smtp.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smtp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Smtp.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract @@ -327,7 +327,7 @@ /** - * Issues the RSET command end validates answer + * Issues the RSET command and validates answer * * Can be used to restore a clean smtp communication state when a transaction has been cancelled or commencing a new transaction. * @@ -346,7 +346,7 @@ /** - * Issues the NOOP command end validates answer + * Issues the NOOP command and validates answer * * Not used by Zend_Mail, could be used to keep a connection alive or check if it is still open. * @@ -360,7 +360,7 @@ /** - * Issues the VRFY command end validates answer + * Issues the VRFY command and validates answer * * Not used by Zend_Mail. * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php --- a/web/lib/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crammd5.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Crammd5.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Crammd5 extends Zend_Mail_Protocol_Smtp diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Smtp/Auth/Login.php --- a/web/lib/Zend/Mail/Protocol/Smtp/Auth/Login.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Smtp/Auth/Login.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Login.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Login.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Login extends Zend_Mail_Protocol_Smtp diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Protocol/Smtp/Auth/Plain.php --- a/web/lib/Zend/Mail/Protocol/Smtp/Auth/Plain.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Protocol/Smtp/Auth/Plain.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Plain.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Plain.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Plain extends Zend_Mail_Protocol_Smtp diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage.php --- a/web/lib/Zend/Mail/Storage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Abstract.php --- a/web/lib/Zend/Mail/Storage/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, SeekableIterator @@ -119,7 +119,7 @@ /** * Get a message with headers and body * - * @param $id int number of message + * @param int $id number of message * @return Zend_Mail_Message */ abstract public function getMessage($id); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Exception.php --- a/web/lib/Zend/Mail/Storage/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Exception extends Zend_Mail_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Folder.php --- a/web/lib/Zend/Mail/Storage/Folder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Folder.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Folder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Folder.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder implements RecursiveIterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Folder/Interface.php --- a/web/lib/Zend/Mail/Storage/Folder/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Folder/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Mail_Storage_Folder_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Folder/Maildir.php --- a/web/lib/Zend/Mail/Storage/Folder/Maildir.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Folder/Maildir.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir implements Zend_Mail_Storage_Folder_Interface @@ -77,7 +77,7 @@ * - delim delim char for folder structur, default is '.' * - folder intial selected folder, default is 'INBOX' * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Folder/Mbox.php --- a/web/lib/Zend/Mail/Storage/Folder/Mbox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Folder/Mbox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mbox.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Zend_Mail_Storage_Folder_Interface @@ -73,7 +73,7 @@ * - dirname rootdir of mbox structure * - folder intial selected folder, default is 'INBOX' * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Imap.php --- a/web/lib/Zend/Mail/Storage/Imap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Imap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imap.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -60,7 +60,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Maildir.php --- a/web/lib/Zend/Mail/Storage/Maildir.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Maildir.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract @@ -257,7 +257,7 @@ * Supported parameters are: * - dirname dirname of mbox file * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Mbox.php --- a/web/lib/Zend/Mail/Storage/Mbox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Mbox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mbox.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract @@ -216,7 +216,7 @@ * Supported parameters are: * - filename filename of mbox file * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Pop3.php --- a/web/lib/Zend/Mail/Storage/Pop3.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Pop3.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pop3.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract @@ -154,7 +154,7 @@ * - port port for POP3 server [optional, default = 110] * - ssl 'SSL' or 'TLS' for secure sockets * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception * @throws Zend_Mail_Protocol_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Writable/Interface.php --- a/web/lib/Zend/Mail/Storage/Writable/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Writable/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Storage/Writable/Maildir.php --- a/web/lib/Zend/Mail/Storage/Writable/Maildir.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Storage/Writable/Maildir.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Maildir @@ -105,7 +105,7 @@ * Additional parameters are (see parent for more): * - create if true a new maildir is create if none exists * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Transport/Abstract.php --- a/web/lib/Zend/Mail/Transport/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Transport/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Mail_Transport_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Transport/Exception.php --- a/web/lib/Zend/Mail/Transport/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Transport/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Exception extends Zend_Mail_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Transport/File.php --- a/web/lib/Zend/Mail/Transport/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Transport/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_File extends Zend_Mail_Transport_Abstract @@ -86,7 +86,7 @@ */ public function setOptions(array $options) { - if (isset($options['path'])&& is_dir($options['path'])) { + if (isset($options['path']) && is_dir($options['path'])) { $this->_path = $options['path']; } if (isset($options['callback']) && is_callable($options['callback'])) { @@ -127,7 +127,7 @@ * @param Zend_Mail_Transport_File File transport instance * @return string */ - public function defaultCallback($transport) + public function defaultCallback($transport) { return 'ZendMail_' . $_SERVER['REQUEST_TIME'] . '_' . mt_rand() . '.tmp'; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Transport/Sendmail.php --- a/web/lib/Zend/Mail/Transport/Sendmail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Transport/Sendmail.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sendmail.php 21603 2010-03-22 12:47:11Z yoshida@zend.co.jp $ + * @version $Id: Sendmail.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract @@ -74,14 +74,14 @@ */ public function __construct($parameters = null) { - if ($parameters instanceof Zend_Config) { - $parameters = $parameters->toArray(); + if ($parameters instanceof Zend_Config) { + $parameters = $parameters->toArray(); } - if (is_array($parameters)) { + if (is_array($parameters)) { $parameters = implode(' ', $parameters); } - + $this->parameters = $parameters; } @@ -109,7 +109,7 @@ if(!is_string($this->parameters)) { /** * @see Zend_Mail_Transport_Exception - * + * * Exception is thrown here because * $parameters is a public property */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mail/Transport/Smtp.php --- a/web/lib/Zend/Mail/Transport/Smtp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mail/Transport/Smtp.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smtp.php 23424 2010-11-22 22:42:55Z bittarman $ + * @version $Id: Smtp.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -45,7 +45,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract @@ -111,7 +111,7 @@ * @param string $host OPTIONAL (Default: 127.0.0.1) * @param array|null $config OPTIONAL (Default: null) * @return void - * + * * @todo Someone please make this compatible * with the SendMail transport class. */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup.php --- a/web/lib/Zend/Markup.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Markup.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Markup.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Exception.php --- a/web/lib/Zend/Markup/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,10 +27,10 @@ /** * Exception class for Zend_Markup * - * @category Zend + * @category Zend * @uses Zend_Exception * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Parser/Bbcode.php --- a/web/lib/Zend/Markup/Parser/Bbcode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Parser/Bbcode.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bbcode.php 21127 2010-02-21 15:35:03Z kokx $ + * @version $Id: Bbcode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Parser_Bbcode implements Zend_Markup_Parser_ParserInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Parser/Exception.php --- a/web/lib/Zend/Markup/Parser/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Parser/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,11 +28,11 @@ /** * Exception class for Zend_Markup_Parser * - * @category Zend + * @category Zend * @uses Zend_Markup_Exception * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Parser_Exception extends Zend_Markup_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Parser/ParserInterface.php --- a/web/lib/Zend/Markup/Parser/ParserInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Parser/ParserInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ParserInterface.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: ParserInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Markup_Parser_ParserInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Parser/Textile.php --- a/web/lib/Zend/Markup/Parser/Textile.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,570 +0,0 @@ -[a-zA-Z0-9_]+)?(?:\#(?[a-zA-Z0-9_]+))?\)'; - const MATCH_ATTR_STYLE = "\{(?[^\}\n]+)\}"; - const MATCH_ATTR_LANG = '\[(?[a-zA-Z_]+)\]'; - const MATCH_ATTR_ALIGN = '(?\<\>?|\>|=)'; - - - - /** - * Token tree - * - * @var Zend_Markup_TokenList - */ - protected $_tree; - - /** - * Current token - * - * @var Zend_Markup_Token - */ - protected $_current; - - /** - * Source to tokenize - * - * @var string - */ - protected $_value = ''; - - /** - * Length of the value - * - * @var int - */ - protected $_valueLen = 0; - - /** - * Current pointer - * - * @var int - */ - protected $_pointer = 0; - - /** - * The buffer - * - * @var string - */ - protected $_buffer = ''; - - /** - * Simple tag translation - * - * @var array - */ - protected $_simpleTags = array( - '*' => 'strong', - '**' => 'bold', - '_' => 'emphasized', - '__' => 'italic', - '??' => 'citation', - '-' => 'deleted', - '+' => 'insert', - '^' => 'superscript', - '~' => 'subscript', - '%' => 'span', - // these are a little more complicated - '@' => 'code', - '!' => 'img', - ); - - /** - * Token array - * - * @var array - */ - protected $_tokens = array(); - - - /** - * Prepare the parsing of a Textile string, the real parsing is done in {@link _parse()} - * - * @param string $value - * - * @return array - */ - public function parse($value) - { - if (!is_string($value)) { - /** - * @see Zend_Markup_Parser_Exception - */ - require_once 'Zend/Markup/Parser/Exception.php'; - throw new Zend_Markup_Parser_Exception('Value to parse should be a string.'); - } - if (empty($value)) { - /** - * @see Zend_Markup_Parser_Exception - */ - require_once 'Zend/Markup/Parser/Exception.php'; - throw new Zend_Markup_Parser_Exception('Value to parse cannot be left empty.'); - } - - // first make we only have LF newlines, also trim the value - $this->_value = str_replace(array("\r\n", "\r"), "\n", $value); - $this->_value = trim($this->_value); - - // initialize variables and tokenize - $this->_valueLen = iconv_strlen($this->_value, 'UTF-8'); - $this->_pointer = 0; - $this->_buffer = ''; - $this->_temp = array(); - $this->_tokens = array(); - - $this->_tokenize(); - - // create the tree - $this->_tree = new Zend_Markup_TokenList(); - - $this->_current = new Zend_Markup_Token('', Zend_Markup_Token::TYPE_NONE, 'Zend_Markup_Root'); - $this->_tree->addChild($this->_current); - - $this->_createTree(); - - return $this->_tree; - } - - /** - * Tokenize a textile string - * - * @return array - */ - protected function _tokenize() - { - $state = self::STATE_NEW_PARAGRAPH; - - $attrsMatch = implode('|', array( - self::MATCH_ATTR_CLASSID, - self::MATCH_ATTR_STYLE, - self::MATCH_ATTR_LANG, - self::MATCH_ATTR_ALIGN - )); - - $paragraph = ''; - - while ($this->_pointer < $this->_valueLen) { - switch ($state) { - case self::STATE_SCAN: - $matches = array(); //[^\n*_?+~%@!-] - $acronym = '(?[A-Z]{2,})$(?[^$]+)\)'; - $regex = '#\G(?<text>.*?)(?:' - . "(?:(?<nl_paragraph>\n{2,})|(?<nl_break>\n))|" - . '(?<tag>' - . "(?<name>\*{1,2}|_{1,2}|\?{2}|\-|\+|\~|\^|%|@|!|$|{$acronym}" - . '|":(?<url>[^\s]+)|")' - . "(?:{$attrsMatch})*)" - . ')#si'; - preg_match($regex, $this->_value, $matches, null, $this->_pointer); - - $this->_pointer += strlen($matches[0]); - - if (!empty($matches['text'])) { - $this->_buffer .= $matches['text']; - } - - // first add the buffer - if (!empty($this->_buffer)) { - $this->_tokens[] = array( - 'tag' => $this->_buffer, - 'type' => Zend_Markup_Token::TYPE_NONE - ); - $this->_buffer = ''; - } - - if (!empty($matches['nl_paragraph'])) { - $this->_temp = array( - 'tag' => $matches['nl_paragraph'], - 'name' => 'p', - 'type' => Zend_Markup_Token::TYPE_TAG, - 'attributes' => array() - ); - - $state = self::STATE_NEW_PARAGRAPH; - } elseif (!empty($matches['nl_break'])) { - $this->_tokens[] = array( - 'tag' => $matches['nl_break'], - 'name' => 'break', - 'type' => Zend_Markup_Token::TYPE_TAG, - 'attributes' => array() - ); - - $state = self::STATE_NEWLINE; - } elseif (!empty($matches['tag'])) { - if (isset($this->_simpleTags[$matches['name']])) { - // now add the new token - $this->_tokens[] = array( - 'tag' => $matches['tag'], - 'type' => Zend_Markup_Token::TYPE_TAG, - 'name' => $this->_simpleTags[$matches['name']], - 'attributes' => $this->_extractAttributes($matches) - ); - } else { - $attributes = $this->_extractAttributes($matches); - if ($matches['tag'][0] == '"') { - $name = 'url'; - if (isset($matches['url'])) { - $attributes['url'] = $matches['url']; - } - $this->_tokens[] = array( - 'tag' => $matches['tag'], - 'type' => Zend_Markup_Token::TYPE_TAG, - 'name' => $name, - 'attributes' => $attributes - ); - } else { - $name = 'acronym'; - $this->_tokens[] = array( - 'tag' => '', - 'type' => Zend_Markup_Token::TYPE_TAG, - 'name' => 'acronym', - 'attributes' => array( - 'title' => $matches['title'] - ) - ); - $this->_tokens[] = array( - 'tag' => $matches['acronym'], - 'type' => Zend_Markup_Token::TYPE_NONE - ); - $this->_tokens[] = array( - 'tag' => '(' . $matches['title'] . ')', - 'type' => Zend_Markup_Token::TYPE_TAG, - 'name' => 'acronym', - 'attributes' => array() - ); - } - } - $state = self::STATE_SCAN; - } - - break; - case self::STATE_NEW_PARAGRAPH: - if (empty($this->_temp)) { - $this->_temp = array( - 'tag' => '', - 'name' => 'p', - 'type' => Zend_Markup_token::TYPE_TAG, - 'attributes' => array() - ); - } else { - $this->_tokens[] = array( - 'tag' => "\n", - 'name' => 'p', - 'type' => Zend_Markup_Token::TYPE_TAG, - 'attributes' => array() - ); - $this->_temp['tag'] = substr($this->_temp['tag'], 1); - } - - $matches = array(); //[^\n*_?+~%@!-] ($)? [^()]+ (?(1)$) - $regex = "#\G(?<name>(h[1-6]|p)|(?:\#|\*))(?:{$attrsMatch})*(?(2)\.\s|\s)#i"; - if (!preg_match($regex, $this->_value, $matches, null, $this->_pointer)) { - $this->_tokens[] = $this->_temp; - $state = self::STATE_SCAN; - break; - } - - $this->_pointer += strlen($matches[0]); - - if ($matches['name'] == 'p') { - $this->_temp['tag'] .= $matches[0]; - $this->_temp['attributes'] = $this->_extractAttributes($matches); - - $this->_tokens[] = $this->_temp; - $this->_temp = array(); - } else { - $this->_tokens[] = $this->_temp; - $this->_temp = array(); - - $name = $matches['name']; - $attributes = $this->_extractAttributes($matches); - - if ($name == '#') { - $name = 'list'; - $attributes['list'] = 'decimal'; - } elseif ($name == '*') { - $name = 'list'; - } - - $this->_tokens[] = array( - 'tag' => $matches[0], - 'name' => $name, - 'type' => Zend_Markup_Token::TYPE_TAG, - 'attributes' => $attributes - ); - } - - $state = self::STATE_SCAN; - break; - case self::STATE_NEWLINE: - $matches = array(); //[^\n*_?+~%@!-] - $regex = "#\G(?<name>(h[1-6])|(?:\#|\*))(?:{$attrsMatch})*(?(2)\.\s|\s)#si"; - if (!preg_match($regex, $this->_value, $matches, null, $this->_pointer)) { - $state = self::STATE_SCAN; - break; - } - - $this->_pointer += strlen($matches[0]); - - $name = $matches['name']; - $attributes = $this->_extractAttributes($matches); - - if ($name == '#') { - $name = 'list'; - $attributes['list'] = 'decimal'; - } elseif ($name == '*') { - $name = 'list'; - } - - $this->_tokens[] = array( - 'tag' => $matches[0], - 'name' => $name, - 'type' => Zend_Markup_Token::TYPE_TAG, - 'attributes' => $attributes - ); - break; - } - } - } - - /** - * Create a tree from the tokenized text - * - * @return void - */ - protected function _createTree() - { - $inside = true; - - foreach ($this->_tokens as $key => $token) { - // first check if the token is a stopper - if ($this->_isStopper($token, $this->_current)) { - if ($this->_current->getName() == 'li') { - // list items are handled differently - if (isset($this->_tokens[$key + 1]) - && ($this->_tokens[$key + 1]['type'] == Zend_Markup_Token::TYPE_TAG) - && ($this->_tokens[$key + 1]['name'] == 'list') - ) { - // the next item is a correct tag - $this->_current->setStopper($token['tag']); - - $this->_current = $this->_current->getParent(); - } else { - // close the list - $this->_current->setStopper($token['tag']); - - $this->_current = $this->_current->getParent()->getParent(); - - // go up in the tree until we found the end - while ($this->_isStopper($token, $this->_current)) { - $this->_current->setStopper($token['tag']); - - $this->_current = $this->_current->getParent(); - } - } - } else { - // go up in the tree until we found the end of stoppers - while ($this->_isStopper($token, $this->_current)) { - $this->_current->setStopper($token['tag']); - - if (!empty($token['attributes'])) { - foreach ($token['attributes'] as $name => $value) { - $this->_current->addAttribute($name, $value); - } - } - - $this->_current = $this->_current->getParent(); - } - } - $inside = true; - } elseif (($token['type'] == Zend_Markup_Token::TYPE_TAG) && $inside) { - if ($token['name'] == 'break') { - // add the newline and continue parsing - $this->_current->addChild(new Zend_Markup_Token( - $token['tag'], - Zend_Markup_Token::TYPE_NONE, - '', - array(), - $this->_current - )); - } else { - // handle a list item - if ($token['name'] == 'list') { - $attributes = array(); - if (isset($token['attributes']['list'])) { - $attributes['list'] = $token['attributes']['list']; - unset($token['attributes']['list']); - } - - if ($this->_current->getName() != 'list') { - // the list isn't started yet, create it - $child = new Zend_Markup_Token( - '', - Zend_Markup_Token::TYPE_TAG, - 'list', - $attributes, - $this->_current - ); - - $this->_current->addChild($child); - - $this->_current = $child; - } - $token['name'] = 'li'; - } elseif (($token['name'] == 'img') || ($token['name'] == 'url')) { - $inside = false; - } - - // add the token - $child = new Zend_Markup_Token( - $token['tag'], - Zend_Markup_Token::TYPE_TAG, - $token['name'], - $token['attributes'], - $this->_current - ); - - $this->_current->addChild($child); - - $this->_current = $child; - } - } else { - // simply add the token as text - $this->_current->addChild(new Zend_Markup_Token( - $token['tag'], - Zend_Markup_Token::TYPE_NONE, - '', - array(), - $this->_current - )); - } - } - } - - /** - * Check if a tag is a stopper - * - * @param array $token - * @param Zend_Markup_Token $current - * - * @return bool - */ - protected function _isStopper(array $token, Zend_Markup_Token $current) - { - switch ($current->getName()) { - case 'h1': - case 'h2': - case 'h3': - case 'h4': - case 'h5': - case 'h6': - case 'list': - case 'li': - if (($token['type'] == Zend_Markup_Token::TYPE_TAG) - && (($token['name'] == 'break') || ($token['name'] == 'p')) - ) { - return true; - } - break; - case 'break': - return false; - break; - default: - if (($token['type'] == Zend_Markup_Token::TYPE_TAG) && ($token['name'] == $current->getName())) { - return true; - } - break; - } - return false; - } - - /** - * Extract the attributes - * - * @param array $matches - * - * @return array - */ - protected function _extractAttributes(array $matches) - { - $attributes = array(); - - if (!empty($matches['attr_class'])) { - $attributes['class'] = $matches['attr_class']; - } - if (!empty($matches['attr_id'])) { - $attributes['id'] = $matches['attr_id']; - } - if (!empty($matches['attr_style'])) { - $attributes['style'] = $matches['attr_style']; - } - if (!empty($matches['attr_lang'])) { - $attributes['lang'] = $matches['attr_lang']; - } - if (!empty($matches['attr_align'])) { - switch ($matches['attr_align']) { - case '=': - $attributes['align'] = 'center'; - break; - case '>': - $attributes['align'] = 'right'; - break; - case '<>': - $attributes['align'] = 'justify'; - break; - default: - case '<': - $attributes['align'] = 'left'; - break; - } - } - - return $attributes; - } - -} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/Exception.php --- a/web/lib/Zend/Markup/Renderer/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @uses Zend_Markup_Exception * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Exception extends Zend_Markup_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/Html.php --- a/web/lib/Zend/Markup/Renderer/Html.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/Html.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Html.php 22286 2010-05-25 14:26:45Z matthew $ + * @version $Id: Html.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html extends Zend_Markup_Renderer_RendererAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/Html/Code.php --- a/web/lib/Zend/Markup/Renderer/Html/Code.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/Html/Code.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code.php 20270 2010-01-13 22:37:41Z kokx $ + * @version $Id: Code.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_Code extends Zend_Markup_Renderer_Html_HtmlAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/Html/HtmlAbstract.php --- a/web/lib/Zend/Markup/Renderer/Html/HtmlAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/Html/HtmlAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlAbstract.php 20271 2010-01-13 23:27:34Z kokx $ + * @version $Id: HtmlAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Markup_Renderer_Html_HtmlAbstract implements Zend_Markup_Renderer_TokenConverterInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/Html/Img.php --- a/web/lib/Zend/Markup/Renderer/Html/Img.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/Html/Img.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Img.php 20663 2010-01-26 18:45:18Z kokx $ + * @version $Id: Img.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_Img extends Zend_Markup_Renderer_Html_HtmlAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/Html/List.php --- a/web/lib/Zend/Markup/Renderer/Html/List.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/Html/List.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: List.php 20270 2010-01-13 22:37:41Z kokx $ + * @version $Id: List.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_List extends Zend_Markup_Renderer_Html_HtmlAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/Html/Url.php --- a/web/lib/Zend/Markup/Renderer/Html/Url.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/Html/Url.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Url.php 20663 2010-01-26 18:45:18Z kokx $ + * @version $Id: Url.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_Url extends Zend_Markup_Renderer_Html_HtmlAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/RendererAbstract.php --- a/web/lib/Zend/Markup/Renderer/RendererAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/RendererAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererAbstract.php 22197 2010-05-19 13:32:25Z kokx $ + * @version $Id: RendererAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Markup_Renderer_RendererAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Renderer/TokenConverterInterface.php --- a/web/lib/Zend/Markup/Renderer/TokenConverterInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Renderer/TokenConverterInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TokenConverterInterface.php 20271 2010-01-13 23:27:34Z kokx $ + * @version $Id: TokenConverterInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Markup_Renderer_TokenConverterInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/Token.php --- a/web/lib/Zend/Markup/Token.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/Token.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Token.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Token @@ -260,7 +260,7 @@ return $this->_children; } - /** + /** * Does this token have any children * * @return bool diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Markup/TokenList.php --- a/web/lib/Zend/Markup/TokenList.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Markup/TokenList.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TokenList.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: TokenList.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_TokenList implements RecursiveIterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Abstract.php --- a/web/lib/Zend/Measure/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21329 2010-03-04 22:06:08Z thomas $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Measure_Abstract @@ -74,9 +74,9 @@ /** * Zend_Measure_Abstract is an abstract class for the different measurement types * - * @param $value mixed - Value as string, integer, real or float - * @param $type type - OPTIONAL a measure type f.e. Zend_Measure_Length::METER - * @param $locale locale - OPTIONAL a Zend_Locale Type + * @param mixed $value Value as string, integer, real or float + * @param int $type OPTIONAL a measure type f.e. Zend_Measure_Length::METER + * @param Zend_Locale $locale OPTIONAL a Zend_Locale Type * @throws Zend_Measure_Exception */ public function __construct($value, $type = null, $locale = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Acceleration.php --- a/web/lib/Zend/Measure/Acceleration.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Acceleration.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Acceleration.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Acceleration.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Acceleration - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Acceleration extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Angle.php --- a/web/lib/Zend/Measure/Angle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Angle.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Angle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Angle.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Angle - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Angle extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Area.php --- a/web/lib/Zend/Measure/Area.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Area.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Area.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Area.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Area - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Area extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Binary.php --- a/web/lib/Zend/Measure/Binary.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Binary.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Binary.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Binary.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Binary - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Binary extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Capacitance.php --- a/web/lib/Zend/Measure/Capacitance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Capacitance.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Capacitance.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Capacitance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Capacitance - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Capacitance extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Cooking/Volume.php --- a/web/lib/Zend/Measure/Cooking/Volume.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Cooking/Volume.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Volume.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Cooking_Volume - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Cooking_Volume extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Cooking/Weight.php --- a/web/lib/Zend/Measure/Cooking/Weight.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Cooking/Weight.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Cooking_Weight - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Cooking_Weight extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Current.php --- a/web/lib/Zend/Measure/Current.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Current.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Current.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Current.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Current - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Current extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Density.php --- a/web/lib/Zend/Measure/Density.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Density.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Density.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Density.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Density - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Density extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Energy.php --- a/web/lib/Zend/Measure/Energy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Energy.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Energy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Energy.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Energy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Energy extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Exception.php --- a/web/lib/Zend/Measure/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Flow/Mass.php --- a/web/lib/Zend/Measure/Flow/Mass.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Flow/Mass.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mass.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mass.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Flow_Mass - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Flow_Mass extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Flow/Mole.php --- a/web/lib/Zend/Measure/Flow/Mole.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Flow/Mole.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mole.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mole.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Flow_Mole - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Flow_Mole extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Flow/Volume.php --- a/web/lib/Zend/Measure/Flow/Volume.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Flow/Volume.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Volume.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Flow_Volume - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Flow_Volume extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Force.php --- a/web/lib/Zend/Measure/Force.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Force.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Force.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Force.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Force - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Force extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Frequency.php --- a/web/lib/Zend/Measure/Frequency.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Frequency.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Frequency.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Frequency.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Frequency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Frequency extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Illumination.php --- a/web/lib/Zend/Measure/Illumination.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Illumination.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Illumination.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Illumination.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Illumination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Illumination extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Length.php --- a/web/lib/Zend/Measure/Length.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Length.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Length.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Length.php 25199 2013-01-09 11:56:38Z frosch $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Length - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Length extends Zend_Measure_Abstract @@ -361,7 +361,7 @@ 'ALEN_DANISH' => array('0.6277', 'alen'), 'ALEN' => array('0.6', 'alen'), 'ALEN_SWEDISH' => array('0.5938', 'alen'), - 'ANGSTROM' => array('1.0e-10', 'Å'), + 'ANGSTROM' => array('1.0e-10', 'Å'), 'ARMS' => array('0.7', 'arms'), 'ARPENT_CANADIAN' => array('58.47', 'arpent'), 'ARPENT' => array('58.471308', 'arpent'), @@ -373,11 +373,11 @@ 'BAMBOO' => array('3.2', 'bamboo'), 'BARLEYCORN' => array('0.0085', 'barleycorn'), 'BEE_SPACE' => array('0.0065', 'bee space'), - 'BICRON' => array('1.0e-12', '��'), + 'BICRON' => array('1.0e-12', 'µµ'), 'BLOCK_US_EAST' => array('80.4672', 'block'), 'BLOCK_US_WEST' => array('100.584', 'block'), 'BLOCK_US_SOUTH' => array('160.9344', 'block'), - 'BOHR' => array('52.918e-12', 'a�'), + 'BOHR' => array('52.918e-12', 'a₀'), 'BRACCIO' => array('0.7', 'braccio'), 'BRAZA_ARGENTINA' => array('1.733', 'braza'), 'BRAZA' => array('1.67', 'braza'), @@ -415,8 +415,8 @@ 'DIGIT' => array('0.019', 'digit'), 'DIRAA' => array('0.58', ''), 'DONG' => array(array('' => '7','/' => '300'), 'dong'), - 'DOUZIEME_WATCH' => array('0.000188', 'douzi�me'), - 'DOUZIEME' => array('0.00017638888889', 'douzi�me'), + 'DOUZIEME_WATCH' => array('0.000188', 'douzième'), + 'DOUZIEME' => array('0.00017638888889', 'douzième'), 'DRA_IRAQ' => array('0.745', 'dra'), 'DRA' => array('0.7112', 'dra'), 'EL' => array('0.69', 'el'), @@ -533,10 +533,10 @@ 'METRE' => array('1', 'm'), 'METRIC_MILE' => array('1500', 'metric mile'), 'METRIC_MILE_US' => array('1600', 'metric mile'), - 'MICROINCH' => array('2.54e-08', '�in'), - 'MICROMETER' => array('0.000001', '�m'), - 'MICROMICRON' => array('1.0e-12', '��'), - 'MICRON' => array('0.000001', '�'), + 'MICROINCH' => array('2.54e-08', 'µin'), + 'MICROMETER' => array('0.000001', 'µm'), + 'MICROMICRON' => array('1.0e-12', 'µµ'), + 'MICRON' => array('0.000001', 'µm'), 'MIGLIO' => array('1488.6', 'miglio'), 'MIIL' => array('7500', 'miil'), 'MIIL_DENMARK' => array('7532.5', 'miil'), @@ -560,7 +560,7 @@ 'MILLE' => array('1949', 'mille'), 'MILLIARE' => array('0.001478', 'milliare'), 'MILLIMETER' => array('0.001', 'mm'), - 'MILLIMICRON' => array('1.0e-9', 'm�'), + 'MILLIMICRON' => array('1.0e-9', 'mµ'), 'MKONO' => array('0.4572', 'mkono'), 'MOOT' => array('0.0762', 'moot'), 'MYRIAMETER' => array('10000', 'mym'), @@ -578,7 +578,7 @@ 'PARASANG' => array('6000', 'parasang'), 'PARIS_FOOT' => array('0.3248406', 'paris foot'), 'PARSEC' => array('3.0856776e+16', 'pc'), - 'PE' => array('0.33324', 'p�'), + 'PE' => array('0.33324', 'pé'), 'PEARL' => array('0.001757299', 'pearl'), 'PERCH' => array('5.0292', 'perch'), 'PERCH_IRELAND' => array('6.4008', 'perch'), diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Lightness.php --- a/web/lib/Zend/Measure/Lightness.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Lightness.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lightness.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Lightness.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Lightness - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Lightness extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Number.php --- a/web/lib/Zend/Measure/Number.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Number.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Number.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Number.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Number - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Number extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Power.php --- a/web/lib/Zend/Measure/Power.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Power.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Power.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Power.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Power - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Power extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Pressure.php --- a/web/lib/Zend/Measure/Pressure.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Pressure.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pressure.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pressure.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Pressure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Pressure extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Speed.php --- a/web/lib/Zend/Measure/Speed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Speed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Speed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Speed.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Speed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Speed extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Temperature.php --- a/web/lib/Zend/Measure/Temperature.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Temperature.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Temperature.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Temperature.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Temperature - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Temperature extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Time.php --- a/web/lib/Zend/Measure/Time.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Time.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Time.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Time.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Time - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Time extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Torque.php --- a/web/lib/Zend/Measure/Torque.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Torque.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Torque.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Torque.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Torque - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Torque extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Viscosity/Dynamic.php --- a/web/lib/Zend/Measure/Viscosity/Dynamic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Viscosity/Dynamic.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dynamic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dynamic.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Viscosity_Dynamic - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Viscosity_Dynamic extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Viscosity/Kinematic.php --- a/web/lib/Zend/Measure/Viscosity/Kinematic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Viscosity/Kinematic.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Kinematic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Kinematic.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Viscosity_Kinematic - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Viscosity_Kinematic extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Volume.php --- a/web/lib/Zend/Measure/Volume.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Volume.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Volume.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Volume - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Volume extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Measure/Weight.php --- a/web/lib/Zend/Measure/Weight.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Measure/Weight.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Weigth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Weight extends Zend_Measure_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory.php --- a/web/lib/Zend/Memory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memory.php 20804 2010-02-01 15:49:16Z alexander $ + * @version $Id: Memory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Memory_Exception */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory @@ -56,7 +56,7 @@ // Look through available backendsand // (that allows to specify it in any case) $backendIsFound = false; - foreach (Zend_Cache::$availableBackends as $zendCacheBackend) { + foreach (Zend_Cache::$standardBackends as $zendCacheBackend) { if (strcasecmp($backend, $zendCacheBackend) == 0) { $backend = $zendCacheBackend; $backendIsFound = true; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/AccessController.php --- a/web/lib/Zend/Memory/AccessController.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/AccessController.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccessController.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccessController.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_AccessController implements Zend_Memory_Container_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/Container.php --- a/web/lib/Zend/Memory/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Memory_Container_Interface */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Memory_Container implements Zend_Memory_Container_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/Container/Interface.php --- a/web/lib/Zend/Memory/Container/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/Container/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Memory_Container_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/Container/Locked.php --- a/web/lib/Zend/Memory/Container/Locked.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/Container/Locked.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Locked.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Locked.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Memory_Container */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Container_Locked extends Zend_Memory_Container diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/Container/Movable.php --- a/web/lib/Zend/Memory/Container/Movable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/Container/Movable.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Movable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Movable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Memory_Container */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Container_Movable extends Zend_Memory_Container { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/Exception.php --- a/web/lib/Zend/Memory/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/Manager.php --- a/web/lib/Zend/Memory/Manager.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/Manager.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manager.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manager.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Memory_Container_Movable */ @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Manager diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Memory/Value.php --- a/web/lib/Zend/Memory/Value.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Memory/Value.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Value.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Value.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @todo also implement Countable for PHP 5.1 but not yet to stay 5.0 compatible */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mime.php --- a/web/lib/Zend/Mime.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mime.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mime.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mime.php 24953 2012-06-13 19:09:58Z rob $ */ @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime @@ -130,7 +130,7 @@ $str = self::_encodeQuotedPrintable($str); // Split encoded text into separate lines - while ($str) { + while(strlen($str) > 0) { $ptr = strlen($str); if ($ptr > $lineLength) { $ptr = $lineLength; @@ -194,7 +194,7 @@ $str = self::_encodeQuotedPrintable($str); // Mail-Header required chars have to be encoded also: - $str = str_replace(array('?', ' ', '_'), array('=3F', '=20', '=5F'), $str); + $str = str_replace(array('?', ' ', '_', ','), array('=3F', '=20', '=5F', '=2C'), $str); // initialize first line, we need it anyways $lines = array(0 => ""); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mime/Decode.php --- a/web/lib/Zend/Mime/Decode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mime/Decode.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decode.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Decode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Decode @@ -239,6 +239,6 @@ */ public static function decodeQuotedPrintable($string) { - return iconv_mime_decode($string, ICONV_MIME_DECODE_CONTINUE_ON_ERROR); + return quoted_printable_decode($string); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mime/Exception.php --- a/web/lib/Zend/Mime/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mime/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mime/Message.php --- a/web/lib/Zend/Mime/Message.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mime/Message.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Message diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mime/Part.php --- a/web/lib/Zend/Mime/Part.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Mime/Part.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Part.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Part.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Part { @@ -146,6 +146,19 @@ return Zend_Mime::encode($this->_content, $this->encoding, $EOL); } } + + /** + * Get the RAW unencoded content from this part + * @return string + */ + public function getRawContent() + { + if ($this->_isStream) { + return stream_get_contents($this->_content); + } else { + return $this->_content; + } + } /** * Create and return the array of headers for this MIME part diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,33 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Exception */ +require_once 'Zend/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Exception extends Zend_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Abstract.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,112 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Interface **/ +require_once 'Zend/Mobile/Push/Interface.php'; + +/** Zend_Mobile_Push_Exception **/ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * Push Abstract + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +abstract class Zend_Mobile_Push_Abstract implements Zend_Mobile_Push_Interface +{ + /** + * Is Connected + * + * @var boolean + */ + protected $_isConnected = false; + + /** + * Connect to the Push Server + * + * @return Zend_Mobile_Push_Abstract + */ + public function connect() + { + $this->_isConnected = true; + return $this; + } + + /** + * Send a Push Message + * + * @param Zend_Mobile_Push_Message_Abstract $message + * @return boolean + * @throws DomainException + */ + public function send(Zend_Mobile_Push_Message_Abstract $message) + { + if (!$this->_isConnected) { + $this->connect(); + } + return true; + } + + /** + * Close the Connection to the Push Server + * + * @return void + */ + public function close() + { + $this->_isConnected = false; + } + + /** + * Is Connected + * + * @return boolean + */ + public function isConnected() + { + return $this->_isConnected; + } + + /** + * Set Options + * + * @param array $options + * @return Zend_Mobile_Push_Abstract + * @throws Zend_Mobile_Push_Exception + */ + public function setOptions(array $options) + { + foreach ($options as $k => $v) { + $method = 'set' . ucwords($k); + if (!method_exists($this, $method)) { + throw new Zend_Mobile_Push_Exception('The method "' . $method . "' does not exist."); + } + $this->$method($v); + } + return $this; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Apns.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Apns.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,391 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Abstract **/ +require_once 'Zend/Mobile/Push/Abstract.php'; + +/** Zend_Mobile_Push_Message_Apns **/ +require_once 'Zend/Mobile/Push/Message/Apns.php'; + +/** + * APNS Push + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Apns extends Zend_Mobile_Push_Abstract +{ + + /** + * @const int apple server uri constants + */ + const SERVER_SANDBOX_URI = 0; + const SERVER_PRODUCTION_URI = 1; + const SERVER_FEEDBACK_SANDBOX_URI = 2; + const SERVER_FEEDBACK_PRODUCTION_URI = 3; + + /** + * Apple Server URI's + * + * @var array + */ + protected $_serverUriList = array( + 'ssl://gateway.sandbox.push.apple.com:2195', + 'ssl://gateway.push.apple.com:2195', + 'ssl://feedback.sandbox.push.apple.com:2196', + 'ssl://feedback.push.apple.com:2196' + ); + + /** + * Current Environment + * + * @var int + */ + protected $_currentEnv; + + /** + * Socket + * + * @var resource + */ + protected $_socket; + + /** + * Certificate + * + * @var string + */ + protected $_certificate; + + /** + * Certificate Passphrase + * + * @var string + */ + protected $_certificatePassphrase; + + /** + * Get Certficiate + * + * @return string + */ + public function getCertificate() + { + return $this->_certificate; + } + + /** + * Set Certificate + * + * @param string $cert + * @return Zend_Mobile_Push_Apns + * @throws Zend_Mobile_Push_Exception + */ + public function setCertificate($cert) + { + if (!is_string($cert)) { + throw new Zend_Mobile_Push_Exception('$cert must be a string'); + } + if (!file_exists($cert)) { + throw new Zend_Mobile_Push_Exception('$cert must be a valid path to the certificate'); + } + $this->_certificate = $cert; + return $this; + } + + /** + * Get Certificate Passphrase + * + * @return string + */ + public function getCertificatePassphrase() + { + return $this->_certificatePassphrase; + } + + /** + * Set Certificate Passphrase + * + * @param string $passphrase + * @return Zend_Mobile_Push_Apns + * @throws Zend_Mobile_Push_Exception + */ + public function setCertificatePassphrase($passphrase) + { + if (!is_string($passphrase)) { + throw new Zend_Mobile_Push_Exception('$passphrase must be a string'); + } + $this->_certificatePassphrase = $passphrase; + return $this; + } + + /** + * Connect to Socket + * + * @param string $uri + * @return bool + * @throws Zend_Mobile_Push_Exception_ServerUnavailable + */ + protected function _connect($uri) + { + $ssl = array( + 'local_cert' => $this->_certificate, + ); + if ($this->_certificatePassphrase) { + $ssl['passphrase'] = $this->_certificatePassphrase; + } + + $this->_socket = stream_socket_client($uri, + $errno, + $errstr, + ini_get('default_socket_timeout'), + STREAM_CLIENT_CONNECT, + stream_context_create(array( + 'ssl' => $ssl, + )) + ); + + if (!is_resource($this->_socket)) { + require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; + throw new Zend_Mobile_Push_Exception_ServerUnavailable(sprintf('Unable to connect: %s: %d (%s)', + $uri, + $errno, + $errstr + )); + } + + stream_set_blocking($this->_socket, 0); + stream_set_write_buffer($this->_socket, 0); + return true; + } + + /** + * Read from the Socket Server + * + * @param int $length + * @return string + */ + protected function _read($length) { + $data = false; + if (!feof($this->_socket)) { + $data = fread($this->_socket, $length); + } + return $data; + } + + /** + * Write to the Socket Server + * + * @param string $payload + * @return int + */ + protected function _write($payload) { + return @fwrite($this->_socket, $payload); + } + + /** + * Connect to the Push Server + * + * @param string $env + * @return Zend_Mobile_Push_Abstract + * @throws Zend_Mobile_Push_Exception + * @throws Zend_Mobile_Push_Exception_ServerUnavailable + */ + public function connect($env = self::SERVER_PRODUCTION_URI) + { + if ($this->_isConnected) { + if ($this->_currentEnv == self::SERVER_PRODUCTION_URI) { + return $this; + } + $this->close(); + } + + if (!isset($this->_serverUriList[$env])) { + throw new Zend_Mobile_Push_Exception('$env is not a valid environment'); + } + + if (!$this->_certificate) { + throw new Zend_Mobile_Push_Exception('A certificate must be set prior to calling ::connect'); + } + + $this->_connect($this->_serverUriList[$env]); + + $this->_currentEnv = $env; + $this->_isConnected = true; + return $this; + } + + + + /** + * Feedback + * + * @return array array w/ key = token and value = time + * @throws Zend_Mobile_Push_Exception + * @throws Zend_Mobile_Push_Exception_ServerUnavailable + */ + public function feedback() + { + if (!$this->_isConnected || + !in_array($this->_currentEnv, + array(self::SERVER_FEEDBACK_SANDBOX_URI, self::SERVER_FEEDBACK_PRODUCTION_URI))) { + $this->connect(self::SERVER_FEEDBACK_PRODUCTION_URI); + } + + $tokens = array(); + while ($token = $this->_read(38)) { + if (strlen($token) < 38) { + continue; + } + $token = unpack('Ntime/ntokenLength/H*token', $token); + if (!isset($tokens[$token['token']]) || $tokens[$token['token']] < $token['time']) { + $tokens[$token['token']] = $token['time']; + } + } + return $tokens; + } + + /** + * Send Message + * + * @param Zend_Mobile_Push_Message_Apns $message + * @return boolean + * @throws Zend_Mobile_Push_Exception + * @throws Zend_Mobile_Push_Exception_ServerUnavailable + * @throws Zend_Mobile_Push_Exception_InvalidToken + * @throws Zend_Mobile_Push_Exception_InvalidTopic + * @throws Zend_Mobile_Push_Exception_InvalidPayload + */ + public function send(Zend_Mobile_Push_Message_Abstract $message) + { + if (!$message->validate()) { + throw new Zend_Mobile_Push_Exception('The message is not valid.'); + } + + if (!$this->_isConnected || !in_array($this->_currentEnv, array( + self::SERVER_SANDBOX_URI, + self::SERVER_PRODUCTION_URI))) { + $this->connect(self::SERVER_PRODUCTION_URI); + } + + $payload = array('aps' => array()); + + $alert = $message->getAlert(); + foreach ($alert as $k => $v) { + if ($v == null) { + unset($alert[$k]); + } + } + if (!empty($alert)) { + $payload['aps']['alert'] = $alert; + } + if (!is_null($message->getBadge())) { + $payload['aps']['badge'] = $message->getBadge(); + } + $payload['aps']['sound'] = $message->getSound(); + + foreach($message->getCustomData() as $k => $v) { + $payload[$k] = $v; + } + $payload = json_encode($payload); + + $expire = $message->getExpire(); + if ($expire > 0) { + $expire += time(); + } + $id = $message->getId(); + if (empty($id)) { + $id = time(); + } + + $payload = pack('CNNnH*', 1, $id, $expire, 32, $message->getToken()) + . pack('n', strlen($payload)) + . $payload; + $ret = $this->_write($payload); + if ($ret === false) { + require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; + throw new Zend_Mobile_Push_Exception_ServerUnavailable('Unable to send message'); + } + // check for errors from apple + $err = $this->_read(1024); + if (strlen($err) > 0) { + $err = unpack('Ccmd/Cerrno/Nid', $err); + switch ($err['errno']) { + case 0: + return true; + break; + case 1: + throw new Zend_Mobile_Push_Exception('A processing error has occurred on the apple push notification server.'); + break; + case 2: + require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; + throw new Zend_Mobile_Push_Exception_InvalidToken('Missing token; you must set a token for the message.'); + break; + case 3: + require_once 'Zend/Mobile/Push/Exception/InvalidTopic.php'; + throw new Zend_Mobile_Push_Exception_InvalidTopic('Missing id; you must set an id for the message.'); + break; + case 4: + require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; + throw new Zend_Mobile_Push_Exception_InvalidPayload('Missing message; the message must always have some content.'); + break; + case 5: + require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; + throw new Zend_Mobile_Push_Exception_InvalidToken('Bad token. This token is too big and is not a regular apns token.'); + break; + case 6: + require_once 'Zend/Mobile/Push/Exception/InvalidTopic.php'; + throw new Zend_Mobile_Push_Exception_InvalidTopic('The message id is too big; reduce the size of the id.'); + break; + case 7: + require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; + throw new Zend_Mobile_Push_Exception_InvalidPayload('The message is too big; reduce the size of the message.'); + break; + case 8: + require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; + throw new Zend_Mobile_Push_Exception_InvalidToken('Bad token. Remove this token from being sent to again.'); + break; + default: + throw new Zend_Mobile_Push_Exception(sprintf('An unknown error occurred: %d', $err['errno'])); + break; + } + } + return true; + } + + /** + * Close Connection + * + * @return void + */ + public function close() + { + if ($this->_isConnected && is_resource($this->_socket)) { + fclose($this->_socket); + } + $this->_isConnected = false; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Exception */ +require_once 'Zend/Mobile/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception extends Zend_Mobile_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_DeviceQuotaExceeded extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/InvalidAuthToken.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/InvalidAuthToken.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_InvalidAuthToken extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/InvalidPayload.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/InvalidPayload.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_InvalidPayload extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/InvalidRegistration.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/InvalidRegistration.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_InvalidRegistration extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/InvalidToken.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/InvalidToken.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_InvalidToken extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/InvalidTopic.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/InvalidTopic.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_InvalidTopic extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/QuotaExceeded.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/QuotaExceeded.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_QuotaExceeded extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Exception/ServerUnavailable.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Exception/ServerUnavailable.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Exception_ServerUnavailable extends Zend_Mobile_Push_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Gcm.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Gcm.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,172 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Http_Client **/ +require_once 'Zend/Http/Client.php'; + +/** Zend_Mobile_Push_Abstract **/ +require_once 'Zend/Mobile/Push/Abstract.php'; + +/** Zend_Mobile_Push_Message_Gcm **/ +require_once 'Zend/Mobile/Push/Message/Gcm.php'; + +/** Zend_Mobile_Push_Response_Gcm **/ +require_once 'Zend/Mobile/Push/Response/Gcm.php'; + +/** + * GCM Push + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Gcm extends Zend_Mobile_Push_Abstract +{ + + /** + * @const string Server URI + */ + const SERVER_URI = 'https://android.googleapis.com/gcm/send'; + + /** + * Http Client + * + * @var Client + */ + protected $_httpClient; + + /** + * API Key + * + * @var string + */ + protected $_apiKey; + + /** + * Get API Key + * + * @return string + */ + public function getApiKey() + { + return $this->_apiKey; + } + + /** + * Set API Key + * + * @param string $key + * @return Zend_Mobile_Push_Gcm + * @throws Zend_Mobile_Push_Exception + */ + public function setApiKey($key) + { + if (!is_string($key) || empty($key)) { + throw new Zend_Mobile_Push_Exception('The api key must be a string and not empty'); + } + $this->_apiKey = $key; + return $this; + } + + /** + * Get Http Client + * + * @return Zend_Http_Client + */ + public function getHttpClient() + { + if (!$this->_httpClient) { + $this->_httpClient = new Zend_Http_Client(); + $this->_httpClient->setConfig(array( + 'strictredirects' => true, + )); + } + return $this->_httpClient; + } + + /** + * Set Http Client + * + * @return Zend_Mobile_Push_Gcm + */ + public function setHttpClient(Zend_Http_Client $client) + { + $this->_httpClient = $client; + return $this; + } + + /** + * Send Message + * + * @param Zend_Mobile_Push_Message_Gcm $message + * @return Zend_Mobile_Push_Response_Gcm + * @throws Zend_Mobile_Push_Exception + */ + public function send(Zend_Mobile_Push_Message_Abstract $message) + { + if (!$message->validate()) { + throw new Zend_Mobile_Push_Exception('The message is not valid.'); + } + + $this->connect(); + + $client = $this->getHttpClient(); + $client->setUri(self::SERVER_URI); + $client->setHeaders('Authorization', 'key=' . $this->getApiKey()); + + $json = array('registration_ids' => $message->getToken()); + if ($data = $message->getData()) { + $json['data'] = $data; + } + if ($id = $message->getId()) { + $json['id'] = $id; + } + + $response = $client->setRawData($message->toJson(), 'application/json') + ->request('POST'); + $this->close(); + + switch ($response->getStatus()) + { + case 500: + require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; + throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server encountered an internal error, try again'); + break; + case 503: + require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; + throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server was unavailable, check Retry-After header'); + break; + case 401: + require_once 'Zend/Mobile/Push/Exception/InvalidAuthToken.php'; + throw new Zend_Mobile_Push_Exception_InvalidAuthToken('There was an error authenticating the sender account'); + break; + case 400: + require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; + throw new Zend_Mobile_Push_Exception_InvalidPayload('The request could not be parsed as JSON or contains invalid fields'); + break; + } + return new Zend_Mobile_Push_Response_Gcm($response->getBody(), $message); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Interface.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,64 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * Push Interface + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +interface Zend_Mobile_Push_Interface +{ + /** + * Connect to the Push Server + * + * @return Push + */ + public function connect(); + + /** + * Send a Push Message + * + * @param Zend_Mobile_Push_Message_Interface $message + * @return boolean + */ + public function send(Zend_Mobile_Push_Message_Abstract $message); + + /** + * Close the Connection to the Push Server + * + * @return void + */ + public function close(); + + /** + * Set Options + * + * @param array $options + * @return Zend_Mobile_Push_Abstract + */ + public function setOptions(array $options); +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Abstract.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,135 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Message_Interface **/ +require_once 'Zend/Mobile/Push/Message/Interface.php'; + +/** Zend_Mobile_Push_Message_Exception **/ +require_once 'Zend/Mobile/Push/Message/Exception.php'; + +/** + * Message Abstract + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push_Message + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +abstract class Zend_Mobile_Push_Message_Abstract implements Zend_Mobile_Push_Message_Interface +{ + /** + * Token + * + * @var string + */ + protected $_token; + + /** + * Id + * + * @var scalar + */ + protected $_id; + + /** + * Get Token + * + * @return string + */ + public function getToken() + { + return $this->_token; + } + + /** + * Set Token + * + * @param string $token + * @return Zend_Mobile_Push_Message_Abstract + */ + public function setToken($token) + { + if (!is_string($token)) { + throw new Zend_Mobile_Push_Message_Exception('$token must be a string'); + } + $this->_token = $token; + return $this; + } + + /** + * Get Message ID + * + * @return scalar + */ + public function getId() + { + return $this->_id; + } + + /** + * Set Message ID + * + * @param scalar $id + * @return Zend_Mobile_Push_Message_Abstract + * @throws Exception + */ + public function setId($id) + { + if (!is_scalar($id)) { + throw new Zend_Mobile_Push_Message_Exception('$id must be a scalar'); + } + $this->_id = $id; + return $this; + } + + /** + * Set Options + * + * @param array $options + * @return Zend_Mobile_Push_Message_Abstract + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setOptions(array $options) + { + foreach ($options as $k => $v) { + $method = 'set' . ucwords($k); + if (!method_exists($this, $method)) { + throw new Zend_Mobile_Push_Message_Exception('The method "' . $method . "' does not exist."); + } + $this->$method($v); + } + return $this; + } + + + /** + * Validate Message format + * + * @return boolean + */ + public function validate() + { + return true; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Apns.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Apns.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,284 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Message_Abstract **/ +require_once 'Zend/Mobile/Push/Message/Abstract.php'; + +/** + * Apns Message + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Message_Apns extends Zend_Mobile_Push_Message_Abstract +{ + /** + * Badge Number + * + * @var int + */ + protected $_badge; + + /** + * Alert + * + * @var array + */ + protected $_alert = array(); + + /** + * Expiration + * + * @var int + */ + protected $_expire; + + /** + * Sound + * + * @var string + */ + protected $_sound = 'default'; + + /** + * Custom Data + * + * @var array + */ + protected $_custom = array(); + + /** + * Get Alert + * + * @return array + */ + public function getAlert() + { + return $this->_alert; + } + + /** + * Set Alert + * + * @param string $text + * @param string $actionLocKey + * @param string $locKey + * @param array $locArgs + * @param string $launchImage + * @return Zend_Mobile_Push_Message_Apns + */ + public function setAlert($text, $actionLocKey=null, $locKey=null, $locArgs=null, $launchImage=null) + { + if ($text !== null && !is_string($text)) { + throw new Zend_Mobile_Push_Message_Exception('$text must be a string'); + } + + if ($actionLocKey !== null && !is_string($actionLocKey)) { + throw new Zend_Mobile_Push_Message_Exception('$actionLocKey must be a string'); + } + + if ($locKey !== null && !is_string($locKey)) { + throw new Zend_Mobile_Push_Message_Exception('$locKey must be a string'); + } + + if ($locArgs !== null) { + if (!is_array($locArgs)) { + throw new Zend_Mobile_Push_Message_Exception('$locArgs must be an array of strings'); + } else { + foreach ($locArgs as $str) { + if (!is_string($str)) { + throw new Zend_Mobile_Push_Message_Exception('$locArgs contains an item that is not a string'); + } + } + } + } + + if (null !== $launchImage && !is_string($launchImage)) { + throw new Zend_Mobile_Push_Message_Exception('$launchImage must be a string'); + } + + $this->_alert = array( + 'body' => $text, + 'action-loc-key' => $actionLocKey, + 'loc-key' => $locKey, + 'loc-args' => $locArgs, + 'launch-image' => $launchImage, + ); + return $this; + } + + /** + * Get Badge + * + * @return int + */ + public function getBadge() + { + return $this->_badge; + } + + /** + * Set Badge + * + * @param int $badge + * @return Zend_Mobile_Push_Message_Apns + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setBadge($badge) + { + if (!is_null($badge) && !is_numeric($badge)) { + throw new Zend_Mobile_Push_Message_Exception('$badge must be an integer'); + } + if (!is_null($badge) && $badge < 0) { + throw new Zend_Mobile_Push_Message_Exception('$badge must be greater or equal to 0'); + } + $this->_badge = $badge; + } + + /** + * Get Expire + * + * @return int + */ + public function getExpire() + { + return $this->_expire; + } + + /** + * Set Expire + * + * @param int $expire + * @return Zend_Mobile_Push_Message_Apns + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setExpire($expire) + { + if (!is_numeric($expire)) { + throw new Zend_Mobile_Push_Message_Exception('$expire must be an integer'); + } + $this->_expire = (int) $expire; + return $this; + } + + /** + * Get Sound + * + * @return string + */ + public function getSound() + { + return $this->_sound; + } + + /** + * Set Sound + * + * @param string $sound + * @return Zend_Mobile_Push_Message_Apns + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setSound($sound) + { + if (!is_string($sound)) { + throw new Zend_Mobile_Push_Message_Exception('$sound must be a string'); + } + $this->_sound = $sound; + return $this; + } + + /** + * Add Custom Data + * + * @param string $key + * @param mixed $value + * @return Zend_Mobile_Push_Message_Apns + * @throws Zend_Mobile_Push_Message_Exception + */ + public function addCustomData($key, $value) + { + if (!is_string($key)) { + throw new Zend_Mobile_Push_Message_Exception('$key is not a string'); + } + if ($key == 'aps') { + throw new Zend_Mobile_Push_Message_Exception('$key must not be aps as it is reserved by apple'); + } + $this->_custom[$key] = $value; + } + + /** + * Clear Custom Data + * + * @return throw new Zend_Mobile_Push_Message_Apns + */ + public function clearCustomData() + { + $this->_custom = array(); + return $this; + } + + /** + * Set Custom Data + * + * @param array $data + * @return Zend_Mobile_Push_Message_Apns + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setCustomData($array) + { + $this->_custom = array(); + foreach ($array as $k => $v) { + $this->addCustomData($k, $v); + } + return $this; + } + + /** + * Get Custom Data + * + * @return array + */ + public function getCustomData() + { + return $this->_custom; + } + + /** + * Validate this is a proper Apns message + * + * @return boolean + */ + public function validate() + { + if (!is_string($this->_token) || strlen($this->_token) === 0) { + return false; + } + if (null != $this->_id && !is_numeric($this->_id)) { + return false; + } + return true; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Exception */ +require_once 'Zend/Mobile/Push/Exception.php'; + +/** + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Message_Exception extends Zend_Mobile_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Gcm.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Gcm.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,274 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Mobile_Push_Message_Abstract **/ +require_once 'Zend/Mobile/Push/Message/Abstract.php'; + +/** + * Gcm Message + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + * @method array getToken() + */ +class Zend_Mobile_Push_Message_Gcm extends Zend_Mobile_Push_Message_Abstract +{ + + /** + * Tokens + * + * @var array + */ + protected $_token = array(); + + /** + * Data key value pairs + * + * @var array + */ + protected $_data = array(); + + /** + * Delay while idle + * + * @var boolean + */ + protected $_delay = false; + + /** + * Time to live in seconds + * + * @var int + */ + protected $_ttl = 0; + + /** + * Add a Token + * + * @param string $token + * @return Zend_Mobile_Push_Message_Gcm + * @throws Zend_Mobile_Push_Message_Exception + */ + public function addToken($token) + { + if (!is_string($token)) { + throw new Zend_Mobile_Push_Message_Exception('$token must be a string'); + } + if (!in_array($token, $this->_token)) { + $this->_token[] = $token; + } + return $this; + } + + /** + * Set Token + * + * @param string|array $token + * @return Zend_Mobile_Push_Message_Gcm + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setToken($token) + { + $this->clearToken(); + if (is_string($token)) { + $this->addToken($token); + } else if (is_array($token)) { + foreach ($token as $t) { + $this->addToken($t); + } + } + return $this; + } + + /** + * Clear Tokens + * + * @return Zend_Mobile_Push_Message_Gcm + */ + public function clearToken() + { + $this->_token = array(); + return $this; + } + + + /** + * Add Data + * + * @param string $key + * @param string $value + * @return Zend_Mobile_Push_Message_Gcm + * @throws Zend_Mobile_Push_Message_Exception + */ + public function addData($key, $value) + { + if (!is_string($key)) { + throw new Zend_Mobile_Push_Message_Exception('$key is not a string'); + } + if (!is_scalar($value)) { + throw new Zend_Mobile_Push_Message_Exception('$value is not a string'); + } + $this->_data[$key] = $value; + return $this; + } + + /** + * Set Data + * + * @param array $data + * @return Zend_Mobile_Push_Message_Gcm + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setData(array $data) + { + $this->clearData(); + foreach ($data as $k => $v) { + $this->addData($k, $v); + } + return $this; + } + + /** + * Clear Data + * + * @return Zend_Mobile_Push_Message_Gcm + */ + public function clearData() + { + $this->_data = array(); + return $this; + } + + /** + * Get Data + * + * @return array + */ + public function getData() + { + return $this->_data; + } + + /** + * Set Delay While Idle + * + * @param boolean $delay + * @return Zend_Mobile_Push_Message_Gcm + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setDelayWhileIdle($delay) + { + if (!is_bool($delay)) { + throw new Zend_Mobile_Push_Message_Exception('$delay must be boolean'); + } + $this->_delay = $delay; + return $this; + } + + /** + * Get Delay While Idle + * + * @return boolean + */ + public function getDelayWhileIdle() + { + return $this->_delay; + } + + /** + * Set time to live + * If $secs is set to 0 it will be handled as + * not being set. + * + * @param int $secs + * @return Zend_Mobile_Push_Message_Gcm + */ + public function setTtl($secs) + { + if (!is_numeric($secs)) { + throw new Zend_Mobile_Push_Message_Exception('$secs must be numeric'); + } + $this->_ttl = (int) $secs; + return $this; + } + + /** + * Get time to live + * + * @return int + */ + public function getTtl() + { + return $this->_ttl; + } + + /** + * Validate this is a proper Gcm message + * Does not validate size. + * + * @return boolean + */ + public function validate() + { + if (!is_array($this->_token) || empty($this->_token)) { + return false; + } + if ($this->_ttl > 0 && + (!is_scalar($this->_id) || + strlen($this->_id) === 0)) { + return false; + } + return true; + } + + /** + * To Json utility method + * Takes the data and properly assigns it to + * a json encoded array to match the Gcm format. + * + * @return string + */ + public function toJson() + { + $json = array(); + if ($this->_token) { + $json['registration_ids'] = $this->_token; + } + if ($this->_id) { + $json['collapse_key'] = (string) $this->_id; + } + if ($this->_data) { + $json['data'] = $this->_data; + } + if ($this->_delay) { + $json['delay_while_idle'] = $this->_delay; + } + if ($this->_ttl) { + $json['time_to_live'] = $this->_ttl; + } + return json_encode($json); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Interface.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,79 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * Push Message Interface + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +interface Zend_Mobile_Push_Message_Interface +{ + /** + * Get Token + * + * @return string + */ + public function getToken(); + + /** + * Set Token + * + * @param string $token + * @return Zend_Mobile_Push_Message_Abstract + */ + public function setToken($token); + + /** + * Get Id + * + * @return scalar + */ + public function getId(); + + /** + * Set Id + * + * @param scalar $id + * @return Zend_Mobile_Push_Message_Abstract + */ + public function setId($id); + + /** + * Set Options + * + * @param array $options + * @return Zend_Mobile_Push_Message_Abstract + */ + public function setOptions(array $options); + + /** + * Validate Message + * + * @return boolean + */ + public function validate(); +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Mpns.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Mpns.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,117 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** Zend_Mobile_Push_Message_Abstract **/ +require_once 'Zend/Mobile/Push/Message/Abstract.php'; + +/** Zend_Uri **/ +require_once 'Zend/Uri.php'; + +/** + * Mpns Message + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +abstract class Zend_Mobile_Push_Message_Mpns extends Zend_Mobile_Push_Message_Abstract +{ + /** + * Mpns types + * + * @var string + */ + const TYPE_RAW = 'raw'; + const TYPE_TILE = 'token'; + const TYPE_TOAST = 'toast'; + + /** + * Delay + * + * @var int + */ + protected $_delay; + + /** + * Get Delay + * + * @return int + */ + abstract public function getDelay(); + + /** + * Set Delay + * + * @param int $delay one of const DELAY_* of implementing classes + * @return Zend_Mobile_Push_Message_Mpns + */ + abstract public function setDelay($delay); + + /** + * Get Notification Type + * + * @return string + */ + public static function getNotificationType() + { + return ""; + } + + /** + * Set Token + * + * @param string $token + * @return Zend_Mobile_Push_Message_Mpns + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setToken($token) + { + if (!is_string($token)) { + throw new Zend_Mobile_Push_Message_Exception('$token is not a string'); + } + if (!Zend_Uri::check($token)) { + throw new Zend_Mobile_Push_Message_Exception('$token is not a valid URI'); + } + return parent::setToken($token); + } + + /** + * Get XML Payload + * + * @return string + */ + abstract public function getXmlPayload(); + + /** + * Validate proper mpns message + * + * @return boolean + */ + public function validate() + { + if (!isset($this->_token) || strlen($this->_token) === 0) { + return false; + } + return parent::validate(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Mpns/Raw.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Mpns/Raw.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,149 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** Zend_Mobile_Push_Message_Mpns **/ +require_once 'Zend/Mobile/Push/Message/Mpns.php'; + +/** + * Mpns Raw Message + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Mobile_Push_Message_Mpns_Raw extends Zend_Mobile_Push_Message_Mpns +{ + /** + * Mpns delays + * + * @var int + */ + const DELAY_IMMEDIATE = 3; + const DELAY_450S = 13; + const DELAY_900S = 23; + + /** + * Message + * + * @var string + */ + protected $_msg; + + /** + * Get Delay + * + * @return int + */ + public function getDelay() + { + if (!$this->_delay) { + return self::DELAY_IMMEDIATE; + } + return $this->_delay; + } + + /** + * Set Delay + * + * @param int $delay + * @return Zend_Mobile_Push_Message_Mpns_Raw + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setDelay($delay) + { + if (!in_array($delay, array( + self::DELAY_IMMEDIATE, + self::DELAY_450S, + self::DELAY_900S + ))) { + throw new Zend_Mobile_Push_Message_Exception('$delay must be one of the DELAY_* constants'); + } + $this->_delay = $delay; + return $this; + } + + /** + * Set Message + * + * @param string $msg XML string + * @return Zend_Mobile_Push_Message_Mpns_Raw + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setMessage($msg) + { + if (!is_string($msg)) { + throw new Zend_Mobile_Push_Message_Exception('$msg is not a string'); + } + if (!simplexml_load_string($msg)) { + throw new Zend_Mobile_Push_Message_Exception('$msg is not valid xml'); + } + $this->_msg = $msg; + return $this; + } + + /** + * Get Message + * + * @return string + */ + public function getMessage() + { + return $this->_msg; + } + + /** + * Get Notification Type + * + * @return string + */ + public static function getNotificationType() + { + return 'raw'; + } + + /** + * Get XML Payload + * + * @return string + */ + public function getXmlPayload() + { + return $this->_msg; + } + + /** + * Validate proper mpns message + * + * @return boolean + */ + public function validate() + { + if (!isset($this->_token) || strlen($this->_token) === 0) { + return false; + } + if (empty($this->_msg)) { + return false; + } + return parent::validate(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Mpns/Tile.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Mpns/Tile.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,365 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** Zend_Mobile_Push_Message_Mpns **/ +require_once 'Zend/Mobile/Push/Message/Mpns.php'; + +/** + * Mpns Tile Message + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Mobile_Push_Message_Mpns_Tile extends Zend_Mobile_Push_Message_Mpns +{ + /** + * Mpns delays + * + * @var int + */ + const DELAY_IMMEDIATE = 1; + const DELAY_450S = 11; + const DELAY_900S = 21; + + /** + * Background Image + * + * @var string + */ + protected $_backgroundImage; + + /** + * Count + * + * @var int + */ + protected $_count = 0; + + /** + * Title + * + * @var string + */ + protected $_title; + + /** + * Back Background Image + * + * @var string + */ + protected $_backBackgroundImage; + + /** + * Back Title + * + * @var string + */ + protected $_backTitle; + + /** + * Back Content + * + * @var string + */ + protected $_backContent; + + /** + * Tile ID + * + * @var string + */ + protected $_tileId; + + /** + * Get Background Image + * + * @return string + */ + public function getBackgroundImage() + { + return $this->_backgroundImage; + } + + /** + * Set Background Image + * + * @param string $bgImg + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setBackgroundImage($bgImg) + { + if (!is_string($bgImg)) { + throw new Zend_Mobile_Push_Message_Exception('$bgImg must be a string'); + } + $this->_backgroundImage = $bgImg; + return $this; + } + + /** + * Get Count + * + * @return int + */ + public function getCount() + { + return $this->_count; + } + + /** + * Set Count + * + * @param int $count + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setCount($count) + { + if (!is_numeric($count)) { + throw new Zend_Mobile_Push_Message_Exception('$count is not numeric'); + } + $this->_count = (int) $count; + return $this; + } + + /** + * Get Title + * + * @return string + */ + public function getTitle() + { + return $this->_title; + } + + /** + * Set Title + * + * @param string $title + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setTitle($title) + { + if (!is_string($title)) { + throw new Zend_Mobile_Push_Message_Exception('$title must be a string'); + } + $this->_title = $title; + return $this; + } + + /** + * Get Back Background Image + * + * @return string + */ + public function getBackBackgroundImage() + { + return $this->_backBackgroundImage; + } + + /** + * Set Back Background Image + * + * @param string $bgImg + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setBackBackgroundImage($bgImg) + { + if (!is_string($bgImg)) { + throw new Zend_Mobile_Push_Message_Exception('$bgImg must be a string'); + } + $this->_backBackgroundImage = $bgImg; + return $this; + } + + /** + * Get Back Title + * + * @return string + */ + public function getBackTitle() + { + return $this->_backTitle; + } + + /** + * Set Back Title + * + * @param string $title + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setBackTitle($title) + { + if (!is_string($title)) { + throw new Zend_Mobile_Push_Message_Exception('$title must be a string'); + } + $this->_backTitle = $title; + return $this; + } + + /** + * Get Back Content + * + * @return string + */ + public function getBackContent() + { + return $this->_backContent; + } + + /** + * Set Back Content + * + * @param string $content + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setBackContent($content) + { + if (!is_string($content)) { + throw new Zend_Mobile_Push_Message_Exception('$content must be a string'); + } + $this->_backContent = $content; + } + + /** + * Get Tile Id + * + * @return string + */ + public function getTileId() + { + return $this->_tileId; + } + + /** + * Set Tile Id + * + * @param string $tileId + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setTileId($tileId) + { + if (!is_string($tileId)) { + throw new Zend_Mobile_Push_Message_Exception('$tileId is not a string'); + } + $this->_tileId = $tileId; + return $this; + } + + /** + * Get Delay + * + * @return int + */ + public function getDelay() + { + if (!$this->_delay) { + return self::DELAY_IMMEDIATE; + } + return $this->_delay; + } + + /** + * Set Delay + * + * @param int $delay + * @return Zend_Mobile_Push_Message_Mpns_Tile + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setDelay($delay) + { + if (!in_array($delay, array( + self::DELAY_IMMEDIATE, + self::DELAY_450S, + self::DELAY_900S + ))) { + throw new Zend_Mobile_Push_Message_Exception('$delay must be one of the DELAY_* constants'); + } + $this->_delay = $delay; + return $this; + } + + /** + * Get Notification Type + * + * @return string + */ + public static function getNotificationType() + { + return 'token'; + } + + /** + * Get XML Payload + * + * @return string + */ + public function getXmlPayload() + { + $ret = '<?xml version="1.0" encoding="utf-8"?>' + . '<wp:Notification xmlns:wp="WPNotification">' + . '<wp:Tile' . (($this->_tileId) ? ' Id="' . htmlspecialchars($this->_tileId) . '"' : '') . '>' + . '<wp:BackgroundImage>' . htmlspecialchars($this->_backgroundImage) . '</wp:BackgroundImage>' + . '<wp:Count>' . (int) $this->_count . '</wp:Count>' + . '<wp:Title>' . htmlspecialchars($this->_title) . '</wp:Title>'; + + if ($this->_backBackgroundImage) { + $ret .= '<wp:BackBackgroundImage>' . htmlspecialchars($this->_backBackgroundImage) . '</wp:BackBackgroundImage>'; + } + if ($this->_backTitle) { + $ret .= '<wp:BackTitle>' . htmlspecialchars($this->_backTitle) . '</wp:BackTitle>'; + } + if ($this->_backContent) { + $ret .= '<wp:BackContent>' . htmlspecialchars($this->_backContent) . '</wp:BackContent>'; + } + + $ret .= '</wp:Tile>' + . '</wp:Notification>'; + return $ret; + } + + /** + * Validate proper mpns message + * + * @return boolean + */ + public function validate() + { + if (!isset($this->_token) || strlen($this->_token) === 0) { + return false; + } + if (empty($this->_backgroundImage)) { + return false; + } + if (empty($this->_title)) { + return false; + } + return parent::validate(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Message/Mpns/Toast.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Message/Mpns/Toast.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,225 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** Zend_Mobile_Push_Message_Mpns **/ +require_once 'Zend/Mobile/Push/Message/Mpns.php'; + +/** + * Mpns Toast Message + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Mobile_Push_Message_Mpns_Toast extends Zend_Mobile_Push_Message_Mpns +{ + /** + * Mpns delays + * + * @var int + */ + const DELAY_IMMEDIATE = 2; + const DELAY_450S = 12; + const DELAY_900S = 22; + + /** + * Title + * + * @var string + */ + protected $_title; + + /** + * Message + * + * @var string + */ + protected $_msg; + + /** + * Params + * + * @var string + */ + protected $_params; + + /** + * Get Title + * + * @return string + */ + public function getTitle() + { + return $this->_title; + } + + /** + * Set Title + * + * @param string $title + * @return Zend_Mobile_Push_Message_Mpns_Toast + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setTitle($title) + { + if (!is_string($title)) { + throw new Zend_Mobile_Push_Message_Exception('$title must be a string'); + } + $this->_title = $title; + return $this; + } + + /** + * Get Message + * + * @return string + */ + public function getMessage() + { + return $this->_msg; + } + + /** + * Set Message + * + * @param string $msg + * @return Zend_Mobile_Push_Message_Mpns_Toast + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setMessage($msg) + { + if (!is_string($msg)) { + throw new Zend_Mobile_Push_Message_Exception('$msg must be a string'); + } + $this->_msg = $msg; + return $this; + } + + /** + * Get Params + * + * @return string + */ + public function getParams() + { + return $this->_params; + } + + /** + * Set Params + * + * @param string $params + * @return Zend_Mobile_Push_Message_Mpns_Toast + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setParams($params) + { + if (!is_string($params)) { + throw new Zend_Mobile_Push_Message_Exception('$params must be a string'); + } + $this->_params = $params; + return $this; + } + + /** + * Get Delay + * + * @return int + */ + public function getDelay() + { + if (!$this->_delay) { + return self::DELAY_IMMEDIATE; + } + return $this->_delay; + } + + /** + * Set Delay + * + * @param int $delay + * @return Zend_Mobile_Push_Message_Mpns_Toast + * @throws Zend_Mobile_Push_Message_Exception + */ + public function setDelay($delay) + { + if (!in_array($delay, array( + self::DELAY_IMMEDIATE, + self::DELAY_450S, + self::DELAY_900S + ))) { + throw new Zend_Mobile_Push_Message_Exception('$delay must be one of the DELAY_* constants'); + } + $this->_delay = $delay; + return $this; + } + + /** + * Get Notification Type + * + * @return string + */ + public static function getNotificationType() + { + return 'toast'; + } + + /** + * Get XML Payload + * + * @return string + */ + public function getXmlPayload() + { + $ret = '<?xml version="1.0" encoding="utf-8"?>' + . '<wp:Notification xmlns:wp="WPNotification">' + . '<wp:Toast>' + . '<wp:Text1>' . htmlspecialchars($this->_title) . '</wp:Text1>' + . '<wp:Text2>' . htmlspecialchars($this->_msg) . '</wp:Text2>'; + if (!empty($this->_params)) { + $ret .= '<wp:Param>' . htmlspecialchars($this->_params) . '</wp:Param>'; + } + $ret .= '</wp:Toast>' + . '</wp:Notification>'; + return $ret; + } + + /** + * Validate proper mpns message + * + * @return boolean + */ + public function validate() + { + if (!isset($this->_token) || strlen($this->_token) === 0) { + return false; + } + if (empty($this->_title)) { + return false; + } + if (empty($this->_msg)) { + return false; + } + return parent::validate(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Mpns.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Mpns.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,152 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** Zend_Http_Client **/ +require_once 'Zend/Http/Client.php'; + +/** Zend_Mobile_Push_Abstract **/ +require_once 'Zend/Mobile/Push/Abstract.php'; + +/** Zend_Mobile_Push_Message_Mpns **/ +require_once 'Zend/Mobile/Push/Message/Mpns.php'; + +/** + * Mpns Push + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Mpns extends Zend_Mobile_Push_Abstract +{ + /** + * Http Client + * + * @var Client + */ + protected $_httpClient; + + /** + * Get Http Client + * + * @return Zend_Http_Client + */ + public function getHttpClient() + { + if (!$this->_httpClient) { + $this->_httpClient = new Zend_Http_Client(); + $this->_httpClient->setConfig(array( + 'strictredirects' => true, + )); + } + return $this->_httpClient; + } + + /** + * Set Http Client + * + * @return Zend_Mobile_Push_Mpns + */ + public function setHttpClient(Zend_Http_Client $client) + { + $this->_httpClient = $client; + return $this; + } + + /** + * Send Message + * + * @param Zend_Mobile_Push_Message_Mpns $message + * @return boolean + * @throws Zend_Mobile_Push_Exception + */ + public function send(Zend_Mobile_Push_Message_Abstract $message) + { + if (!$message->validate()) { + throw new Zend_Mobile_Push_Exception('The message is not valid.'); + } + + $this->connect(); + + $client = $this->getHttpClient(); + $client->setUri($message->getToken()); + $client->setHeaders(array( + 'Context-Type' => 'text/xml', + 'Accept' => 'application/*', + 'X-NotificationClass' => $message->getDelay() + )); + if ($message->getId()) { + $client->setHeaders('X-MessageID', $message->getId()); + } + if ($message->getNotificationType() != Zend_Mobile_Push_Message_Mpns::TYPE_RAW) { + $client->setHeaders('X-WindowsPhone-Target', $message->getNotificationType()); + } + $client->setRawData($message->getXmlPayload(), 'text/xml'); + $response = $client->request('POST'); + $this->close(); + + + switch ($response->getStatus()) + { + case 200: + // check headers for response? need to test how this actually works to correctly handle different states. + if ($response->getHeader('NotificationStatus') == 'QueueFull') { + require_once 'Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php'; + throw new Zend_Mobile_Push_Exception_DeviceQuotaExceeded('The devices push notification queue is full, use exponential backoff'); + } + break; + case 400: + require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; + throw new Zend_Mobile_Push_Exception_InvalidPayload('The message xml was invalid'); + break; + case 401: + require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; + throw new Zend_Mobile_Push_Exception_InvalidToken('The device token is not valid or there is a mismatch between certificates'); + break; + case 404: + require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; + throw new Zend_Mobile_Push_Exception_InvalidToken('The device subscription is invalid, stop sending notifications to this device'); + break; + case 405: + throw new Zend_Mobile_Push_Exception('Invalid method, only POST is allowed'); // will never be hit unless overwritten + break; + case 406: + require_once 'Zend/Mobile/Push/Exception/QuotaExceeded.php'; + throw new Zend_Mobile_Push_Exception_QuotaExceeded('The unauthenticated web service has reached the per-day throttling limit'); + break; + case 412: + require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; + throw new Zend_Mobile_Push_Exception_InvalidToken('The device is in an inactive state. You may retry once per hour'); + break; + case 503: + require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; + throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server was unavailable.'); + break; + default: + break; + } + return true; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Response/Gcm.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Response/Gcm.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,242 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * Gcm Response + * + * @category Zend + * @package Zend_Mobile + * @subpackage Zend_Mobile_Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ +class Zend_Mobile_Push_Response_Gcm +{ + + const RESULT_MESSAGE_ID = 'message_id'; + const RESULT_ERROR = 'error'; + const RESULT_CANONICAL = 'registration_id'; + + /** + * Multicast ID + * @var int + */ + protected $_id; + + /** + * Success Count + * @var int + */ + protected $_successCnt; + + /** + * Failure Count + * @var int + */ + protected $_failureCnt; + + /** + * Canonical registration id count + * @var int + */ + protected $_canonicalCnt; + + /** + * Message + * @var Zend_Mobile_Push_Message_Gcm + */ + protected $_message; + + /** + * Results + * @var array + */ + protected $_results; + + /** + * Raw Response + * @var array + */ + protected $_response; + + /** + * Constructor + * + * @param string $responseString JSON encoded response + * @param Zend_Mobile_Push_Message_Gcm $message + * @return Zend_Mobile_Push_Response_Gcm + * @throws Zend_Mobile_Push_Exception_ServerUnavailable + */ + public function __construct($responseString = null, Zend_Mobile_Push_Message_Gcm $message = null) + { + if ($responseString) { + if (!$response = json_decode($responseString, true)) { + require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; + throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server gave us an invalid response, try again later'); + } + $this->setResponse($response); + } + + if ($message) { + $this->setMessage($message); + } + + } + + /** + * Get Message + * + * @return Zend_Mobile_Push_Message_Gcm + */ + public function getMessage() + { + return $this->_message; + } + + /** + * Set Message + * + * @param Zend_Mobile_Push_Message_Gcm $message + * @return Zend_Mobile_Push_Response_Gcm + */ + public function setMessage(Zend_Mobile_Push_Message_Gcm $message) + { + $this->_message = $message; + return $this; + } + + /** + * Get Response + * + * @return array + */ + public function getResponse() + { + return $this->_response; + } + + /** + * Set Response + * + * @param array $response + * @return Zend_Mobile_Push_Response_Gcm + */ + public function setResponse(array $response) + { + if (!isset($response['results']) || + !isset($response['success']) || + !isset($response['failure']) || + !isset($response['canonical_ids']) || + !isset($response['multicast_id'])) { + throw new Zend_Mobile_Push_Exception('Response did not contain the proper fields'); + } + $this->_response = $response; + $this->_results = $response['results']; + $this->_successCnt = (int) $response['success']; + $this->_failureCnt = (int) $response['failure']; + $this->_canonicalCnt = (int) $response['canonical_ids']; + $this->_id = (int) $response['multicast_id']; + return $this; + } + + /** + * Get Success Count + * + * @return int + */ + public function getSuccessCount() + { + return $this->_successCnt; + } + + /** + * Get Failure Count + * + * @return int + */ + public function getFailureCount() + { + return $this->_failureCnt; + } + + /** + * Get Canonical Count + * + * @return int + */ + public function getCanonicalCount() + { + return $this->_canonicalCnt; + } + + /** + * Get Results + * + * @return array multi dimensional array of: + * NOTE: key is registration_id if the message is passed. + * 'registration_id' => array( + * 'message_id' => 'id', + * 'error' => 'error', + * 'registration_id' => 'id' + * ) + */ + public function getResults() + { + return $this->_correlate(); + } + + /** + * Get Singular Result + * + * @param int $flag one of the RESULT_* flags + * @return array singular array with keys being registration id + * value is the type of result + */ + public function getResult($flag) + { + $ret = array(); + foreach ($this->_correlate() as $k => $v) { + if (isset($v[$flag])) { + $ret[$k] = $v[$flag]; + } + } + return $ret; + } + + /** + * Correlate Message and Result + * + * @return array + */ + protected function _correlate() + { + $results = $this->_results; + if ($this->_message && $results) { + $tokens = $this->_message->getToken(); + while($token = array_shift($tokens)) { + $results[$token] = array_shift($results); + } + } + return $results; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Mobile/Push/Test/ApnsProxy.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Mobile/Push/Test/ApnsProxy.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,103 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Mobile + * @subpackage Push + * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id $ + */ + +/** Zend_Mobile_Push_Apns **/ +require_once 'Zend/Mobile/Push/Apns.php'; + +/** + * Apns Test Proxy + * This class is utilized for unit testing purposes + * + * @category Zend + * @package Zend_Mobile + * @subpackage Push + */ +class Zend_Mobile_Push_Test_ApnsProxy extends Zend_Mobile_Push_Apns +{ + /** + * Read Response + * + * @var string + */ + protected $_readResponse; + + /** + * Write Response + * + * @var mixed + */ + protected $_writeResponse; + + /** + * Set the Response + * + * @param string $str + * @return Zend_Mobile_Push_ApnsProxy + */ + public function setReadResponse($str) { + $this->_readResponse = $str; + } + + /** + * Set the write response + * + * @param mixed $resp + * @return void + */ + public function setWriteResponse($resp) + { + $this->_writeResponse = $resp; + } + + /** + * Connect + * + * @return true + */ + protected function _connect($uri) { + return true; + } + + /** + * Return Response + * + * @param string $length + * @return string + */ + protected function _read($length) { + $ret = substr($this->_readResponse, 0, $length); + $this->_readResponse = null; + return $ret; + } + + /** + * Write and Return Length + * + * @param string $payload + * @return int + */ + protected function _write($payload) { + $ret = $this->_writeResponse; + $this->_writeResponse = null; + return (null === $ret) ? strlen($payload) : $ret; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Navigation.php --- a/web/lib/Zend/Navigation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Navigation.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Navigation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Navigation.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation extends Zend_Navigation_Container diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Navigation/Container.php --- a/web/lib/Zend/Navigation/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Navigation/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Container.php 25237 2013-01-22 08:32:38Z frosch $ */ /** @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Navigation_Container implements RecursiveIterator, Countable @@ -143,9 +143,12 @@ /** * Adds several pages at once * - * @param array|Zend_Config $pages pages to add - * @return Zend_Navigation_Container fluent interface, returns self - * @throws Zend_Navigation_Exception if $pages is not array or Zend_Config + * @param array|Zend_Config|Zend_Navigation_Container $pages pages to add + * @return Zend_Navigation_Container fluent interface, + * returns self + * @throws Zend_Navigation_Exception if $pages is not + * array, Zend_Config or + * Zend_Navigation_Container */ public function addPages($pages) { @@ -153,11 +156,16 @@ $pages = $pages->toArray(); } + if ($pages instanceof Zend_Navigation_Container) { + $pages = iterator_to_array($pages); + } + if (!is_array($pages)) { require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( - 'Invalid argument: $pages must be an array or an ' . - 'instance of Zend_Config'); + 'Invalid argument: $pages must be an array, an ' . + 'instance of Zend_Config or an instance of ' . + 'Zend_Navigation_Container'); } foreach ($pages as $page) { @@ -266,45 +274,138 @@ } /** - * Returns a child page matching $property == $value, or null if not found + * Returns a child page matching $property == $value or + * preg_match($value, $property), or null if not found * - * @param string $property name of property to match against - * @param mixed $value value to match property against + * @param string $property name of property to match against + * @param mixed $value value to match property against + * @param bool $useRegex [optional] if true PHP's preg_match + * is used. Default is false. * @return Zend_Navigation_Page|null matching page or null */ - public function findOneBy($property, $value) - { - $iterator = new RecursiveIteratorIterator($this, - RecursiveIteratorIterator::SELF_FIRST); + public function findOneBy($property, $value, $useRegex = false) + { + $iterator = new RecursiveIteratorIterator( + $this, + RecursiveIteratorIterator::SELF_FIRST + ); foreach ($iterator as $page) { - if ($page->get($property) == $value) { - return $page; + $pageProperty = $page->get($property); + + // Rel and rev + if (is_array($pageProperty)) { + foreach ($pageProperty as $item) { + if (is_array($item)) { + // Use regex? + if (true === $useRegex) { + foreach ($item as $item2) { + if (0 !== preg_match($value, $item2)) { + return $page; + } + } + } else { + if (in_array($value, $item)) { + return $page; + } + } + } else { + // Use regex? + if (true === $useRegex) { + if (0 !== preg_match($value, $item)) { + return $page; + } + } else { + if ($item == $value) { + return $page; + } + } + } + } + + continue; + } + + // Use regex? + if (true === $useRegex) { + if (preg_match($value, $pageProperty)) { + return $page; + } + } else { + if ($pageProperty == $value) { + return $page; + } } } - + return null; } /** - * Returns all child pages matching $property == $value, or an empty array - * if no pages are found + * Returns all child pages matching $property == $value or + * preg_match($value, $property), or an empty array if no pages are found * * @param string $property name of property to match against * @param mixed $value value to match property against + * @param bool $useRegex [optional] if true PHP's preg_match is used. + * Default is false. * @return array array containing only Zend_Navigation_Page * instances */ - public function findAllBy($property, $value) - { + public function findAllBy($property, $value, $useRegex = false) + { $found = array(); - $iterator = new RecursiveIteratorIterator($this, - RecursiveIteratorIterator::SELF_FIRST); - + $iterator = new RecursiveIteratorIterator( + $this, + RecursiveIteratorIterator::SELF_FIRST + ); + foreach ($iterator as $page) { - if ($page->get($property) == $value) { - $found[] = $page; + $pageProperty = $page->get($property); + + // Rel and rev + if (is_array($pageProperty)) { + foreach ($pageProperty as $item) { + if (is_array($item)) { + // Use regex? + if (true === $useRegex) { + foreach ($item as $item2) { + if (0 !== preg_match($value, $item2)) { + $found[] = $page; + } + } + } else { + if (in_array($value, $item)) { + $found[] = $page; + } + } + } else { + // Use regex? + if (true === $useRegex) { + if (0 !== preg_match($value, $item)) { + $found[] = $page; + } + } else { + if ($item == $value) { + $found[] = $page; + } + } + } + } + + continue; + } + + // Use regex? + if (true === $useRegex) { + if (0 !== preg_match($value, $pageProperty)) { + $found[] = $page; + } + } else { + if ($pageProperty == $value) { + $found[] = $page; + } } } @@ -312,7 +413,8 @@ } /** - * Returns page(s) matching $property == $value + * Returns page(s) matching $property == $value or + * preg_match($value, $property) * * @param string $property name of property to match against * @param mixed $value value to match property against @@ -322,14 +424,16 @@ * matching pages are found. If false, null will * be returned if no matching page is found. * Default is false. + * @param bool $useRegex [optional] if true PHP's preg_match is used. + * Default is false. * @return Zend_Navigation_Page|null matching page or null */ - public function findBy($property, $value, $all = false) + public function findBy($property, $value, $all = false, $useRegex = false) { if ($all) { - return $this->findAllBy($property, $value); + return $this->findAllBy($property, $value, $useRegex); } else { - return $this->findOneBy($property, $value); + return $this->findOneBy($property, $value, $useRegex); } } @@ -338,27 +442,33 @@ * * Examples of finder calls: * <code> - * // METHOD // SAME AS - * $nav->findByLabel('foo'); // $nav->findOneBy('label', 'foo'); - * $nav->findOneByLabel('foo'); // $nav->findOneBy('label', 'foo'); - * $nav->findAllByClass('foo'); // $nav->findAllBy('class', 'foo'); + * // METHOD // SAME AS + * $nav->findByLabel('foo'); // $nav->findOneBy('label', 'foo'); + * $nav->findByLabel('/foo/', true); // $nav->findBy('label', '/foo/', true); + * $nav->findOneByLabel('foo'); // $nav->findOneBy('label', 'foo'); + * $nav->findAllByClass('foo'); // $nav->findAllBy('class', 'foo'); * </code> * - * @param string $method method name - * @param array $arguments method arguments - * @throws Zend_Navigation_Exception if method does not exist + * @param string $method method name + * @param array $arguments method arguments + * @return mixed Zend_Navigation|array|null matching page, array of pages + * or null + * @throws Zend_Navigation_Exception if method does not exist */ public function __call($method, $arguments) { if (@preg_match('/(find(?:One|All)?By)(.+)/', $method, $match)) { - return $this->{$match[1]}($match[2], $arguments[0]); + return $this->{$match[1]}($match[2], $arguments[0], !empty($arguments[1])); } require_once 'Zend/Navigation/Exception.php'; - throw new Zend_Navigation_Exception(sprintf( + throw new Zend_Navigation_Exception( + sprintf( 'Bad method call: Unknown method %s::%s', get_class($this), - $method)); + $method + ) + ); } /** @@ -369,7 +479,7 @@ public function toArray() { $pages = array(); - + $this->_dirtyIndex = true; $this->_sort(); $indexes = array_keys($this->_index); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Navigation/Exception.php --- a/web/lib/Zend/Navigation/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Navigation/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Navigation/Page.php --- a/web/lib/Zend/Navigation/Page.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Navigation/Page.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Page.php 22882 2010-08-22 14:00:16Z freak $ + * @version $Id: Page.php 25125 2012-11-16 15:12:06Z rob $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Navigation_Page extends Zend_Navigation_Container @@ -42,6 +42,20 @@ protected $_label; /** + * Fragment identifier (anchor identifier) + * + * The fragment identifier (anchor identifier) pointing to an anchor within + * a resource that is subordinate to another, primary resource. + * The fragment identifier introduced by a hash mark "#". + * Example: http://www.example.org/foo.html#bar ("bar" is the fragment identifier) + * + * @link http://www.w3.org/TR/html401/intro/intro.html#fragment-uri + * + * @var string|null + */ + protected $_fragment; + + /** * Page id * * @var string|null @@ -70,6 +84,18 @@ protected $_target; /** + * Accessibility key character + * + * This attribute assigns an access key to an element. An access key is a + * single character from the document character set. + * + * @link http://www.w3.org/TR/html401/interact/forms.html#access-keys + * + * @var string|null + */ + protected $_accesskey; + + /** * Forward links to other pages * * @link http://www.w3.org/TR/html4/struct/links.html#h-12.3.1 @@ -137,12 +163,19 @@ protected $_properties = array(); /** + * Custom HTML attributes + * + * @var array + */ + protected $_customHtmlAttribs = array(); + + /** * The type of page to use when it wasn't set - * + * * @var string */ protected static $_defaultPageType; - + // Initialization: /** @@ -191,7 +224,7 @@ } elseif(self::getDefaultPageType()!= null) { $type = self::getDefaultPageType(); } - + if(isset($type)) { if (is_string($type) && !empty($type)) { switch (strtolower($type)) { @@ -222,7 +255,8 @@ $hasUri = isset($options['uri']); $hasMvc = isset($options['action']) || isset($options['controller']) || - isset($options['module']) || isset($options['route']); + isset($options['module']) || isset($options['route']) || + isset($options['params']); if ($hasMvc) { require_once 'Zend/Navigation/Page/Mvc.php'; @@ -232,9 +266,14 @@ return new Zend_Navigation_Page_Uri($options); } else { require_once 'Zend/Navigation/Exception.php'; - throw new Zend_Navigation_Exception( - 'Invalid argument: Unable to determine class to instantiate'); + + $message = 'Invalid argument: Unable to determine class to instantiate'; + if (isset($options['label'])) { + $message .= ' (Page label: ' . $options['label'] . ')'; } + + throw new Zend_Navigation_Exception($message); + } } /** @@ -330,6 +369,35 @@ } /** + * Sets a fragment identifier + * + * @param string $fragment new fragment identifier + * @return Zend_Navigation_Page fluent interface, returns self + * @throws Zend_Navigation_Exception if empty/no string is given + */ + public function setFragment($fragment) + { + if (null !== $fragment && !is_string($fragment)) { + require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $fragment must be a string or null'); + } + + $this->_fragment = $fragment; + return $this; + } + + /** + * Returns fragment identifier + * + * @return string|null fragment identifier + */ + public function getFragment() + { + return $this->_fragment; + } + + /** * Sets page id * * @param string|null $id [optional] id to set. Default is null, @@ -451,6 +519,40 @@ } /** + * Sets access key for this page + * + * @param string|null $character [optional] access key to set. Default + * is null, which sets no access key. + * @return Zend_Navigation_Page fluent interface, returns self + * @throws Zend_Navigation_Exception if access key is not string or null or + * if the string length not equal to one + */ + public function setAccesskey($character = null) + { + if (null !== $character + && (!is_string($character) || 1 != strlen($character))) + { + require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $character must be a single character or null' + ); + } + + $this->_accesskey = $character; + return $this; + } + + /** + * Returns page access key + * + * @return string|null page access key or null + */ + public function getAccesskey() + { + return $this->_accesskey; + } + + /** * Sets the page's forward links to other pages * * This method expects an associative array of forward links to other pages, @@ -577,6 +679,119 @@ } /** + * Sets a single custom HTML attribute + * + * @param string $name name of the HTML attribute + * @param string|null $value value for the HTML attribute + * @return Zend_Navigation_Page fluent interface, returns self + * @throws Zend_Navigation_Exception if name is not string or value is + * not null or a string + */ + public function setCustomHtmlAttrib($name, $value) + { + if (!is_string($name)) { + require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $name must be a string' + ); + } + + if (null !== $value && !is_string($value)) { + require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $value must be a string or null' + ); + } + + if (null === $value && isset($this->_customHtmlAttribs[$name])) { + unset($this->_customHtmlAttribs[$name]); + } else { + $this->_customHtmlAttribs[$name] = $value; + } + + return $this; + } + + /** + * Returns a single custom HTML attributes by name + * + * @param string $name name of the HTML attribute + * @return string|null value for the HTML attribute or null + * @throws Zend_Navigation_Exception if name is not string + */ + public function getCustomHtmlAttrib($name) + { + if (!is_string($name)) { + require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $name must be a string' + ); + } + + if (isset($this->_customHtmlAttribs[$name])) { + return $this->_customHtmlAttribs[$name]; + } + + return null; + } + + /** + * Sets multiple custom HTML attributes at once + * + * @param array $attribs an associative array of html attributes + * @return Zend_Navigation_Page fluent interface, returns self + */ + public function setCustomHtmlAttribs(array $attribs) + { + foreach ($attribs as $key => $value) { + $this->setCustomHtmlAttrib($key, $value); + } + return $this; + } + + /** + * Returns all custom HTML attributes as an array + * + * @return array an array containing custom HTML attributes + */ + public function getCustomHtmlAttribs() + { + return $this->_customHtmlAttribs; + } + + /** + * Removes a custom HTML attribute from the page + * + * @param string $name name of the custom HTML attribute + * @return Zend_Navigation_Page fluent interface, returns self + */ + public function removeCustomHtmlAttrib($name) + { + if (!is_string($name)) { + require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $name must be a string' + ); + } + + if (isset($this->_customHtmlAttribs[$name])) { + unset($this->_customHtmlAttribs[$name]); + } + } + + /** + * Clear all custom HTML attributes + * + * @return Zend_Navigation_Page fluent interface, returns self + */ + public function clearCustomHtmlAttribs() + { + $this->_customHtmlAttribs = array(); + + return $this; + } + + /** * Sets page order to use in parent container * * @param int $order [optional] page order in container. @@ -740,6 +955,9 @@ */ public function setVisible($visible = true) { + if (is_string($visible) && 'false' == strtolower($visible)) { + $visible = false; + } $this->_visible = (bool) $visible; return $this; } @@ -1090,21 +1308,25 @@ return array_merge( $this->getCustomProperties(), array( - 'label' => $this->getlabel(), - 'id' => $this->getId(), - 'class' => $this->getClass(), - 'title' => $this->getTitle(), - 'target' => $this->getTarget(), - 'rel' => $this->getRel(), - 'rev' => $this->getRev(), - 'order' => $this->getOrder(), - 'resource' => $this->getResource(), - 'privilege' => $this->getPrivilege(), - 'active' => $this->isActive(), - 'visible' => $this->isVisible(), - 'type' => get_class($this), - 'pages' => parent::toArray() - )); + 'label' => $this->getlabel(), + 'fragment' => $this->getFragment(), + 'id' => $this->getId(), + 'class' => $this->getClass(), + 'title' => $this->getTitle(), + 'target' => $this->getTarget(), + 'accesskey' => $this->getAccesskey(), + 'rel' => $this->getRel(), + 'rev' => $this->getRev(), + 'customHtmlAttribs' => $this->getCustomHtmlAttribs(), + 'order' => $this->getOrder(), + 'resource' => $this->getResource(), + 'privilege' => $this->getPrivilege(), + 'active' => $this->isActive(), + 'visible' => $this->isVisible(), + 'type' => get_class($this), + 'pages' => parent::toArray() + ) + ); } // Internal methods: @@ -1119,17 +1341,17 @@ { return str_replace(' ', '', ucwords(str_replace('_', ' ', $property))); } - + public static function setDefaultPageType($type = null) { if($type !== null && !is_string($type)) { throw new Zend_Navigation_Exception( 'Cannot set default page type: type is no string but should be' ); } - + self::$_defaultPageType = $type; } - + public static function getDefaultPageType() { return self::$_defaultPageType; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Navigation/Page/Mvc.php --- a/web/lib/Zend/Navigation/Page/Mvc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Navigation/Page/Mvc.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mvc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mvc.php 25213 2013-01-11 08:19:09Z frosch $ */ /** @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page @@ -95,6 +95,29 @@ protected $_resetParams = true; /** + * Whether href should be encoded when assembling URL + * + * @see getHref() + * @var bool + */ + protected $_encodeUrl = true; + + /** + * Whether this page should be considered active + * + * @var bool + */ + protected $_active = null; + + /** + * Scheme to use when assembling URL + * + * @see getHref() + * @var string + */ + protected $_scheme; + + /** * Cached href * * The use of this variable minimizes execution time when getHref() is @@ -113,6 +136,14 @@ */ protected static $_urlHelper = null; + /** + * View helper for assembling URLs with schemes + * + * @see getHref() + * @var Zend_View_Helper_ServerUrl + */ + protected static $_schemeHelper = null; + // Accessors: /** @@ -128,39 +159,57 @@ */ public function isActive($recursive = false) { - if (!$this->_active) { - $front = Zend_Controller_Front::getInstance(); - $reqParams = $front->getRequest()->getParams(); - - if (!array_key_exists('module', $reqParams)) { - $reqParams['module'] = $front->getDefaultModule(); + if (null === $this->_active) { + $front = Zend_Controller_Front::getInstance(); + $request = $front->getRequest(); + $reqParams = array(); + if ($request) { + $reqParams = $request->getParams(); + if (!array_key_exists('module', $reqParams)) { + $reqParams['module'] = $front->getDefaultModule(); + } } $myParams = $this->_params; + if ($this->_route) { + $route = $front->getRouter()->getRoute($this->_route); + if(method_exists($route, 'getDefaults')) { + $myParams = array_merge($route->getDefaults(), $myParams); + } + } + if (null !== $this->_module) { $myParams['module'] = $this->_module; - } else { + } elseif(!array_key_exists('module', $myParams)) { $myParams['module'] = $front->getDefaultModule(); } if (null !== $this->_controller) { $myParams['controller'] = $this->_controller; - } else { + } elseif(!array_key_exists('controller', $myParams)) { $myParams['controller'] = $front->getDefaultControllerName(); } if (null !== $this->_action) { $myParams['action'] = $this->_action; - } else { + } elseif(!array_key_exists('action', $myParams)) { $myParams['action'] = $front->getDefaultAction(); } + foreach($myParams as $key => $value) { + if(null === $value) { + unset($myParams[$key]); + } + } + if (count(array_intersect_assoc($reqParams, $myParams)) == count($myParams)) { $this->_active = true; return true; } + + $this->_active = false; } return parent::isActive($recursive); @@ -201,8 +250,26 @@ $url = self::$_urlHelper->url($params, $this->getRoute(), - $this->getResetParams()); + $this->getResetParams(), + $this->getEncodeUrl()); + // Use scheme? + $scheme = $this->getScheme(); + if (null !== $scheme) { + if (null === self::$_schemeHelper) { + require_once 'Zend/View/Helper/ServerUrl.php'; + self::$_schemeHelper = new Zend_View_Helper_ServerUrl(); + } + + $url = self::$_schemeHelper->setScheme($scheme)->serverUrl($url); + } + + // Add the fragment identifier if it is set + $fragment = $this->getFragment(); + if (null !== $fragment) { + $url .= '#' . $fragment; + } + return $this->_hrefCache = $url; } @@ -309,33 +376,109 @@ } /** - * Sets params to use when assembling URL + * Set multiple parameters (to use when assembling URL) at once + * + * URL options passed to the url action helper for assembling URLs. + * Overwrites any previously set parameters! + * + * @see getHref() + * + * @param array|null $params [optional] paramters as array + * ('name' => 'value'). Default is null + * which clears all params. + * @return Zend_Navigation_Page_Mvc fluent interface, returns self + */ + public function setParams(array $params = null) + { + $this->clearParams(); + + if (is_array($params)) { + $this->addParams($params); + } + + return $this; + } + + /** + * Set parameter (to use when assembling URL) + * + * URL option passed to the url action helper for assembling URLs. * * @see getHref() * - * @param array|null $params [optional] page params. Default is null - * which sets no params. - * @return Zend_Navigation_Page_Mvc fluent interface, returns self + * @param string $name parameter name + * @param mixed $value parameter value + * @return Zend_Navigation_Page_Mvc fluent interface, returns self */ - public function setParams(array $params = null) + public function setParam($name, $value) { - if (null === $params) { - $this->_params = array(); - } else { - // TODO: do this more intelligently? - $this->_params = $params; - } + $name = (string) $name; + $this->_params[$name] = $value; $this->_hrefCache = null; return $this; } /** - * Returns params to use when assembling URL + * Add multiple parameters (to use when assembling URL) at once + * + * URL options passed to the url action helper for assembling URLs. + * + * @see getHref() * + * @param array $params paramters as array ('name' => 'value') + * @return Zend_Navigation_Page_Mvc fluent interface, returns self + */ + public function addParams(array $params) + { + foreach ($params as $name => $value) { + $this->setParam($name, $value); + } + + return $this; + } + + /** + * Remove parameter (to use when assembling URL) + * * @see getHref() * - * @return array page params + * @param string $name + * @return bool + */ + public function removeParam($name) + { + if (array_key_exists($name, $this->_params)) { + unset($this->_params[$name]); + + $this->_hrefCache = null; + return true; + } + + return false; + } + + /** + * Clear all parameters (to use when assembling URL) + * + * @see getHref() + * + * @return Zend_Navigation_Page_Mvc fluent interface, returns self + */ + public function clearParams() + { + $this->_params = array(); + + $this->_hrefCache = null; + return $this; + } + + /** + * Retrieve all parameters (to use when assembling URL) + * + * @see getHref() + * + * @return array parameters as array ('name' => 'value') */ public function getParams() { @@ -343,6 +486,25 @@ } /** + * Retrieve a single parameter (to use when assembling URL) + * + * @see getHref() + * + * @param string $name parameter name + * @return mixed + */ + public function getParam($name) + { + $name = (string) $name; + + if (!array_key_exists($name, $this->_params)) { + return null; + } + + return $this->_params[$name]; + } + + /** * Sets route name to use when assembling URL * * @see getHref() @@ -405,6 +567,68 @@ } /** + * Sets whether href should be encoded when assembling URL + * + * @see getHref() + * + * @param bool $resetParams whether href should be encoded when + * assembling URL + * @return Zend_Navigation_Page_Mvc fluent interface, returns self + */ + public function setEncodeUrl($encodeUrl) + { + $this->_encodeUrl = (bool) $encodeUrl; + $this->_hrefCache = null; + + return $this; + } + + /** + * Returns whether herf should be encoded when assembling URL + * + * @see getHref() + * + * @return bool whether herf should be encoded when assembling URL + */ + public function getEncodeUrl() + { + return $this->_encodeUrl; + } + + /** + * Sets scheme to use when assembling URL + * + * @see getHref() + * + * @param string|null $scheme scheme + * @return Zend_Navigation_Page_Mvc fluent interface, returns self + */ + public function setScheme($scheme) + { + if (null !== $scheme && !is_string($scheme)) { + require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $scheme must be a string or null' + ); + } + + $this->_scheme = $scheme; + return $this; + } + + /** + * Returns scheme to use when assembling URL + * + * @see getHref() + * + * @return string|null scheme or null + */ + public function getScheme() + { + return $this->_scheme; + } + + /** * Sets action helper for assembling URLs * * @see getHref() @@ -417,6 +641,19 @@ self::$_urlHelper = $uh; } + /** + * Sets view helper for assembling URLs with schemes + * + * @see getHref() + * + * @param Zend_View_Helper_ServerUrl $sh scheme helper + * @return void + */ + public static function setSchemeHelper(Zend_View_Helper_ServerUrl $sh) + { + self::$_schemeHelper = $sh; + } + // Public methods: /** @@ -434,7 +671,10 @@ 'module' => $this->getModule(), 'params' => $this->getParams(), 'route' => $this->getRoute(), - 'reset_params' => $this->getResetParams() - )); + 'reset_params' => $this->getResetParams(), + 'encodeUrl' => $this->getEncodeUrl(), + 'scheme' => $this->getScheme(), + ) + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Navigation/Page/Uri.php --- a/web/lib/Zend/Navigation/Page/Uri.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Navigation/Page/Uri.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uri.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Uri.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation_Page_Uri extends Zend_Navigation_Page @@ -79,7 +79,18 @@ */ public function getHref() { - return $this->getUri(); + $uri = $this->getUri(); + + $fragment = $this->getFragment(); + if (null !== $fragment) { + if ('#' == substr($uri, -1)) { + return $uri . $fragment; + } else { + return $uri . '#' . $fragment; + } + } + + return $uri; } // Public methods: diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth.php --- a/web/lib/Zend/Oauth.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oauth.php 21070 2010-02-16 14:34:25Z padraic $ + * @version $Id: Oauth.php 25167 2012-12-19 16:28:01Z matthew $ */ /** Zend_Http_Client */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth @@ -38,6 +38,7 @@ const PUT = 'PUT'; const DELETE = 'DELETE'; const HEAD = 'HEAD'; + const OPTIONS = 'OPTIONS'; /** * Singleton instance if required of the HTTP client diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Client.php --- a/web/lib/Zend/Oauth/Client.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 23076 2010-10-10 21:37:20Z padraic $ + * @version $Id: Client.php 25167 2012-12-19 16:28:01Z matthew $ */ /** Zend_Oauth */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Client extends Zend_Http_Client @@ -69,14 +69,18 @@ * assist in automating OAuth parameter generation, addition and * cryptographioc signing of requests. * - * @param array $oauthOptions - * @param string $uri + * @param array|Zend_Config $oauthOptions + * @param string $uri * @param array|Zend_Config $config * @return void */ public function __construct($oauthOptions, $uri = null, $config = null) { - if (!isset($config['rfc3986_strict'])) { + if ($config instanceof Zend_Config && !isset($config->rfc3986_strict)) { + $config = $config->toArray(); + $config['rfc3986_strict'] = true; + } else if (null === $config || + (is_array($config) && !isset($config['rfc3986_strict']))) { $config['rfc3986_strict'] = true; } parent::__construct($uri, $config); @@ -89,16 +93,6 @@ } } - /** - * Return the current connection adapter - * - * @return Zend_Http_Client_Adapter_Interface|string $adapter - */ - public function getAdapter() - { - return $this->adapter; - } - /** * Load the connection adapter * @@ -202,10 +196,12 @@ $this->setRequestMethod(self::POST); } elseif($method == self::PUT) { $this->setRequestMethod(self::PUT); - } elseif($method == self::DELETE) { + } elseif($method == self::DELETE) { $this->setRequestMethod(self::DELETE); - } elseif($method == self::HEAD) { + } elseif($method == self::HEAD) { $this->setRequestMethod(self::HEAD); + } elseif($method == self::OPTIONS) { + $this->setRequestMethod(self::OPTIONS); } return parent::setMethod($method); } @@ -246,7 +242,8 @@ $oauthHeaderValue = $this->getToken()->toHeader( $this->getUri(true), $this->_config, - $this->_getSignableParametersAsQueryString() + $this->_getSignableParametersAsQueryString(), + $this->getRealm() ); $this->setHeaders('Authorization', $oauthHeaderValue); } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY) { @@ -266,14 +263,14 @@ $this->setRawData($raw, 'application/x-www-form-urlencoded'); $this->paramsPost = array(); } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_QUERYSTRING) { - $params = array(); + $params = $this->paramsGet; $query = $this->getUri()->getQuery(); if ($query) { $queryParts = explode('&', $this->getUri()->getQuery()); foreach ($queryParts as $queryPart) { $kvTuple = explode('=', $queryPart); $params[urldecode($kvTuple[0])] = - (array_key_exists(1, $kvTuple) ? urldecode($kvTuple[1]) : NULL); + (array_key_exists(1, $kvTuple) ? urldecode($kvTuple[1]) : null); } } if (!empty($this->paramsPost)) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Config.php --- a/web/lib/Zend/Oauth/Config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Config.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Config.php 25167 2012-12-19 16:28:01Z matthew $ */ /** Zend_Oauth */ @@ -31,7 +31,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface @@ -146,6 +146,13 @@ * @var Zend_Oauth_Token */ protected $_token = null; + + /** + * Define the OAuth realm + * + * @var string + */ + protected $_realm = null; /** * Constructor; create a new object with an optional array|Zend_Config @@ -214,6 +221,9 @@ case 'rsaPublicKey': $this->setRsaPublicKey($value); break; + case 'realm': + $this->setRealm($value); + break; } } if (isset($options['requestScheme'])) { @@ -260,7 +270,7 @@ /** * Get consumer secret * - * Returns RSA private key if set; otherwise, returns any previously set + * Returns RSA private key if set; otherwise, returns any previously set * consumer secret. * * @return string @@ -380,7 +390,7 @@ */ public function setCallbackUrl($url) { - if (!Zend_Uri::check($url)) { + if (!Zend_Uri::check($url) && $url !== 'oob') { require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' @@ -451,7 +461,7 @@ /** * Get request token URL * - * If no request token URL has been set, but a site URL has, returns the + * If no request token URL has been set, but a site URL has, returns the * site URL with the string "/request_token" appended. * * @return string @@ -486,7 +496,7 @@ /** * Get access token URL * - * If no access token URL has been set, but a site URL has, returns the + * If no access token URL has been set, but a site URL has, returns the * site URL with the string "/access_token" appended. * * @return string @@ -543,7 +553,7 @@ /** * Get authorization URL * - * If no authorization URL has been set, but a site URL has, returns the + * If no authorization URL has been set, but a site URL has, returns the * site URL with the string "/authorize" appended. * * @return string @@ -567,10 +577,11 @@ { $method = strtoupper($method); if (!in_array($method, array( - Zend_Oauth::GET, - Zend_Oauth::POST, - Zend_Oauth::PUT, + Zend_Oauth::GET, + Zend_Oauth::POST, + Zend_Oauth::PUT, Zend_Oauth::DELETE, + Zend_Oauth::OPTIONS, )) ) { require_once 'Zend/Oauth/Exception.php'; @@ -655,4 +666,26 @@ { return $this->_token; } + + /** + * Set OAuth realm + * + * @param string $realm + * @return Zend_Oauth_Config + */ + public function setRealm($realm) + { + $this->_realm = $realm; + return $this; + } + + /** + * Get OAuth realm + * + * @return string + */ + public function getRealm() + { + return $this->_realm; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Config/ConfigInterface.php --- a/web/lib/Zend/Oauth/Config/ConfigInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Config/ConfigInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConfigInterface.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: ConfigInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Oauth_Config_ConfigInterface @@ -72,4 +72,8 @@ public function setToken(Zend_Oauth_Token $token); public function getToken(); + + public function setRealm($realm); + + public function getRealm(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Consumer.php --- a/web/lib/Zend/Oauth/Consumer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Consumer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Consumer.php 23170 2010-10-19 18:29:24Z mabe $ + * @version $Id: Consumer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth */ @@ -43,7 +43,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Consumer extends Zend_Oauth @@ -182,9 +182,9 @@ * @throws Zend_Oauth_Exception on invalid authorization token, non-matching response authorization token, or unprovided authorization token */ public function getAccessToken( - $queryData, + $queryData, Zend_Oauth_Token_Request $token, - $httpMethod = null, + $httpMethod = null, Zend_Oauth_Http_AccessToken $request = null ) { $authorizedToken = new Zend_Oauth_Token_AuthorizedRequest($queryData); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Exception.php --- a/web/lib/Zend/Oauth/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Exception extends Zend_Exception {} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Http.php --- a/web/lib/Zend/Oauth/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Http_Utility */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http @@ -80,7 +80,7 @@ * @return void */ public function __construct( - Zend_Oauth_Consumer $consumer, + Zend_Oauth_Consumer $consumer, array $parameters = null, Zend_Oauth_Http_Utility $utility = null ) { @@ -233,7 +233,7 @@ require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Could not retrieve a valid Token response from Token URL:' - . ($response !== null + . ($response !== null ? PHP_EOL . $response->getBody() : ' No body - check for headers') ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Http/AccessToken.php --- a/web/lib/Zend/Oauth/Http/AccessToken.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Http/AccessToken.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccessToken.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: AccessToken.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Http */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_AccessToken extends Zend_Oauth_Http diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Http/RequestToken.php --- a/web/lib/Zend/Oauth/Http/RequestToken.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Http/RequestToken.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RequestToken.php 23076 2010-10-10 21:37:20Z padraic $ + * @version $Id: RequestToken.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Http */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_RequestToken extends Zend_Oauth_Http diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Http/UserAuthorization.php --- a/web/lib/Zend/Oauth/Http/UserAuthorization.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Http/UserAuthorization.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserAuthorization.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: UserAuthorization.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Http */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_UserAuthorization extends Zend_Oauth_Http diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Http/Utility.php --- a/web/lib/Zend/Oauth/Http/Utility.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Http/Utility.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utility.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Utility.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_Utility @@ -43,7 +43,7 @@ * @return array */ public function assembleParams( - $url, + $url, Zend_Oauth_Config_ConfigInterface $config, array $serviceProviderParams = null ) { @@ -54,7 +54,7 @@ 'oauth_timestamp' => $this->generateTimestamp(), 'oauth_version' => $config->getVersion(), ); - + if ($config->getToken()->getToken() != null) { $params['oauth_token'] = $config->getToken()->getToken(); } @@ -96,8 +96,8 @@ } $encodedParams = array(); foreach ($params as $key => $value) { - $encodedParams[] = self::urlEncode($key) - . '=' + $encodedParams[] = self::urlEncode($key) + . '=' . self::urlEncode($value); } return implode('&', $encodedParams); @@ -105,10 +105,10 @@ /** * Cast to authorization header - * - * @param array $params - * @param null|string $realm - * @param bool $excludeCustomParams + * + * @param array $params + * @param null|string $realm + * @param bool $excludeCustomParams * @return void */ public function toAuthorizationHeader(array $params, $realm = null, $excludeCustomParams = true) @@ -123,7 +123,7 @@ continue; } } - $headerValue[] = self::urlEncode($key) + $headerValue[] = self::urlEncode($key) . '="' . self::urlEncode($value) . '"'; } @@ -132,13 +132,13 @@ /** * Sign request - * - * @param array $params - * @param string $signatureMethod - * @param string $consumerSecret - * @param null|string $tokenSecret - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param string $signatureMethod + * @param string $consumerSecret + * @param null|string $tokenSecret + * @param null|string $method + * @param null|string $url * @return string */ public function sign( @@ -161,8 +161,8 @@ /** * Parse query string - * - * @param mixed $query + * + * @param mixed $query * @return array */ public function parseQueryString($query) @@ -184,7 +184,7 @@ /** * Generate nonce - * + * * @return string */ public function generateNonce() @@ -194,7 +194,7 @@ /** * Generate timestamp - * + * * @return int */ public function generateTimestamp() @@ -204,8 +204,8 @@ /** * urlencode a value - * - * @param string $value + * + * @param string $value * @return string */ public static function urlEncode($value) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Signature/Hmac.php --- a/web/lib/Zend/Oauth/Signature/Hmac.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Signature/Hmac.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hmac.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Hmac.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Signature_SignatureAbstract */ @@ -28,17 +28,17 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Signature_Hmac extends Zend_Oauth_Signature_SignatureAbstract { /** * Sign a request - * - * @param array $params - * @param mixed $method - * @param mixed $url + * + * @param array $params + * @param mixed $method + * @param mixed $url * @return string */ public function sign(array $params, $method = null, $url = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Signature/Plaintext.php --- a/web/lib/Zend/Oauth/Signature/Plaintext.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Signature/Plaintext.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Plaintext.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Plaintext.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Signature_SignatureAbstract */ @@ -25,17 +25,17 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Signature_Plaintext extends Zend_Oauth_Signature_SignatureAbstract { /** * Sign a request - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ public function sign(array $params, $method = null, $url = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Signature/Rsa.php --- a/web/lib/Zend/Oauth/Signature/Rsa.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Signature/Rsa.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rsa.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Rsa.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Signature_SignatureAbstract */ @@ -28,20 +28,20 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Signature_Rsa extends Zend_Oauth_Signature_SignatureAbstract { /** * Sign a request - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ - public function sign(array $params, $method = null, $url = null) + public function sign(array $params, $method = null, $url = null) { $rsa = new Zend_Crypt_Rsa; $rsa->setHashAlgorithm($this->_hashAlgorithm); @@ -55,7 +55,7 @@ /** * Assemble encryption key - * + * * @return string */ protected function _assembleKey() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Signature/SignatureAbstract.php --- a/web/lib/Zend/Oauth/Signature/SignatureAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Signature/SignatureAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SignatureAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: SignatureAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Http_Utility */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Oauth_Signature_SignatureAbstract @@ -59,10 +59,10 @@ /** * Constructor - * - * @param string $consumerSecret - * @param null|string $tokenSecret - * @param null|string $hashAlgo + * + * @param string $consumerSecret + * @param null|string $tokenSecret + * @param null|string $hashAlgo * @return void */ public function __construct($consumerSecret, $tokenSecret = null, $hashAlgo = null) @@ -79,18 +79,18 @@ /** * Sign a request - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ public abstract function sign(array $params, $method = null, $url = null); /** * Normalize the base signature URL - * - * @param string $url + * + * @param string $url * @return string */ public function normaliseBaseSignatureUrl($url) @@ -109,7 +109,7 @@ /** * Assemble key from consumer and token secrets - * + * * @return string */ protected function _assembleKey() @@ -126,17 +126,17 @@ /** * Get base signature string - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ protected function _getBaseSignatureString(array $params, $method = null, $url = null) { $encodedParams = array(); foreach ($params as $key => $value) { - $encodedParams[Zend_Oauth_Http_Utility::urlEncode($key)] = + $encodedParams[Zend_Oauth_Http_Utility::urlEncode($key)] = Zend_Oauth_Http_Utility::urlEncode($value); } $baseStrings = array(); @@ -160,8 +160,8 @@ /** * Transform an array to a byte value ordered query string - * - * @param array $params + * + * @param array $params * @return string */ protected function _toByteValueOrderedQueryString(array $params) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Token.php --- a/web/lib/Zend/Oauth/Token.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Token.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Token.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Http_Utility */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Oauth_Token @@ -40,14 +40,14 @@ /** * Token parameters - * + * * @var array */ protected $_params = array(); /** * OAuth response object - * + * * @var Zend_Http_Response */ protected $_response = null; @@ -264,11 +264,11 @@ } return $params; } - + /** * Limit serialisation stored data to the parameters */ - public function __sleep() + public function __sleep() { return array('_params'); } @@ -276,7 +276,7 @@ /** * After serialisation, re-instantiate a HTTP utility class for use */ - public function __wakeup() + public function __wakeup() { if ($this->_httpUtility === null) { $this->_httpUtility = new Zend_Oauth_Http_Utility; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Token/Access.php --- a/web/lib/Zend/Oauth/Token/Access.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Token/Access.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Access.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Access.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Token */ @@ -34,18 +34,18 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Token_Access extends Zend_Oauth_Token { /** * Cast to HTTP header - * - * @param string $url - * @param Zend_Oauth_Config_ConfigInterface $config - * @param null|array $customParams - * @param null|string $realm + * + * @param string $url + * @param Zend_Oauth_Config_ConfigInterface $config + * @param null|array $customParams + * @param null|string $realm * @return string */ public function toHeader( @@ -63,10 +63,10 @@ /** * Cast to HTTP query string - * - * @param mixed $url - * @param Zend_Oauth_Config_ConfigInterface $config - * @param null|array $params + * + * @param mixed $url + * @param Zend_Oauth_Config_ConfigInterface $config + * @param null|array $params * @return string */ public function toQueryString($url, Zend_Oauth_Config_ConfigInterface $config, array $params = null) @@ -83,11 +83,11 @@ /** * Get OAuth client - * - * @param array $oauthOptions - * @param null|string $uri - * @param null|array|Zend_Config $config - * @param bool $excludeCustomParamsFromHeader + * + * @param array $oauthOptions + * @param null|string $uri + * @param null|array|Zend_Config $config + * @param bool $excludeCustomParamsFromHeader * @return Zend_Oauth_Client */ public function getHttpClient(array $oauthOptions, $uri = null, $config = null, $excludeCustomParamsFromHeader = true) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Token/AuthorizedRequest.php --- a/web/lib/Zend/Oauth/Token/AuthorizedRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Token/AuthorizedRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AuthorizedRequest.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: AuthorizedRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Token */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Token_AuthorizedRequest extends Zend_Oauth_Token @@ -60,7 +60,7 @@ /** * Retrieve token data - * + * * @return array */ public function getData() @@ -70,7 +70,7 @@ /** * Indicate if token is valid - * + * * @return bool */ public function isValid() @@ -85,7 +85,7 @@ /** * Parse string data into array - * + * * @return array */ protected function _parseData() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Oauth/Token/Request.php --- a/web/lib/Zend/Oauth/Token/Request.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Oauth/Token/Request.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Request.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Oauth_Token */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Token_Request extends Zend_Oauth_Token diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId.php --- a/web/lib/Zend/OpenId.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenId.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: OpenId.php 24842 2012-05-31 18:31:28Z rob $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId @@ -124,7 +124,11 @@ } $url .= $port; - if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { + if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { + // IIS with Microsoft Rewrite Module + $url .= $_SERVER['HTTP_X_ORIGINAL_URL']; + } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { + // IIS with ISAPI_Rewrite $url .= $_SERVER['HTTP_X_REWRITE_URL']; } elseif (isset($_SERVER['REQUEST_URI'])) { $query = strpos($_SERVER['REQUEST_URI'], '?'); @@ -285,7 +289,7 @@ $port = $reg[4]; $path = $reg[5]; $query = $reg[6]; - $fragment = $reg[7]; /* strip it */ + $fragment = $reg[7]; /* strip it */ /* ZF-4358 Fragment retained under OpenID 2.0 */ if (empty($scheme) || empty($host)) { return false; @@ -350,7 +354,8 @@ . $host . (empty($port) ? '' : (':' . $port)) . $path - . $query; + . $query + . $fragment; return true; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Consumer.php --- a/web/lib/Zend/OpenId/Consumer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Consumer.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Consumer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Consumer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Consumer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Consumer/Storage.php --- a/web/lib/Zend/OpenId/Consumer/Storage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Consumer/Storage.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Consumer_Storage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Consumer/Storage/File.php --- a/web/lib/Zend/OpenId/Consumer/Storage/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Consumer/Storage/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 23161 2010-10-19 16:08:36Z matthew $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Consumer_Storage_File extends Zend_OpenId_Consumer_Storage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Exception.php --- a/web/lib/Zend/OpenId/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Extension.php --- a/web/lib/Zend/OpenId/Extension.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Extension.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Extension/Sreg.php --- a/web/lib/Zend/OpenId/Extension/Sreg.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Extension/Sreg.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sreg.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sreg.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Extension_Sreg extends Zend_OpenId_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Provider.php --- a/web/lib/Zend/OpenId/Provider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Provider.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Provider.php 23088 2010-10-11 19:53:24Z padraic $ + * @version $Id: Provider.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Provider @@ -778,7 +778,7 @@ } return $ret; } - + /** * Securely compare two strings for equality while avoided C level memcmp() * optimisations capable of leaking timing information useful to an attacker diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Provider/Storage.php --- a/web/lib/Zend/OpenId/Provider/Storage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Provider/Storage.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Provider_Storage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Provider/Storage/File.php --- a/web/lib/Zend/OpenId/Provider/Storage/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Provider/Storage/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Provider_Storage_File extends Zend_OpenId_Provider_Storage @@ -257,7 +257,7 @@ fclose($lock); return false; } - try { + try { $f = @fopen($name, 'r'); if ($f === false) { fclose($lock); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Provider/User.php --- a/web/lib/Zend/OpenId/Provider/User.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Provider/User.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: User.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: User.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Provider_User diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/OpenId/Provider/User/Session.php --- a/web/lib/Zend/OpenId/Provider/User/Session.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/OpenId/Provider/User/Session.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Session.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Provider_User_Session extends Zend_OpenId_Provider_User diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator.php --- a/web/lib/Zend/Paginator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Paginator.php 22865 2010-08-21 12:28:09Z ramon $ + * @version $Id: Paginator.php 24754 2012-05-05 02:30:56Z adamlundrigan $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator implements Countable, IteratorAggregate @@ -524,13 +524,26 @@ } /** - * Returns the total number of items available. + * Returns the total number of items available. Uses cache if caching is enabled. * * @return integer */ public function getTotalItemCount() { - return count($this->getAdapter()); + if (!$this->_cacheEnabled()) { + return count($this->getAdapter()); + } else { + $cacheId = md5($this->_getCacheInternalId(). '_itemCount'); + $itemCount = self::$_cache->load($cacheId); + + if ($itemCount === false) { + $itemCount = count($this->getAdapter()); + + self::$_cache->save($itemCount, $cacheId, array($this->_getCacheInternalId())); + } + + return $itemCount; + } } /** @@ -1044,10 +1057,18 @@ */ protected function _getCacheInternalId() { - return md5(serialize(array( - $this->getAdapter(), - $this->getItemCountPerPage() - ))); + $adapter = $this->getAdapter(); + + if (method_exists($adapter, 'getCacheIdentifier')) { + return md5(serialize(array( + $adapter->getCacheIdentifier(), $this->getItemCountPerPage() + ))); + } else { + return md5(serialize(array( + $adapter, + $this->getItemCountPerPage() + ))); + } } /** @@ -1057,7 +1078,7 @@ */ protected function _calculatePageCount() { - return (integer) ceil($this->getAdapter()->count() / $this->getItemCountPerPage()); + return (integer) ceil($this->getTotalItemCount() / $this->getItemCountPerPage()); } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/Adapter/Array.php --- a/web/lib/Zend/Paginator/Adapter/Array.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/Adapter/Array.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_Array implements Zend_Paginator_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/Adapter/DbSelect.php --- a/web/lib/Zend/Paginator/Adapter/DbSelect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/Adapter/DbSelect.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbSelect.php 24754 2012-05-05 02:30:56Z adamlundrigan $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_DbSelect implements Zend_Paginator_Adapter_Interface @@ -71,6 +71,14 @@ protected $_rowCount = null; /** + * Identifies this adapter for caching purposes. This value will remain constant for + * the entire life of this adapter regardless of how many different pages are queried. + * + * @var string + */ + protected $_cacheIdentifier = null; + + /** * Constructor. * * @param Zend_Db_Select $select The select query @@ -78,9 +86,20 @@ public function __construct(Zend_Db_Select $select) { $this->_select = $select; + $this->_cacheIdentifier = md5($select->assemble()); } /** + * Returns the cache identifier. + * + * @return string + */ + public function getCacheIdentifier() + { + return $this->_cacheIdentifier; + } + + /** * Sets the total row count, either directly or through a supplied * query. Without setting this, {@link getPages()} selects the count * as a subquery (SELECT COUNT ... FROM (SELECT ...)). While this @@ -100,7 +119,9 @@ if ($rowCount instanceof Zend_Db_Select) { $columns = $rowCount->getPart(Zend_Db_Select::COLUMNS); - $countColumnPart = $columns[0][1]; + $countColumnPart = empty($columns[0][2]) + ? $columns[0][1] + : $columns[0][2]; if ($countColumnPart instanceof Zend_Db_Expr) { $countColumnPart = $countColumnPart->__toString(); @@ -201,7 +222,10 @@ if (!empty($unionParts)) { $expression = new Zend_Db_Expr($countPart . $countColumn); - $rowCount = $db->select()->from($rowCount, $expression); + $rowCount = $db + ->select() + ->bind($rowCount->getBind()) + ->from($rowCount, $expression); } else { $columnParts = $rowCount->getPart(Zend_Db_Select::COLUMNS); $groupParts = $rowCount->getPart(Zend_Db_Select::GROUP); @@ -213,8 +237,13 @@ * than one group, or if the query has a HAVING clause, then take * the original query and use it as a subquery os the COUNT query. */ - if (($isDistinct && count($columnParts) > 1) || count($groupParts) > 1 || !empty($havingParts)) { - $rowCount = $db->select()->from($this->_select); + if (($isDistinct && ((count($columnParts) == 1 && $columnParts[0][1] == Zend_Db_Select::SQL_WILDCARD) + || count($columnParts) > 1)) || count($groupParts) > 1 || !empty($havingParts)) { + $rowCount->reset(Zend_Db_Select::ORDER); + $rowCount = $db + ->select() + ->bind($rowCount->getBind()) + ->from($rowCount); } else if ($isDistinct) { $part = $columnParts[0]; @@ -227,8 +256,7 @@ $groupPart = $column; } - } else if (!empty($groupParts) && $groupParts[0] !== Zend_Db_Select::SQL_WILDCARD && - !($groupParts[0] instanceof Zend_Db_Expr)) { + } else if (!empty($groupParts)) { $groupPart = $db->quoteIdentifier($groupParts[0], true); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/Adapter/DbTableSelect.php --- a/web/lib/Zend/Paginator/Adapter/DbTableSelect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/Adapter/DbTableSelect.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTableSelect.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_DbTableSelect extends Zend_Paginator_Adapter_DbSelect diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/Adapter/Interface.php --- a/web/lib/Zend/Paginator/Adapter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/Adapter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 23314 2010-11-08 19:48:10Z matthew $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Paginator_Adapter_Interface extends Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/Adapter/Iterator.php --- a/web/lib/Zend/Paginator/Adapter/Iterator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/Adapter/Iterator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Iterator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_Iterator implements Zend_Paginator_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/Adapter/Null.php --- a/web/lib/Zend/Paginator/Adapter/Null.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/Adapter/Null.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 21150 2010-02-23 16:27:36Z matthew $ + * @version $Id: Null.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_Null implements Zend_Paginator_Adapter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/AdapterAggregate.php --- a/web/lib/Zend/Paginator/AdapterAggregate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/AdapterAggregate.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Paginator * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAggregate.php 22542 2010-07-09 19:41:46Z ramon $ + * @version $Id: AdapterAggregate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Paginator * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Paginator_AdapterAggregate diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/Exception.php --- a/web/lib/Zend/Paginator/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/ScrollingStyle/All.php --- a/web/lib/Zend/Paginator/ScrollingStyle/All.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/ScrollingStyle/All.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: All.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: All.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_All implements Zend_Paginator_ScrollingStyle_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/ScrollingStyle/Elastic.php --- a/web/lib/Zend/Paginator/ScrollingStyle/Elastic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/ScrollingStyle/Elastic.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Elastic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Elastic.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @link http://www.google.com/search?q=Zend+Framework * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_Elastic extends Zend_Paginator_ScrollingStyle_Sliding diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/ScrollingStyle/Interface.php --- a/web/lib/Zend/Paginator/ScrollingStyle/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/ScrollingStyle/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Paginator_ScrollingStyle_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/ScrollingStyle/Jumping.php --- a/web/lib/Zend/Paginator/ScrollingStyle/Jumping.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/ScrollingStyle/Jumping.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Jumping.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Jumping.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_Jumping implements Zend_Paginator_ScrollingStyle_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/ScrollingStyle/Sliding.php --- a/web/lib/Zend/Paginator/ScrollingStyle/Sliding.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/ScrollingStyle/Sliding.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sliding.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sliding.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @link http://search.yahoo.com/search?p=Zend+Framework * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_Sliding implements Zend_Paginator_ScrollingStyle_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Paginator/SerializableLimitIterator.php --- a/web/lib/Zend/Paginator/SerializableLimitIterator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Paginator/SerializableLimitIterator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SerializableLimitIterator.php 23189 2010-10-20 18:55:32Z mabe $ + * @version $Id: SerializableLimitIterator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_SerializableLimitIterator extends LimitIterator implements Serializable, ArrayAccess diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf.php --- a/web/lib/Zend/Pdf.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdf.php 22908 2010-08-25 20:52:47Z alexander $ + * @version $Id: Pdf.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -78,7 +78,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf @@ -210,6 +210,14 @@ protected static $_inheritableAttributes = array('Resources', 'MediaBox', 'CropBox', 'Rotate'); /** + * True if the object is a newly created PDF document (affects save() method behavior) + * False otherwise + * + * @var boolean + */ + protected $_isNewDocument = true; + + /** * Request used memory manager * * @return Zend_Memory_Manager @@ -262,7 +270,8 @@ /** * Render PDF document and save it. * - * If $updateOnly is true, then it only appends new section to the end of file. + * If $updateOnly is true and it's not a new document, then it only + * appends new section to the end of file. * * @param string $filename * @param boolean $updateOnly @@ -348,6 +357,8 @@ $this->_originalProperties = $this->properties; } + + $this->_isNewDocument = false; } else { $this->_pdfHeaderVersion = Zend_Pdf::PDF_VERSION; @@ -1174,7 +1185,8 @@ /** * Render the completed PDF to a string. - * If $newSegmentOnly is true, then only appended part of PDF is returned. + * If $newSegmentOnly is true and it's not a new document, + * then only appended part of PDF is returned. * * @param boolean $newSegmentOnly * @param resource $outputStream @@ -1183,6 +1195,12 @@ */ public function render($newSegmentOnly = false, $outputStream = null) { + if ($this->_isNewDocument) { + // Drop full document first time even $newSegmentOnly is set to true + $newSegmentOnly = false; + $this->_isNewDocument = false; + } + // Save document properties if necessary if ($this->properties != $this->_originalProperties) { $docInfo = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary()); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action.php --- a/web/lib/Zend/Pdf/Action.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Action.php 22437 2010-06-15 16:13:46Z alexander $ + * @version $Id: Action.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Action extends Zend_Pdf_Target implements RecursiveIterator, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/GoTo.php --- a/web/lib/Zend/Pdf/Action/GoTo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/GoTo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoTo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoTo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoTo extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/GoTo3DView.php --- a/web/lib/Zend/Pdf/Action/GoTo3DView.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/GoTo3DView.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoTo3DView.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoTo3DView.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoTo3DView extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/GoToE.php --- a/web/lib/Zend/Pdf/Action/GoToE.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/GoToE.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoToE.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoToE.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoToE extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/GoToR.php --- a/web/lib/Zend/Pdf/Action/GoToR.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/GoToR.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoToR.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoToR.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoToR extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Hide.php --- a/web/lib/Zend/Pdf/Action/Hide.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Hide.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hide.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hide.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Hide extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/ImportData.php --- a/web/lib/Zend/Pdf/Action/ImportData.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/ImportData.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImportData.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImportData.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_ImportData extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/JavaScript.php --- a/web/lib/Zend/Pdf/Action/JavaScript.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/JavaScript.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JavaScript.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JavaScript.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_JavaScript extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Launch.php --- a/web/lib/Zend/Pdf/Action/Launch.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Launch.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Launch.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Launch.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Launch extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Movie.php --- a/web/lib/Zend/Pdf/Action/Movie.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Movie.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Movie.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Movie.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Movie extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Named.php --- a/web/lib/Zend/Pdf/Action/Named.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Named.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Named.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Named.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Named extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Rendition.php --- a/web/lib/Zend/Pdf/Action/Rendition.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Rendition.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rendition.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rendition.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Rendition extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/ResetForm.php --- a/web/lib/Zend/Pdf/Action/ResetForm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/ResetForm.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResetForm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResetForm.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_ResetForm extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/SetOCGState.php --- a/web/lib/Zend/Pdf/Action/SetOCGState.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/SetOCGState.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SetOCGState.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SetOCGState.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_SetOCGState extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Sound.php --- a/web/lib/Zend/Pdf/Action/Sound.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Sound.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sound.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sound.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Sound extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/SubmitForm.php --- a/web/lib/Zend/Pdf/Action/SubmitForm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/SubmitForm.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubmitForm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubmitForm.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_SubmitForm extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Thread.php --- a/web/lib/Zend/Pdf/Action/Thread.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Thread.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Thread.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Thread.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Thread extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Trans.php --- a/web/lib/Zend/Pdf/Action/Trans.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Trans.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Trans.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Trans.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Trans extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/URI.php --- a/web/lib/Zend/Pdf/Action/URI.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/URI.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: URI.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: URI.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -38,7 +38,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_URI extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Action/Unknown.php --- a/web/lib/Zend/Pdf/Action/Unknown.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Action/Unknown.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Unknown.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Unknown.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Unknown extends Zend_Pdf_Action diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Annotation.php --- a/web/lib/Zend/Pdf/Annotation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Annotation.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Annotation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Annotation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -32,7 +32,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Annotation @@ -220,7 +220,7 @@ * Load Annotation object from a specified resource * * @internal - * @param $destinationArray + * @param Zend_Pdf_Element $resource * @return Zend_Pdf_Annotation */ public static function load(Zend_Pdf_Element $resource) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Annotation/FileAttachment.php --- a/web/lib/Zend/Pdf/Annotation/FileAttachment.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Annotation/FileAttachment.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileAttachment.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FileAttachment.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -38,7 +38,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_FileAttachment extends Zend_Pdf_Annotation diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Annotation/Link.php --- a/web/lib/Zend/Pdf/Annotation/Link.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Annotation/Link.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -40,7 +40,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_Link extends Zend_Pdf_Annotation diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Annotation/Markup.php --- a/web/lib/Zend/Pdf/Annotation/Markup.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Annotation/Markup.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Markup.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Markup.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -37,7 +37,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_Markup extends Zend_Pdf_Annotation diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Annotation/Text.php --- a/web/lib/Zend/Pdf/Annotation/Text.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Annotation/Text.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -37,7 +37,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_Text extends Zend_Pdf_Annotation diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Canvas.php --- a/web/lib/Zend/Pdf/Canvas.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Canvas.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Style.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -26,7 +26,7 @@ * page object at specified place. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Canvas extends Zend_Pdf_Canvas_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Canvas/Abstract.php --- a/web/lib/Zend/Pdf/Canvas/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Canvas/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Style.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,6 +31,9 @@ require_once 'Zend/Pdf/Element/Null.php'; require_once 'Zend/Pdf/Element/Numeric.php'; require_once 'Zend/Pdf/Element/String.php'; +require_once 'Zend/Pdf/Resource/GraphicsState.php'; +require_once 'Zend/Pdf/Resource/Font.php'; +require_once 'Zend/Pdf/Resource/Image.php'; /** @@ -38,7 +41,7 @@ * page object at specified place. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Canvas_Abstract implements Zend_Pdf_Canvas_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Canvas/Interface.php --- a/web/lib/Zend/Pdf/Canvas/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Canvas/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Style.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -25,7 +25,7 @@ * page object at specified place. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Pdf_Canvas_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Cmap.php --- a/web/lib/Zend/Pdf/Cmap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Cmap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cmap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cmap.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -47,7 +47,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Cmap diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Cmap/ByteEncoding.php --- a/web/lib/Zend/Pdf/Cmap/ByteEncoding.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Cmap/ByteEncoding.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ByteEncoding.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ByteEncoding.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Cmap */ @@ -36,7 +36,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_ByteEncoding extends Zend_Pdf_Cmap diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Cmap/ByteEncoding/Static.php --- a/web/lib/Zend/Pdf/Cmap/ByteEncoding/Static.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Cmap/ByteEncoding/Static.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Static.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Static.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Cmap_ByteEncoding */ @@ -32,7 +32,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_ByteEncoding_Static extends Zend_Pdf_Cmap_ByteEncoding diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Cmap/SegmentToDelta.php --- a/web/lib/Zend/Pdf/Cmap/SegmentToDelta.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Cmap/SegmentToDelta.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentToDelta.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SegmentToDelta.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Cmap */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_SegmentToDelta extends Zend_Pdf_Cmap diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Cmap/TrimmedTable.php --- a/web/lib/Zend/Pdf/Cmap/TrimmedTable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Cmap/TrimmedTable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrimmedTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrimmedTable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Cmap */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_TrimmedTable extends Zend_Pdf_Cmap diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Color.php --- a/web/lib/Zend/Pdf/Color.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Color.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Color.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Color.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * others don't do it. That is defined in a subclasses. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Color diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Color/Cmyk.php --- a/web/lib/Zend/Pdf/Color/Cmyk.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Color/Cmyk.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cmyk.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cmyk.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_Cmyk extends Zend_Pdf_Color diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Color/GrayScale.php --- a/web/lib/Zend/Pdf/Color/GrayScale.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Color/GrayScale.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GrayScale.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GrayScale.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_GrayScale extends Zend_Pdf_Color diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Color/Html.php --- a/web/lib/Zend/Pdf/Color/Html.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Color/Html.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Html.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Html.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Color */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_Html extends Zend_Pdf_Color diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Color/Rgb.php --- a/web/lib/Zend/Pdf/Color/Rgb.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Color/Rgb.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rgb.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rgb.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_Rgb extends Zend_Pdf_Color diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination.php --- a/web/lib/Zend/Pdf/Destination.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Destination.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Destination.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Destination extends Zend_Pdf_Target @@ -43,7 +43,7 @@ * Load Destination object from a specified resource * * @internal - * @param $destinationArray + * @param Zend_Pdf_Element $resource * @return Zend_Pdf_Destination */ public static function load(Zend_Pdf_Element $resource) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/Explicit.php --- a/web/lib/Zend/Pdf/Destination/Explicit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/Explicit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Explicit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Explicit.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Destination_Explicit extends Zend_Pdf_Destination diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/Fit.php --- a/web/lib/Zend/Pdf/Destination/Fit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/Fit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fit.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Fit extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/FitBoundingBox.php --- a/web/lib/Zend/Pdf/Destination/FitBoundingBox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/FitBoundingBox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitBoundingBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitBoundingBox.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitBoundingBox extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php --- a/web/lib/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitBoundingBoxHorizontally.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitBoundingBoxHorizontally.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -42,7 +42,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitBoundingBoxHorizontally extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/FitBoundingBoxVertically.php --- a/web/lib/Zend/Pdf/Destination/FitBoundingBoxVertically.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/FitBoundingBoxVertically.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitBoundingBoxVertically.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitBoundingBoxVertically.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -41,7 +41,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitBoundingBoxVertically extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/FitHorizontally.php --- a/web/lib/Zend/Pdf/Destination/FitHorizontally.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/FitHorizontally.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitHorizontally.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitHorizontally.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitHorizontally extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/FitRectangle.php --- a/web/lib/Zend/Pdf/Destination/FitRectangle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/FitRectangle.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitRectangle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitRectangle.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitRectangle extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/FitVertically.php --- a/web/lib/Zend/Pdf/Destination/FitVertically.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/FitVertically.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitVertically.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitVertically.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -41,7 +41,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitVertically extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/Named.php --- a/web/lib/Zend/Pdf/Destination/Named.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/Named.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Named.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Named.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -39,7 +39,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Named extends Zend_Pdf_Destination @@ -54,7 +54,7 @@ /** * Named destination object constructor * - * @param $resource + * @param Zend_Pdf_Element $resource * @throws Zend_Pdf_Exception */ public function __construct(Zend_Pdf_Element $resource) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/Unknown.php --- a/web/lib/Zend/Pdf/Destination/Unknown.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/Unknown.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Unknown.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Unknown.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Destination_Explicit */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Unknown extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Destination/Zoom.php --- a/web/lib/Zend/Pdf/Destination/Zoom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Destination/Zoom.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Zoom.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Zoom.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Zoom extends Zend_Pdf_Destination_Explicit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element.php --- a/web/lib/Zend/Pdf/Element.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Element.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -24,7 +24,7 @@ * PDF file element implementation * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Array.php --- a/web/lib/Zend/Pdf/Element/Array.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Array.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Array extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Boolean.php --- a/web/lib/Zend/Pdf/Element/Boolean.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Boolean.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Boolean extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Dictionary.php --- a/web/lib/Zend/Pdf/Element/Dictionary.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Dictionary.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dictionary.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Dictionary.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Dictionary extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Name.php --- a/web/lib/Zend/Pdf/Element/Name.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Name.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Name extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Null.php --- a/web/lib/Zend/Pdf/Element/Null.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Null.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Null extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Numeric.php --- a/web/lib/Zend/Pdf/Element/Numeric.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Numeric.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Numeric.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Numeric.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Numeric extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Object.php --- a/web/lib/Zend/Pdf/Element/Object.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Object.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Object.php 22844 2010-08-16 15:38:53Z alexander $ + * @version $Id: Object.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Object extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Object/Stream.php --- a/web/lib/Zend/Pdf/Element/Object/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Object/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 22909 2010-08-27 19:57:48Z alexander $ + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Object_Stream extends Zend_Pdf_Element_Object diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Reference.php --- a/web/lib/Zend/Pdf/Element/Reference.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Reference.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reference.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Reference.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Reference extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Reference/Context.php --- a/web/lib/Zend/Pdf/Element/Reference/Context.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Reference/Context.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Context.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Context.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Reference_Context diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Reference/Table.php --- a/web/lib/Zend/Pdf/Element/Reference/Table.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Reference/Table.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Table.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Reference_Table diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/Stream.php --- a/web/lib/Zend/Pdf/Element/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Stream extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/String.php --- a/web/lib/Zend/Pdf/Element/String.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/String.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 21542 2010-03-18 08:56:40Z bate $ + * @version $Id: String.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_String extends Zend_Pdf_Element diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Element/String/Binary.php --- a/web/lib/Zend/Pdf/Element/String/Binary.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Element/String/Binary.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Binary.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Binary.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_String_Binary extends Zend_Pdf_Element_String diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/ElementFactory.php --- a/web/lib/Zend/Pdf/ElementFactory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/ElementFactory.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ElementFactory.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: ElementFactory.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * Responsibility is to log PDF changes * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_ElementFactory implements Zend_Pdf_ElementFactory_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/ElementFactory/Interface.php --- a/web/lib/Zend/Pdf/ElementFactory/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/ElementFactory/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * Responsibility is to log PDF changes * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Pdf_ElementFactory_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/ElementFactory/Proxy.php --- a/web/lib/Zend/Pdf/ElementFactory/Proxy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/ElementFactory/Proxy.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Proxy.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Proxy.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_ElementFactory_Interface */ @@ -27,7 +27,7 @@ * Responsibility is to log PDF changes * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_ElementFactory_Proxy implements Zend_Pdf_ElementFactory_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Exception.php --- a/web/lib/Zend/Pdf/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Core - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Exception */ @@ -45,7 +45,7 @@ * * @package Zend_Pdf * @subpackage Core - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParser.php --- a/web/lib/Zend/Pdf/FileParser.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParser.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileParser.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FileParser.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParser/Font.php --- a/web/lib/Zend/Pdf/FileParser/Font.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParser/Font.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Font.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Font.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -36,7 +36,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser_Font extends Zend_Pdf_FileParser diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParser/Font/OpenType.php --- a/web/lib/Zend/Pdf/FileParser/Font/OpenType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParser/Font/OpenType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenType.php 25197 2013-01-09 11:32:22Z frosch $ */ /** Zend_Pdf_FileParser_Font */ @@ -45,7 +45,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser_Font_OpenType extends Zend_Pdf_FileParser_Font @@ -582,12 +582,24 @@ * outlines from fonts yet, so this means no embed. */ $this->isEmbeddable = false; - } else if ($this->isBitSet(1, $embeddingFlags)) { - /* Restricted license embedding. We currently don't have any way to - * enforce this, so interpret this as no embed. This may be revised - * in the future... - */ - $this->isEmbeddable = false; + } elseif ($this->isBitSet(2, $embeddingFlags) + || $this->isBitSet(3, $embeddingFlags) + || $this->isBitSet(4, $embeddingFlags) + ) { + /* One of: + * Restricted License embedding (0x0002) + * Preview & Print embedding (0x0004) + * Editable embedding (0x0008) + * is set. + */ + $this->isEmbeddable = true; + } elseif ($this->isBitSet(1, $embeddingFlags)) { + /* Restricted license embedding & no other embedding is set. + * We currently don't have any way to + * enforce this, so interpret this as no embed. This may be revised + * in the future... + */ + $this->isEmbeddable = false; } else { /* The remainder of the bit settings grant us permission to embed * the font. There may be additional usage rights granted or denied diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParser/Font/OpenType/TrueType.php --- a/web/lib/Zend/Pdf/FileParser/Font/OpenType/TrueType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParser/Font/OpenType/TrueType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrueType.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParser_Font_OpenType_TrueType extends Zend_Pdf_FileParser_Font_OpenType diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParser/Image.php --- a/web/lib/Zend/Pdf/FileParser/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParser/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser_Image extends Zend_Pdf_FileParser diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParser/Image/Png.php --- a/web/lib/Zend/Pdf/FileParser/Image/Png.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParser/Image/Png.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Png.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Png.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Pdf_FileParser_Image */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParser_Image_Png extends Zend_Pdf_FileParser_Image diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParserDataSource.php --- a/web/lib/Zend/Pdf/FileParserDataSource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParserDataSource.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileParserDataSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FileParserDataSource.php 24806 2012-05-15 11:32:11Z adamlundrigan $ */ /** @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParserDataSource @@ -63,21 +63,6 @@ /* Abstract Methods */ /** - * Object constructor. Opens the data source for parsing. - * - * Must set $this->_size to the total size in bytes of the data source. - * - * Upon return the data source can be interrogated using the primitive - * methods described here. - * - * If the data source cannot be opened for any reason (such as insufficient - * permissions, missing file, etc.), will throw an appropriate exception. - * - * @throws Zend_Pdf_Exception - */ - abstract public function __construct(); - - /** * Object destructor. Closes the data source. * * May also perform cleanup tasks such as deleting temporary files. diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParserDataSource/File.php --- a/web/lib/Zend/Pdf/FileParserDataSource/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParserDataSource/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_FileParserDataSource */ @@ -34,7 +34,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParserDataSource_File extends Zend_Pdf_FileParserDataSource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/FileParserDataSource/String.php --- a/web/lib/Zend/Pdf/FileParserDataSource/String.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/FileParserDataSource/String.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: String.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_FileParserDataSource */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParserDataSource_String extends Zend_Pdf_FileParserDataSource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Filter/Ascii85.php --- a/web/lib/Zend/Pdf/Filter/Ascii85.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Filter/Ascii85.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ascii85.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Ascii85.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * ASCII85 stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_Ascii85 implements Zend_Pdf_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Filter/AsciiHex.php --- a/web/lib/Zend/Pdf/Filter/AsciiHex.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Filter/AsciiHex.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AsciiHex.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AsciiHex.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * AsciiHex stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_AsciiHex implements Zend_Pdf_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Filter/Compression.php --- a/web/lib/Zend/Pdf/Filter/Compression.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Filter/Compression.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Compression.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Compression.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * ASCII85 stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Filter_Compression implements Zend_Pdf_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Filter/Compression/Flate.php --- a/web/lib/Zend/Pdf/Filter/Compression/Flate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Filter/Compression/Flate.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Flate.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Flate.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * Flate stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_Compression_Flate extends Zend_Pdf_Filter_Compression diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Filter/Compression/Lzw.php --- a/web/lib/Zend/Pdf/Filter/Compression/Lzw.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Filter/Compression/Lzw.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lzw.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Lzw.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * LZW stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_Compression_Lzw extends Zend_Pdf_Filter_Compression diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Filter/Interface.php --- a/web/lib/Zend/Pdf/Filter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Filter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * PDF stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Pdf_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Filter/RunLength.php --- a/web/lib/Zend/Pdf/Filter/RunLength.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Filter/RunLength.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RunLength.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: RunLength.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * RunLength stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_RunLength implements Zend_Pdf_Filter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Font.php --- a/web/lib/Zend/Pdf/Font.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Font.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Font.php 20211 2010-01-12 02:14:29Z yoshida@zend.co.jp $ + * @version $Id: Font.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Font diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Image.php --- a/web/lib/Zend/Pdf/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Images - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Images - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Image diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/NameTree.php --- a/web/lib/Zend/Pdf/NameTree.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/NameTree.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NameTree.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NameTree.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -30,7 +30,7 @@ * @todo implement lazy resource loading so resources will be really loaded at access time * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_NameTree implements ArrayAccess, Iterator, Countable @@ -46,7 +46,7 @@ /** * Object constructor * - * @param $rootDictionary root of name dictionary + * @param Zend_Pdf_Element $rootDictionary root of name dictionary */ public function __construct(Zend_Pdf_Element $rootDictionary) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Outline.php --- a/web/lib/Zend/Pdf/Outline.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Outline.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Outline.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Outline.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * * @package Zend_Pdf * @subpackage Outlines - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Outline implements RecursiveIterator, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Outline/Created.php --- a/web/lib/Zend/Pdf/Outline/Created.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Outline/Created.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Created.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Created.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * * @package Zend_Pdf * @subpackage Outlines - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Outline_Created extends Zend_Pdf_Outline diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Outline/Loaded.php --- a/web/lib/Zend/Pdf/Outline/Loaded.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Outline/Loaded.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Loaded.php 23195 2010-10-21 10:12:12Z alexander $ + * @version $Id: Loaded.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -39,7 +39,7 @@ * * @package Zend_Pdf * @subpackage Outlines - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Outline_Loaded extends Zend_Pdf_Outline diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Page.php --- a/web/lib/Zend/Pdf/Page.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Page.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Page.php 22909 2010-08-27 19:57:48Z alexander $ + * @version $Id: Page.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -38,7 +38,7 @@ * PDF Page * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Page extends Zend_Pdf_Canvas_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Parser.php --- a/web/lib/Zend/Pdf/Parser.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Parser.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parser.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Parser.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -32,7 +32,7 @@ * PDF file parser * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Parser diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/RecursivelyIteratableObjectsContainer.php --- a/web/lib/Zend/Pdf/RecursivelyIteratableObjectsContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/RecursivelyIteratableObjectsContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecursivelyIteratableObjectsContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecursivelyIteratableObjectsContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * Iteratable objects container * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_RecursivelyIteratableObjectsContainer implements RecursiveIterator, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource.php --- a/web/lib/Zend/Pdf/Resource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 22909 2010-08-27 19:57:48Z alexander $ + * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -24,7 +24,7 @@ * PDF file Resource abstraction * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/ContentStream.php --- a/web/lib/Zend/Pdf/Resource/ContentStream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/ContentStream.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -35,7 +35,7 @@ * Content stream (drawing instructions container) * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_ContentStream extends Zend_Pdf_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Extractor.php --- a/web/lib/Zend/Pdf/Resource/Extractor.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Extractor.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: */ @@ -44,7 +44,7 @@ * must not be shared between target documents. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Extractor diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font.php --- a/web/lib/Zend/Pdf/Resource/Font.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Font.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Font.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Pdf_Resource */ @@ -44,7 +44,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font extends Zend_Pdf_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/CidFont.php --- a/web/lib/Zend/Pdf/Resource/Font/CidFont.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/CidFont.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CidFont.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CidFont.php 24664 2012-02-26 16:36:51Z adamlundrigan $ */ /** Internally used classes */ @@ -51,7 +51,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_CidFont extends Zend_Pdf_Resource_Font @@ -129,7 +129,9 @@ $charGlyphs = $this->_cmap->getCoveredCharactersGlyphs(); $charWidths = array(); foreach ($charGlyphs as $charCode => $glyph) { - $charWidths[$charCode] = $glyphWidths[$glyph]; + if(isset($glyphWidths[$glyph]) && !is_null($glyphWidths[$glyph])) { + $charWidths[$charCode] = $glyphWidths[$glyph]; + } } $this->_charWidths = $charWidths; $this->_missingCharWidth = $glyphWidths[0]; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/CidFont/TrueType.php --- a/web/lib/Zend/Pdf/Resource/Font/CidFont/TrueType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/CidFont/TrueType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrueType.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -44,7 +44,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_CidFont_TrueType extends Zend_Pdf_Resource_Font_CidFont diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Extracted.php --- a/web/lib/Zend/Pdf/Resource/Font/Extracted.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Extracted.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extracted.php 20866 2010-02-03 05:30:07Z yoshida@zend.co.jp $ + * @version $Id: Extracted.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Extracted extends Zend_Pdf_Resource_Font diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/FontDescriptor.php --- a/web/lib/Zend/Pdf/Resource/Font/FontDescriptor.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/FontDescriptor.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FontDescriptor.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FontDescriptor.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -42,7 +42,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_FontDescriptor diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Simple.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -56,7 +56,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_Simple extends Zend_Pdf_Resource_Font diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Parsed.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Parsed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Parsed.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parsed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parsed.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -37,7 +37,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_Simple_Parsed extends Zend_Pdf_Resource_Font_Simple diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrueType.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -39,7 +39,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Parsed_TrueType extends Zend_Pdf_Resource_Font_Simple_Parsed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Standard.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Standard.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -59,7 +59,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_Simple_Standard extends Zend_Pdf_Resource_Font_Simple diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Courier.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Courier.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_Courier extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CourierBold.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CourierBold.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_CourierBold extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CourierBoldOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CourierBoldOblique.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_CourierBoldOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CourierOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CourierOblique.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_CourierOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Helvetica.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Helvetica.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_Helvetica extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelveticaBold.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelveticaBold.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -42,7 +42,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBold extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelveticaBoldOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelveticaBoldOblique.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBoldOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelveticaOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelveticaOblique.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Symbol.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Symbol.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_Symbol extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesBold.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesBold.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesBold extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesBoldItalic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesBoldItalic.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesBoldItalic extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesItalic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesItalic.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesItalic extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesRoman.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesRoman.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesRoman extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php --- a/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZapfDingbats.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ZapfDingbats.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_ZapfDingbats extends Zend_Pdf_Resource_Font_Simple_Standard diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Font/Type0.php --- a/web/lib/Zend/Pdf/Resource/Font/Type0.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Font/Type0.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Type0.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Type0.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -57,7 +57,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Type0 extends Zend_Pdf_Resource_Font diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/GraphicsState.php --- a/web/lib/Zend/Pdf/Resource/GraphicsState.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/GraphicsState.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -39,7 +39,7 @@ * graphics state operator gs (PDF 1.2). * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_GraphicsState extends Zend_Pdf_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Image.php --- a/web/lib/Zend/Pdf/Resource/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 22908 2010-08-25 20:52:47Z alexander $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * Image abstraction. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Image extends Zend_Pdf_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Image/Jpeg.php --- a/web/lib/Zend/Pdf/Resource/Image/Jpeg.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Image/Jpeg.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Jpeg.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Jpeg.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * JPEG image * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Image_Jpeg extends Zend_Pdf_Resource_Image diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Image/Png.php --- a/web/lib/Zend/Pdf/Resource/Image/Png.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Image/Png.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Png.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Png.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * PNG image * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Image_Png extends Zend_Pdf_Resource_Image diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Image/Tiff.php --- a/web/lib/Zend/Pdf/Resource/Image/Tiff.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Image/Tiff.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tiff.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tiff.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Internally used classes */ @@ -32,7 +32,7 @@ * TIFF image * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Image_Tiff extends Zend_Pdf_Resource_Image diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/ImageFactory.php --- a/web/lib/Zend/Pdf/Resource/ImageFactory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/ImageFactory.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageFactory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageFactory.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * Helps manage the diverse set of supported image file types. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @todo Use Zend_Mime not file extension for type determination. */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Resource/Unified.php --- a/web/lib/Zend/Pdf/Resource/Unified.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Resource/Unified.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ * Class is used to represent any resource when resource type not actually important. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Unified extends Zend_Pdf_Resource diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/StringParser.php --- a/web/lib/Zend/Pdf/StringParser.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/StringParser.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringParser.php 22311 2010-05-27 12:57:37Z padraic $ + * @version $Id: StringParser.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * PDF string parser * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_StringParser @@ -272,7 +272,7 @@ } $this->offset += strcspn($this->data, $compare, $this->offset); - + return substr($this->data, $start, $this->offset - $start); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Style.php --- a/web/lib/Zend/Pdf/Style.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Style.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Style.php 22908 2010-08-25 20:52:47Z alexander $ + * @version $Id: Style.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * It's used by Zend_Pdf_Page class in draw operations. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Style diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Target.php --- a/web/lib/Zend/Pdf/Target.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Target.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Target.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Target.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Target diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Trailer.php --- a/web/lib/Zend/Pdf/Trailer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Trailer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Trailer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Trailer.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -24,7 +24,7 @@ * PDF file trailer * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Trailer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Trailer/Generator.php --- a/web/lib/Zend/Pdf/Trailer/Generator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Trailer/Generator.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Generator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Generator.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * PDF file trailer generator (used for just created PDF) * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Trailer_Generator extends Zend_Pdf_Trailer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/Trailer/Keeper.php --- a/web/lib/Zend/Pdf/Trailer/Keeper.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/Trailer/Keeper.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Keeper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Keeper.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * Stores and provides access to the trailer parced from a PDF file * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Trailer_Keeper extends Zend_Pdf_Trailer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Pdf/UpdateInfoContainer.php --- a/web/lib/Zend/Pdf/UpdateInfoContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Pdf/UpdateInfoContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateInfoContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UpdateInfoContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -24,7 +24,7 @@ * Container which collects updated object info. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_UpdateInfoContainer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/ProgressBar.php --- a/web/lib/Zend/ProgressBar.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/ProgressBar.php Sun Apr 21 21:54:24 2013 +0200 @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProgressBar.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProgressBar.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -22,7 +22,7 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/ProgressBar/Adapter.php --- a/web/lib/Zend/ProgressBar/Adapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/ProgressBar/Adapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Adapter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Adapter.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_ProgressBar_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/ProgressBar/Adapter/Console.php --- a/web/lib/Zend/ProgressBar/Adapter/Console.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/ProgressBar/Adapter/Console.php Sun Apr 21 21:54:24 2013 +0200 @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Console.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Console.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Adapter_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/ProgressBar/Adapter/Exception.php --- a/web/lib/Zend/ProgressBar/Adapter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/ProgressBar/Adapter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_Exception extends Zend_ProgressBar_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/ProgressBar/Adapter/JsPull.php --- a/web/lib/Zend/ProgressBar/Adapter/JsPull.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/ProgressBar/Adapter/JsPull.php Sun Apr 21 21:54:24 2013 +0200 @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JsPull.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JsPull.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Adapter_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_JsPull extends Zend_ProgressBar_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/ProgressBar/Adapter/JsPush.php --- a/web/lib/Zend/ProgressBar/Adapter/JsPush.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/ProgressBar/Adapter/JsPush.php Sun Apr 21 21:54:24 2013 +0200 @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JsPush.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JsPush.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Adapter_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_JsPush extends Zend_ProgressBar_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/ProgressBar/Exception.php --- a/web/lib/Zend/ProgressBar/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/ProgressBar/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue.php --- a/web/lib/Zend/Queue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Queue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Queue.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue implements Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Activemq.php --- a/web/lib/Zend/Queue/Adapter/Activemq.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Activemq.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Activemq.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Activemq.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract @@ -56,6 +56,11 @@ private $_client = null; /** + * @var array + */ + private $_subscribed = array(); + + /** * Constructor * * @param array|Zend_Config $config An array having configuration data @@ -177,6 +182,33 @@ } /** + * Checks if the client is subscribed to the queue + * + * @param Zend_Queue $queue + * @return boolean + */ + protected function _isSubscribed(Zend_Queue $queue) + { + return isset($this->_subscribed[$queue->getName()]); + } + + /** + * Subscribes the client to the queue. + * + * @param Zend_Queue $queue + * @return void + */ + protected function _subscribe(Zend_Queue $queue) + { + $frame = $this->_client->createFrame(); + $frame->setCommand('SUBSCRIBE'); + $frame->setHeader('destination', $queue->getName()); + $frame->setHeader('ack', 'client'); + $this->_client->send($frame); + $this->_subscribed[$queue->getName()] = true; + } + + /** * Return the first element in the queue * * @param integer $maxMessages @@ -200,11 +232,9 @@ $data = array(); // signal that we are reading - $frame = $this->_client->createFrame(); - $frame->setCommand('SUBSCRIBE'); - $frame->setHeader('destination', $queue->getName()); - $frame->setHeader('ack','client'); - $this->_client->send($frame); + if (!$this->_isSubscribed($queue)){ + $this->_subscribe($queue); + } if ($maxMessages > 0) { if ($this->_client->canRead()) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/AdapterAbstract.php --- a/web/lib/Zend/Queue/Adapter/AdapterAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/AdapterAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AdapterAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Queue_Adapter_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/AdapterInterface.php --- a/web/lib/Zend/Queue/Adapter/AdapterInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/AdapterInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AdapterInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Queue_Adapter_AdapterInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Array.php --- a/web/lib/Zend/Queue/Adapter/Array.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Array.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Array extends Zend_Queue_Adapter_AdapterAbstract @@ -344,7 +344,7 @@ * sets the underlying _data array * $queue->getAdapter()->setData($data); * - * @param $data array + * @param array $data * @return $this; */ public function setData($data) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Db.php --- a/web/lib/Zend/Queue/Adapter/Db.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Db.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Db.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -51,7 +51,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Db/Message.php --- a/web/lib/Zend/Queue/Adapter/Db/Message.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Db/Message.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Db_Message extends Zend_Db_Table_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Db/Queue.php --- a/web/lib/Zend/Queue/Adapter/Db/Queue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Db/Queue.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Queue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Queue.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Db_Queue extends Zend_Db_Table_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Db/postgresql.sql --- a/web/lib/Zend/Queue/Adapter/Db/postgresql.sql Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Db/postgresql.sql Sun Apr 21 21:54:24 2013 +0200 @@ -38,7 +38,7 @@ handle character(32), body character varying(8192) NOT NULL, md5 character(32) NOT NULL, - timeout real, + timeout double precision, created integer, CONSTRAINT message_pk PRIMARY KEY (message_id), CONSTRAINT message_ibfk_1 FOREIGN KEY (queue_id) @@ -46,4 +46,4 @@ ON UPDATE CASCADE ON DELETE CASCADE ) WITH (OIDS=FALSE); -ALTER TABLE message OWNER TO queue; \ No newline at end of file +ALTER TABLE message OWNER TO queue; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Memcacheq.php --- a/web/lib/Zend/Queue/Adapter/Memcacheq.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Memcacheq.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memcacheq.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Memcacheq.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/Null.php --- a/web/lib/Zend/Queue/Adapter/Null.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/Null.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Adapter/PlatformJobQueue.php --- a/web/lib/Zend/Queue/Adapter/PlatformJobQueue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Adapter/PlatformJobQueue.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlatformJobQueue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlatformJobQueue.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Exception.php --- a/web/lib/Zend/Queue/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Message.php --- a/web/lib/Zend/Queue/Message.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Message.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Message diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Message/Iterator.php --- a/web/lib/Zend/Queue/Message/Iterator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Message/Iterator.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Iterator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Message_Iterator implements Iterator, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Message/PlatformJob.php --- a/web/lib/Zend/Queue/Message/PlatformJob.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Message/PlatformJob.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlatformJob.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlatformJob.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Message_PlatformJob extends Zend_Queue_Message diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Stomp/Client.php --- a/web/lib/Zend/Queue/Stomp/Client.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Stomp/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Stomp_Client diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Stomp/Client/Connection.php --- a/web/lib/Zend/Queue/Stomp/Client/Connection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Stomp/Client/Connection.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Connection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Connection.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Stomp_Client_Connection diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Stomp/Client/ConnectionInterface.php --- a/web/lib/Zend/Queue/Stomp/Client/ConnectionInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Stomp/Client/ConnectionInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConnectionInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ConnectionInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Queue_Stomp_Client_ConnectionInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Stomp/Frame.php --- a/web/lib/Zend/Queue/Stomp/Frame.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Stomp/Frame.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Frame.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Frame.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Stomp_Frame diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Queue/Stomp/FrameInterface.php --- a/web/lib/Zend/Queue/Stomp/FrameInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Queue/Stomp/FrameInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FrameInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FrameInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Queue_Stomp_FrameInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Class.php --- a/web/lib/Zend/Reflection/Class.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Class.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Class extends ReflectionClass diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Docblock.php --- a/web/lib/Zend/Reflection/Docblock.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Docblock.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docblock.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Docblock.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock implements Reflector diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Docblock/Tag.php --- a/web/lib/Zend/Reflection/Docblock/Tag.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Docblock/Tag.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tag.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Loader */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock_Tag implements Reflector diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Docblock/Tag/Param.php --- a/web/lib/Zend/Reflection/Docblock/Tag/Param.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Docblock/Tag/Param.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Param.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Param.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Reflection_Docblock_Tag */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock_Tag_Param extends Zend_Reflection_Docblock_Tag @@ -49,7 +49,7 @@ { $matches = array(); - if (!preg_match('#^@(\w+)\s+([\w|\\\]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) { + if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) { require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Docblock/Tag/Return.php --- a/web/lib/Zend/Reflection/Docblock/Tag/Return.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Docblock/Tag/Return.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Return.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Return.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Reflection_Docblock_Tag */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock_Tag_Return extends Zend_Reflection_Docblock_Tag @@ -39,11 +39,11 @@ * Constructor * * @param string $tagDocblockLine - * @return void + * @return \Zend_Reflection_Docblock_Tag_Return */ public function __construct($tagDocblockLine) { - if (!preg_match('#^@(\w+)\s+([\w|\\\]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) { + if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) { require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Exception.php --- a/web/lib/Zend/Reflection/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Extension.php --- a/web/lib/Zend/Reflection/Extension.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Extension.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Extension extends ReflectionExtension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/File.php --- a/web/lib/Zend/Reflection/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20904 2010-02-04 16:18:18Z matthew $ + * @version $Id: File.php 24803 2012-05-14 12:23:46Z adamlundrigan $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_File implements Reflector @@ -86,8 +86,17 @@ public function __construct($file) { $fileName = $file; - - if (($fileRealpath = realpath($fileName)) === false) { + + $fileRealpath = realpath($fileName); + if ($fileRealpath) { + // realpath() doesn't return false if Suhosin is included + // see http://uk3.php.net/manual/en/function.realpath.php#82770 + if (!file_exists($fileRealpath)) { + $fileRealpath = false; + } + } + + if ($fileRealpath === false) { $fileRealpath = self::findRealpathInIncludePath($file); } @@ -300,10 +309,11 @@ $contents = $this->_contents; $tokens = token_get_all($contents); - $functionTrapped = false; - $classTrapped = false; - $requireTrapped = false; - $openBraces = 0; + $functionTrapped = false; + $classTrapped = false; + $requireTrapped = false; + $embeddedVariableTrapped = false; + $openBraces = 0; $this->_checkFileDocBlock($tokens); @@ -330,13 +340,23 @@ if ($token == '{') { $openBraces++; } else if ($token == '}') { - $openBraces--; + if ( $embeddedVariableTrapped ) { + $embeddedVariableTrapped = false; + } else { + $openBraces--; + } } continue; } switch ($type) { + case T_STRING_VARNAME: + case T_DOLLAR_OPEN_CURLY_BRACES: + case T_CURLY_OPEN: + $embeddedVariableTrapped = true; + continue; + // Name of something case T_STRING: if ($functionTrapped) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Function.php --- a/web/lib/Zend/Reflection/Function.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Function.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Function.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Function.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Function extends ReflectionFunction diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Method.php --- a/web/lib/Zend/Reflection/Method.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Method.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Method.php 24870 2012-06-02 02:15:12Z adamlundrigan $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Method extends ReflectionMethod @@ -145,24 +145,43 @@ { $lines = array_slice( file($this->getDeclaringClass()->getFileName(), FILE_IGNORE_NEW_LINES), - $this->getStartLine(), - ($this->getEndLine() - $this->getStartLine()), + $this->getStartLine()-1, + ($this->getEndLine() - $this->getStartLine()) + 1, true ); - $firstLine = array_shift($lines); + // Strip off lines until we come to a closing bracket + do { + if (count($lines) == 0) break; + $firstLine = array_shift($lines); + } while (strpos($firstLine, ')') === false); - if (trim($firstLine) !== '{') { - array_unshift($lines, $firstLine); + // If the opening brace isn't on the same line as method + // signature, then we should pop off more lines until we find it + if (strpos($firstLine,'{') === false) { + do { + if (count($lines) == 0) break; + $firstLine = array_shift($lines); + } while (strpos($firstLine, '{') === false); + } + + // If there are more characters on the line after the opening brace, + // push them back onto the lines stack as they are part of the body + $restOfFirstLine = trim(substr($firstLine, strpos($firstLine, '{')+1)); + if (!empty($restOfFirstLine)) { + array_unshift($lines, $restOfFirstLine); } $lastLine = array_pop($lines); - if (trim($lastLine) !== '}') { - array_push($lines, $lastLine); + // If there are more characters on the line before the closing brace, + // push them back onto the lines stack as they are part of the body + $restOfLastLine = trim(substr($lastLine, 0, strrpos($lastLine, '}')-1)); + if (!empty($restOfLastLine)) { + array_push($lines, $restOfLastLine); } // just in case we had code on the bracket lines - return rtrim(ltrim(implode("\n", $lines), '{'), '}'); + return implode("\n", $lines); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Parameter.php --- a/web/lib/Zend/Reflection/Parameter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Parameter.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parameter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Parameter extends ReflectionParameter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Reflection/Property.php --- a/web/lib/Zend/Reflection/Property.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Reflection/Property.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Property.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Property.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @todo implement line numbers * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Property extends ReflectionProperty diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Registry.php --- a/web/lib/Zend/Registry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Registry.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Registry - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Registry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Registry - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Registry extends ArrayObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Client.php --- a/web/lib/Zend/Rest/Client.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client extends Zend_Service_Abstract @@ -50,6 +50,13 @@ * @var Zend_Uri_Http */ protected $_uri = null; + + /** + * Flag indicating the Zend_Http_Client is fresh and needs no reset. + * Must be set explicitly if you want to keep preset parameters. + * @var bool true if you do not want a reset. Default false. + */ + protected $_noReset = false; /** * Constructor @@ -98,7 +105,7 @@ * @throws Zend_Rest_Client_Exception * @return void */ - final private function _prepareRest($path) + private function _prepareRest($path) { // Get the URI object and configure it if (!$this->_uri instanceof Zend_Uri_Http) { @@ -118,7 +125,29 @@ * Get the HTTP client and configure it for the endpoint URI. Do this each time * because the Zend_Http_Client instance is shared among all Zend_Service_Abstract subclasses. */ - self::getHttpClient()->resetParameters()->setUri($this->_uri); + if ($this->_noReset) { + // if $_noReset we do not want to reset on this request, + // but we do on any subsequent request + $this->_noReset = false; + } else { + self::getHttpClient()->resetParameters(); + } + + self::getHttpClient()->setUri($this->_uri); + } + + /** + * Tells Zend_Rest_Client not to reset all parameters on it's + * Zend_Http_Client. If you want no reset, this must be called explicitly + * before every request for which you do not want to reset the parameters. + * Parameters will accumulate between requests, but as soon as you do not + * call this function prior to any request, all preset parameters will be reset + * as by default. + * @param boolean $bool + */ + public function setNoReset($bool = true) + { + $this->_noReset = $bool; } /** @@ -129,7 +158,7 @@ * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restGet($path, array $query = null) + public function restGet($path, array $query = null) { $this->_prepareRest($path); $client = self::getHttpClient(); @@ -167,7 +196,7 @@ * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restPost($path, $data = null) + public function restPost($path, $data = null) { $this->_prepareRest($path); return $this->_performPost('POST', $data); @@ -181,7 +210,7 @@ * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restPut($path, $data = null) + public function restPut($path, $data = null) { $this->_prepareRest($path); return $this->_performPost('PUT', $data); @@ -194,10 +223,10 @@ * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restDelete($path) + public function restDelete($path, $data = null) { $this->_prepareRest($path); - return self::getHttpClient()->request('DELETE'); + return $this->_performPost('DELETE', $data); } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Client/Exception.php --- a/web/lib/Zend/Rest/Client/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Client/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Exception extends Zend_Rest_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Client/Result.php --- a/web/lib/Zend/Rest/Client/Result.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Client/Result.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Result implements IteratorAggregate { @@ -180,7 +180,8 @@ public function getStatus() { $status = $this->_sxml->xpath('//status/text()'); - + if ( !isset($status[0]) ) return false; + $status = strtolower($status[0]); if (ctype_alpha($status) && $status == 'success') { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Client/Result/Exception.php --- a/web/lib/Zend/Rest/Client/Result/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Client/Result/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Result_Exception extends Zend_Rest_Client_Exception{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Controller.php --- a/web/lib/Zend/Rest/Controller.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Controller.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Controller.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Controller.php 25024 2012-07-30 15:08:15Z rob $ */ /** Zend_Controller_Action */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Rest * @see Zend_Rest_Route - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Rest_Controller extends Zend_Controller_Action @@ -48,6 +48,13 @@ abstract public function getAction(); /** + * The head action handles HEAD requests and receives an 'id' parameter; it + * should respond with the server resource state of the resource identified + * by the 'id' value. + */ + abstract public function headAction(); + + /** * The post action handles POST requests; it should accept and digest a * POSTed resource representation and persist the resource state. */ @@ -67,4 +74,4 @@ */ abstract public function deleteAction(); -} \ No newline at end of file +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Exception.php --- a/web/lib/Zend/Rest/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Route.php --- a/web/lib/Zend/Rest/Route.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Route.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Route.php 23421 2010-11-21 10:03:53Z wilmoore $ + * @version $Id: Route.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -46,7 +46,7 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module @@ -98,13 +98,13 @@ $defaultsArray = array(); $restfulConfigArray = array(); foreach ($config as $key => $values) { - if ($key == 'type') { - // do nothing - } elseif ($key == 'defaults') { - $defaultsArray = $values->toArray(); - } else { - $restfulConfigArray[$key] = explode(',', $values); - } + if ($key == 'type') { + // do nothing + } elseif ($key == 'defaults') { + $defaultsArray = $values->toArray(); + } else { + $restfulConfigArray[$key] = explode(',', $values); + } } $instance = new self($frontController, $defaultsArray, $restfulConfigArray); return $instance; @@ -161,10 +161,10 @@ return false; } } elseif ($this->_checkRestfulController($moduleName, $controllerName)) { - $values[$this->_controllerKey] = $controllerName; - $values[$this->_actionKey] = 'get'; + $values[$this->_controllerKey] = $controllerName; + $values[$this->_actionKey] = 'get'; } else { - return false; + return false; } //Store path count for method mapping @@ -176,7 +176,7 @@ $specialGetTarget = array_shift($path); } elseif ($pathElementCount && $path[$pathElementCount-1] == 'edit') { $specialGetTarget = 'edit'; - $params['id'] = $path[$pathElementCount-2]; + $params['id'] = urldecode($path[$pathElementCount-2]); } elseif ($pathElementCount == 1) { $params['id'] = urldecode(array_shift($path)); } elseif ($pathElementCount == 0 && !isset($params['id'])) { @@ -187,8 +187,8 @@ if ($numSegs = count($path)) { for ($i = 0; $i < $numSegs; $i = $i + 2) { $key = urldecode($path[$i]); - $val = isset($path[$i + 1]) ? urldecode($path[$i + 1]) : null; - $params[$key] = $val; + $val = isset($path[$i + 1]) ? $path[$i + 1] : null; + $params[$key] = urldecode($val); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Server.php --- a/web/lib/Zend/Rest/Server.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Server.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Server.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Server implements Zend_Server_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Rest/Server/Exception.php --- a/web/lib/Zend/Rest/Server/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Rest/Server/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Server_Exception extends Zend_Rest_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Exception.php --- a/web/lib/Zend/Search/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene.php --- a/web/lib/Zend/Search/Lucene.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lucene.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: Lucene.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -89,7 +89,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene implements Zend_Search_Lucene_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Analyzer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Analyzer.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -63,7 +63,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,17 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Common.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Common.php 24847 2012-05-31 19:19:28Z rob $ */ /** Define constant used to provide correct file processing order */ /** @todo Section should be removed with ZF 2.0 release as obsolete */ -define('ZEND_SEARCH_LUCENE_COMMON_ANALYZER_PROCESSED', true); +if (!defined('ZEND_SEARCH_LUCENE_COMMON_ANALYZER_PROCESSED')) { + define('ZEND_SEARCH_LUCENE_COMMON_ANALYZER_PROCESSED', true); +} /** Zend_Search_Lucene_Analysis_Analyzer */ @@ -46,7 +48,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Analysis_Analyzer_Common extends Zend_Search_Lucene_Analysis_Analyzer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TextNum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TextNum.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utf8.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Utf8.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utf8Num.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Utf8Num.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php --- a/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/Token.php --- a/web/lib/Zend/Search/Lucene/Analysis/Token.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/Token.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Token.php 24832 2012-05-30 13:14:44Z adamlundrigan $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Analysis_Token @@ -123,6 +123,18 @@ { return $this->_termText; } + + /** + * Sets the Token's term text. + * + * @param string $text + * @return this + */ + public function setTermText($text) + { + $this->_termText = $text; + return $this; + } /** * Returns this Token's starting offset, the position of the first character diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/TokenFilter.php --- a/web/lib/Zend/Search/Lucene/Analysis/TokenFilter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/TokenFilter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TokenFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TokenFilter.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Analysis_TokenFilter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php --- a/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LowerCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LowerCase.php 24832 2012-05-30 13:14:44Z adamlundrigan $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -45,14 +45,8 @@ */ public function normalize(Zend_Search_Lucene_Analysis_Token $srcToken) { - $newToken = new Zend_Search_Lucene_Analysis_Token( - strtolower( $srcToken->getTermText() ), - $srcToken->getStartOffset(), - $srcToken->getEndOffset()); - - $newToken->setPositionIncrement($srcToken->getPositionIncrement()); - - return $newToken; + $srcToken->setTermText(strtolower($srcToken->getTermText())); + return $srcToken; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php --- a/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LowerCaseUtf8.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LowerCaseUtf8.php 24832 2012-05-30 13:14:44Z adamlundrigan $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -57,14 +57,8 @@ */ public function normalize(Zend_Search_Lucene_Analysis_Token $srcToken) { - $newToken = new Zend_Search_Lucene_Analysis_Token( - mb_strtolower($srcToken->getTermText(), 'UTF-8'), - $srcToken->getStartOffset(), - $srcToken->getEndOffset()); - - $newToken->setPositionIncrement($srcToken->getPositionIncrement()); - - return $newToken; + $srcToken->setTermText(mb_strtolower($srcToken->getTermText(), 'UTF-8')); + return $srcToken; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php --- a/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ShortWords.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ShortWords.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php --- a/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StopWords.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StopWords.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Analysis_TokenFilter */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Document.php --- a/web/lib/Zend/Search/Lucene/Document.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Document.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Document.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Document.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document @@ -57,7 +57,7 @@ * Proxy method for getFieldValue(), provides more convenient access to * the string value of a field. * - * @param $offset + * @param string $offset * @return string */ public function __get($offset) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Document/Docx.php --- a/web/lib/Zend/Search/Lucene/Document/Docx.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Document/Docx.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Docx.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Document_OpenXml */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Docx extends Zend_Search_Lucene_Document_OpenXml { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Document/Exception.php --- a/web/lib/Zend/Search/Lucene/Document/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Document/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Exception extends Zend_Search_Lucene_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Document/Html.php --- a/web/lib/Zend/Search/Lucene/Document/Html.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Document/Html.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Html.php 23392 2010-11-19 09:53:16Z ramon $ + * @version $Id: Html.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Html extends Zend_Search_Lucene_Document @@ -438,7 +438,7 @@ if (!is_callable($callback)) { require_once 'Zend/Search/Lucene/Exception.php'; - throw new Zend_Search_Lucene_Exception('$viewHelper parameter mast be a View Helper name, View Helper object or callback.'); + throw new Zend_Search_Lucene_Exception('$viewHelper parameter must be a View Helper name, View Helper object or callback.'); } $xpath = new DOMXPath($this->_doc); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Document/OpenXml.php --- a/web/lib/Zend/Search/Lucene/Document/OpenXml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Document/OpenXml.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenXml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenXml.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Document_OpenXml extends Zend_Search_Lucene_Document diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Document/Pptx.php --- a/web/lib/Zend/Search/Lucene/Document/Pptx.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Document/Pptx.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pptx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pptx.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Pptx extends Zend_Search_Lucene_Document_OpenXml diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Document/Xlsx.php --- a/web/lib/Zend/Search/Lucene/Document/Xlsx.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Document/Xlsx.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xlsx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Xlsx.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Xlsx extends Zend_Search_Lucene_Document_OpenXml diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Exception.php --- a/web/lib/Zend/Search/Lucene/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Exception extends Zend_Search_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/FSM.php --- a/web/lib/Zend/Search/Lucene/FSM.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/FSM.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FSM.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FSM.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_FSMAction */ @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_FSM diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/FSMAction.php --- a/web/lib/Zend/Search/Lucene/FSMAction.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/FSMAction.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FSMAction.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FSMAction.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_FSMAction diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Field.php --- a/web/lib/Zend/Search/Lucene/Field.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Field.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Field.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Field.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Field diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/DictionaryLoader.php --- a/web/lib/Zend/Search/Lucene/Index/DictionaryLoader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/DictionaryLoader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DictionaryLoader.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DictionaryLoader.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_DictionaryLoader diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/DocsFilter.php --- a/web/lib/Zend/Search/Lucene/Index/DocsFilter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/DocsFilter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocsFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocsFilter.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_DocsFilter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/FieldInfo.php --- a/web/lib/Zend/Search/Lucene/Index/FieldInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/FieldInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FieldInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FieldInfo.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_FieldInfo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/SegmentInfo.php --- a/web/lib/Zend/Search/Lucene/Index/SegmentInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/SegmentInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentInfo.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: SegmentInfo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Index_TermsStream_Interface */ @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentInfo implements Zend_Search_Lucene_Index_TermsStream_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/SegmentMerger.php --- a/web/lib/Zend/Search/Lucene/Index/SegmentMerger.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/SegmentMerger.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentMerger.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SegmentMerger.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Index_SegmentInfo */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentMerger diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/SegmentWriter.php --- a/web/lib/Zend/Search/Lucene/Index/SegmentWriter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/SegmentWriter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentWriter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SegmentWriter.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Index_SegmentWriter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php --- a/web/lib/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentWriter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentWriter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Index_SegmentWriter */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentWriter_DocumentWriter extends Zend_Search_Lucene_Index_SegmentWriter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php --- a/web/lib/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StreamWriter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StreamWriter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Index_SegmentWriter */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentWriter_StreamWriter extends Zend_Search_Lucene_Index_SegmentWriter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/Term.php --- a/web/lib/Zend/Search/Lucene/Index/Term.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/Term.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_Term diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/TermInfo.php --- a/web/lib/Zend/Search/Lucene/Index/TermInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/TermInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TermInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TermInfo.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_TermInfo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/TermsPriorityQueue.php --- a/web/lib/Zend/Search/Lucene/Index/TermsPriorityQueue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/TermsPriorityQueue.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TermsPriorityQueue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TermsPriorityQueue.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_PriorityQueue */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_TermsPriorityQueue extends Zend_Search_Lucene_PriorityQueue diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php --- a/web/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Search_Lucene_Index_TermsStream_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Index/Writer.php --- a/web/lib/Zend/Search/Lucene/Index/Writer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Index/Writer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Writer.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_Writer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Interface.php --- a/web/lib/Zend/Search/Lucene/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -39,7 +39,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Search_Lucene_Interface extends Zend_Search_Lucene_Index_TermsStream_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Interface/MultiSearcher.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Search/Lucene/Interface/MultiSearcher.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,25 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Search_Lucene + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: MultiSearcher.php 24593 2012-01-05 20:35:02Z matthew $ + */ + + +/** Zend_Search_Lucene_MultiSearcher */ +require_once 'Zend/Search/Lucene/MultiSearcher.php'; + diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/LockManager.php --- a/web/lib/Zend/Search/Lucene/LockManager.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/LockManager.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LockManager.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LockManager.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Storage_Directory */ @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_LockManager diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/MultiSearcher.php --- a/web/lib/Zend/Search/Lucene/MultiSearcher.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/MultiSearcher.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiSearcher.php 22967 2010-09-18 18:53:58Z ramon $ + * @version $Id: MultiSearcher.php 24862 2012-06-02 00:04:53Z adamlundrigan $ */ @@ -24,14 +24,20 @@ require_once 'Zend/Search/Lucene/Interface.php'; /** + * Import Zend_Search_Lucene_Interface_MultiSearcher for BC (see ZF-12067) + * @see Zend_Search_Lucene_Interface_MultiSearcher + */ +require_once 'Zend/Search/Lucene/Interface/MultiSearcher.php'; + +/** * Multisearcher allows to search through several independent indexes. * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Search_Lucene_Interface_MultiSearcher implements Zend_Search_Lucene_Interface +class Zend_Search_Lucene_MultiSearcher implements Zend_Search_Lucene_Interface { /** * List of indices for searching. @@ -971,3 +977,16 @@ // Do nothing, since it's never referenced by indices } } + +/** + * This class is provided for backwards-compatibility (See ZF-12067) + * + * @category Zend + * @package Zend_Search_Lucene + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Search_Lucene_Interface_MultiSearcher + extends Zend_Search_Lucene_MultiSearcher +{ +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/PriorityQueue.php --- a/web/lib/Zend/Search/Lucene/PriorityQueue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/PriorityQueue.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PriorityQueue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PriorityQueue.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_PriorityQueue diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Proxy.php --- a/web/lib/Zend/Search/Lucene/Proxy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Proxy.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Proxy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Proxy.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Interface */ @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Proxy implements Zend_Search_Lucene_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php --- a/web/lib/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BooleanExpressionRecognizer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BooleanExpressionRecognizer.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_BooleanExpressionRecognizer extends Zend_Search_Lucene_FSM diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Highlighter/Default.php --- a/web/lib/Zend/Search/Lucene/Search/Highlighter/Default.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Highlighter/Default.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Search_Lucene_Search_Highlighter_Interface */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Highlighter_Default implements Zend_Search_Lucene_Search_Highlighter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Highlighter/Interface.php --- a/web/lib/Zend/Search/Lucene/Search/Highlighter/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Highlighter/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Search_Lucene_Search_Highlighter_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query.php --- a/web/lib/Zend/Search/Lucene/Search/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Boolean.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Boolean.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Boolean.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Boolean extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Empty.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Empty.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Empty.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Empty.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Empty.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Empty extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Fuzzy.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Fuzzy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Fuzzy.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fuzzy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fuzzy.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Fuzzy extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Insignificant.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Insignificant.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Insignificant.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Insignificant.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Insignificant.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Insignificant extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/MultiTerm.php --- a/web/lib/Zend/Search/Lucene/Search/Query/MultiTerm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/MultiTerm.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiTerm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MultiTerm.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_MultiTerm extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Phrase.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Phrase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Phrase.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Phrase extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Preprocessing.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Preprocessing.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Preprocessing.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Query_Preprocessing extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fuzzy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fuzzy.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Preprocessing_Fuzzy extends Zend_Search_Lucene_Search_Query_Preprocessing diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Preprocessing_Phrase extends Zend_Search_Lucene_Search_Query_Preprocessing diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Preprocessing_Term extends Zend_Search_Lucene_Search_Query_Preprocessing diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Range.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Range.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Range.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Range.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: Range.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Range extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Term.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Term.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Term.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Term extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Query/Wildcard.php --- a/web/lib/Zend/Search/Lucene/Search/Query/Wildcard.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Query/Wildcard.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Wildcard.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Wildcard.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Wildcard extends Zend_Search_Lucene_Search_Query diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryEntry.php --- a/web/lib/Zend/Search/Lucene/Search/QueryEntry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryEntry.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryEntry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_QueryEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryEntry/Phrase.php --- a/web/lib/Zend/Search/Lucene/Search/QueryEntry/Phrase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryEntry/Phrase.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Search_QueryEntry */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryEntry_Phrase extends Zend_Search_Lucene_Search_QueryEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryEntry/Subquery.php --- a/web/lib/Zend/Search/Lucene/Search/QueryEntry/Subquery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryEntry/Subquery.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subquery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Subquery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Search_QueryEntry */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryEntry_Subquery extends Zend_Search_Lucene_Search_QueryEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryEntry/Term.php --- a/web/lib/Zend/Search/Lucene/Search/QueryEntry/Term.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryEntry/Term.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Search_QueryEntry */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryEntry_Term extends Zend_Search_Lucene_Search_QueryEntry diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryHit.php --- a/web/lib/Zend/Search/Lucene/Search/QueryHit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryHit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryHit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryHit.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryHit diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryLexer.php --- a/web/lib/Zend/Search/Lucene/Search/QueryLexer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryLexer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryLexer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryLexer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_FSM */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryLexer extends Zend_Search_Lucene_FSM diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryParser.php --- a/web/lib/Zend/Search/Lucene/Search/QueryParser.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryParser.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryParser.php 21637 2010-03-24 17:52:04Z alexander $ + * @version $Id: QueryParser.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryParser extends Zend_Search_Lucene_FSM diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryParserContext.php --- a/web/lib/Zend/Search/Lucene/Search/QueryParserContext.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryParserContext.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryParserContext.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryParserContext.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Search_QueryToken */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryParserContext diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryParserException.php --- a/web/lib/Zend/Search/Lucene/Search/QueryParserException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryParserException.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryParserException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryParserException.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * Special exception type, which may be used to intercept wrong user input diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/QueryToken.php --- a/web/lib/Zend/Search/Lucene/Search/QueryToken.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/QueryToken.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryToken.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryToken.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryToken diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Similarity.php --- a/web/lib/Zend/Search/Lucene/Search/Similarity.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Similarity.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Similarity.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Similarity.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Similarity diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Similarity/Default.php --- a/web/lib/Zend/Search/Lucene/Search/Similarity/Default.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Similarity/Default.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Similarity_Default extends Zend_Search_Lucene_Search_Similarity diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Weight.php --- a/web/lib/Zend/Search/Lucene/Search/Weight.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Weight.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Weight @@ -78,7 +78,7 @@ /** * Assigns the query normalization factor to this. * - * @param $norm + * @param float $norm */ abstract public function normalize($norm); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Weight/Boolean.php --- a/web/lib/Zend/Search/Lucene/Search/Weight/Boolean.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Weight/Boolean.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Boolean extends Zend_Search_Lucene_Search_Weight diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Weight/Empty.php --- a/web/lib/Zend/Search/Lucene/Search/Weight/Empty.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Weight/Empty.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Empty.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Empty.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Empty extends Zend_Search_Lucene_Search_Weight diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Weight/MultiTerm.php --- a/web/lib/Zend/Search/Lucene/Search/Weight/MultiTerm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Weight/MultiTerm.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiTerm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MultiTerm.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_MultiTerm extends Zend_Search_Lucene_Search_Weight diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Weight/Phrase.php --- a/web/lib/Zend/Search/Lucene/Search/Weight/Phrase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Weight/Phrase.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Phrase extends Zend_Search_Lucene_Search_Weight diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Search/Weight/Term.php --- a/web/lib/Zend/Search/Lucene/Search/Weight/Term.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Search/Weight/Term.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Term extends Zend_Search_Lucene_Search_Weight diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Storage/Directory.php --- a/web/lib/Zend/Search/Lucene/Storage/Directory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Storage/Directory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Directory.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Storage_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Storage/Directory/Filesystem.php --- a/web/lib/Zend/Search/Lucene/Storage/Directory/Filesystem.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Storage/Directory/Filesystem.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Filesystem.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Filesystem.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Storage_Directory_Filesystem extends Zend_Search_Lucene_Storage_Directory @@ -206,7 +206,8 @@ unset($this->_fileHandlers[$filename]); global $php_errormsg; - $trackErrors = ini_get('track_errors'); ini_set('track_errors', '1'); + $trackErrors = ini_get('track_errors'); + ini_set('track_errors', '1'); if (!@unlink($this->_dirPath . '/' . $filename)) { ini_set('track_errors', $trackErrors); require_once 'Zend/Search/Lucene/Exception.php'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Storage/File.php --- a/web/lib/Zend/Search/Lucene/Storage/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Storage/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Storage_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Storage/File/Filesystem.php --- a/web/lib/Zend/Search/Lucene/Storage/File/Filesystem.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Storage/File/Filesystem.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Filesystem.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Filesystem.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Storage_File */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Storage_File_Filesystem extends Zend_Search_Lucene_Storage_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/Storage/File/Memory.php --- a/web/lib/Zend/Search/Lucene/Storage/File/Memory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/Storage/File/Memory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Memory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Storage_File */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Storage_File_Memory extends Zend_Search_Lucene_Storage_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php --- a/web/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TermStreamsPriorityQueue.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: TermStreamsPriorityQueue.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Search_Lucene_Index_TermsStream_Interface */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_TermStreamsPriorityQueue implements Zend_Search_Lucene_Index_TermsStream_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer.php --- a/web/lib/Zend/Serializer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Serializer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Loader_PluginLoader */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer @@ -51,7 +51,7 @@ * @param array |Zend_Config $opts Serializer options * @return Zend_Serializer_Adapter_AdapterInterface */ - public static function factory($adapterName, $opts = array()) + public static function factory($adapterName, $opts = array()) { if ($adapterName instanceof Zend_Serializer_Adapter_AdapterInterface) { return $adapterName; // $adapterName is already an adapter object @@ -80,7 +80,7 @@ * * @return Zend_Loader_PluginLoader */ - public static function getAdapterLoader() + public static function getAdapterLoader() { if (self::$_adapterLoader === null) { self::$_adapterLoader = self::_getDefaultAdapterLoader(); @@ -94,11 +94,11 @@ * @param Zend_Loader_PluginLoader $pluginLoader * @return void */ - public static function setAdapterLoader(Zend_Loader_PluginLoader $pluginLoader) + public static function setAdapterLoader(Zend_Loader_PluginLoader $pluginLoader) { self::$_adapterLoader = $pluginLoader; } - + /** * Resets the internal adapter plugin loader * @@ -109,7 +109,7 @@ self::$_adapterLoader = self::_getDefaultAdapterLoader(); return self::$_adapterLoader; } - + /** * Returns a default adapter plugin loader * @@ -128,7 +128,7 @@ * @param string|Zend_Serializer_Adapter_AdapterInterface $adapter * @param array|Zend_Config $options */ - public static function setDefaultAdapter($adapter, $options = array()) + public static function setDefaultAdapter($adapter, $options = array()) { self::$_defaultAdapter = self::factory($adapter, $options); } @@ -138,7 +138,7 @@ * * @return Zend_Serializer_Adapter_AdapterInterface */ - public static function getDefaultAdapter() + public static function getDefaultAdapter() { if (!self::$_defaultAdapter instanceof Zend_Serializer_Adapter_AdapterInterface) { self::setDefaultAdapter(self::$_defaultAdapter); @@ -154,7 +154,7 @@ * @return string * @throws Zend_Serializer_Exception */ - public static function serialize($value, array $options = array()) + public static function serialize($value, array $options = array()) { if (isset($options['adapter'])) { $adapter = self::factory($options['adapter']); @@ -174,7 +174,7 @@ * @return mixed * @throws Zend_Serializer_Exception */ - public static function unserialize($serialized, array $options = array()) + public static function unserialize($serialized, array $options = array()) { if (isset($options['adapter'])) { $adapter = self::factory($options['adapter']); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/AdapterAbstract.php --- a/web/lib/Zend/Serializer/Adapter/AdapterAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/AdapterAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAbstract.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: AdapterAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterInterface */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Serializer_Adapter_AdapterAbstract implements Zend_Serializer_Adapter_AdapterInterface @@ -44,7 +44,7 @@ * * @param array|Zend_Config $opts Serializer options */ - public function __construct($opts = array()) + public function __construct($opts = array()) { $this->setOptions($opts); } @@ -55,7 +55,7 @@ * @param array|Zend_Config $opts Serializer options * @return Zend_Serializer_Adapter_AdapterAbstract */ - public function setOptions($opts) + public function setOptions($opts) { if ($opts instanceof Zend_Config) { $opts = $opts->toArray(); @@ -76,7 +76,7 @@ * @param mixed $value Option value * @return Zend_Serializer_Adapter_AdapterAbstract */ - public function setOption($name, $value) + public function setOption($name, $value) { $this->_options[(string) $name] = $value; return $this; @@ -87,7 +87,7 @@ * * @return array */ - public function getOptions() + public function getOptions() { return $this->_options; } @@ -99,7 +99,7 @@ * @return mixed * @throws Zend_Serializer_Exception */ - public function getOption($name) + public function getOption($name) { $name = (string) $name; if (!array_key_exists($name, $this->_options)) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/AdapterInterface.php --- a/web/lib/Zend/Serializer/Adapter/AdapterInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/AdapterInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,19 +15,19 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: AdapterInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -interface Zend_Serializer_Adapter_AdapterInterface +interface Zend_Serializer_Adapter_AdapterInterface { /** * Constructor diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/Amf0.php --- a/web/lib/Zend/Serializer/Adapter/Amf0.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/Amf0.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Amf0.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Amf0.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -39,16 +39,16 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Amf0 extends Zend_Serializer_Adapter_AdapterAbstract { /** * Serialize a PHP value to AMF0 format - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception */ @@ -67,9 +67,9 @@ /** * Unserialize an AMF0 value to PHP - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return void * @throws Zend_Serializer_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/Amf3.php --- a/web/lib/Zend/Serializer/Adapter/Amf3.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/Amf3.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Amf3.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Amf3.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -39,16 +39,16 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Amf3 extends Zend_Serializer_Adapter_AdapterAbstract { /** * Serialize a PHP value to AMF3 format - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception */ @@ -67,9 +67,9 @@ /** * Deserialize an AMF3 value to PHP - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/Igbinary.php --- a/web/lib/Zend/Serializer/Adapter/Igbinary.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/Igbinary.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Igbinary.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Igbinary.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Igbinary extends Zend_Serializer_Adapter_AdapterAbstract @@ -39,12 +39,12 @@ /** * Constructor - * - * @param array|Zend_Config $opts + * + * @param array|Zend_Config $opts * @return void * @throws Zend_Serializer_Exception If igbinary extension is not present */ - public function __construct($opts = array()) + public function __construct($opts = array()) { if (!extension_loaded('igbinary')) { require_once 'Zend/Serializer/Exception.php'; @@ -60,9 +60,9 @@ /** * Serialize PHP value to igbinary - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception on igbinary error */ @@ -79,9 +79,9 @@ /** * Deserialize igbinary string to PHP value - * - * @param string|binary $serialized - * @param array $opts + * + * @param string|binary $serialized + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on igbinary error */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/Json.php --- a/web/lib/Zend/Serializer/Adapter/Json.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/Json.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Json.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Json extends Zend_Serializer_Adapter_AdapterAbstract @@ -46,9 +46,9 @@ /** * Serialize PHP value to JSON - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception on JSON encoding exception */ @@ -66,9 +66,9 @@ /** * Deserialize JSON to PHP value - * - * @param string $json - * @param array $opts + * + * @param string $json + * @param array $opts * @return mixed */ public function unserialize($json, array $opts = array()) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/PhpCode.php --- a/web/lib/Zend/Serializer/Adapter/PhpCode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/PhpCode.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhpCode.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: PhpCode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -27,16 +27,16 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_PhpCode extends Zend_Serializer_Adapter_AdapterAbstract { /** * Serialize PHP using var_export - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string */ public function serialize($value, array $opts = array()) @@ -48,9 +48,9 @@ * Deserialize PHP string * * Warning: this uses eval(), and should likely be avoided. - * - * @param string $code - * @param array $opts + * + * @param string $code + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on eval error */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/PhpSerialize.php --- a/web/lib/Zend/Serializer/Adapter/PhpSerialize.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/PhpSerialize.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhpSerialize.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: PhpSerialize.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_PhpSerialize extends Zend_Serializer_Adapter_AdapterAbstract @@ -39,11 +39,11 @@ /** * Constructor - * - * @param array|Zend_Config $opts + * + * @param array|Zend_Config $opts * @return void */ - public function __construct($opts = array()) + public function __construct($opts = array()) { parent::__construct($opts); @@ -54,9 +54,9 @@ /** * Serialize using serialize() - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception On serialize error */ @@ -73,10 +73,10 @@ /** * Unserialize - * + * * @todo Allow integration with unserialize_callback_func - * @param string $serialized - * @param array $opts + * @param string $serialized + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on unserialize error */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/PythonPickle.php --- a/web/lib/Zend/Serializer/Adapter/PythonPickle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/PythonPickle.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PythonPickle.php 21187 2010-02-24 01:22:01Z stas $ + * @version $Id: PythonPickle.php 24815 2012-05-24 08:50:24Z mabe $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_AdapterAbstract @@ -296,11 +296,11 @@ $this->_pickle .= self::OP_BINGET . chr($id); } else { // LONG_BINGET + pack("<i", i) - $idBin = pack('l', $id); + $bin = pack('l', $id); if (self::$_isLittleEndian === false) { - $idBin = strrev($bin); + $bin = strrev($bin); } - $this->_pickle .= self::OP_LONG_BINGET . $idBin; + $this->_pickle .= self::OP_LONG_BINGET . $bin; } } else { $this->_pickle .= self::OP_GET . $id . "\r\n"; @@ -321,11 +321,11 @@ $this->_pickle .= self::OP_BINPUT . chr($id); } else { // LONG_BINPUT + pack("<i", i) - $idBin = pack('l', $id); + $bin = pack('l', $id); if (self::$_isLittleEndian === false) { - $idBin = strrev($bin); + $bin = strrev($bin); } - $this->_pickle .= self::OP_LONG_BINPUT . $idBin; + $this->_pickle .= self::OP_LONG_BINPUT . $bin; } } else { $this->_pickle .= self::OP_PUT . $id . "\r\n"; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Adapter/Wddx.php --- a/web/lib/Zend/Serializer/Adapter/Wddx.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Adapter/Wddx.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Wddx.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Wddx.php 25033 2012-08-17 19:50:08Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstract @@ -43,8 +43,8 @@ /** * Constructor - * - * @param array $opts + * + * @param array $opts * @return void * @throws Zend_Serializer_Exception if wddx extension not found */ @@ -60,9 +60,9 @@ /** * Serialize PHP to WDDX - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception on wddx error */ @@ -86,9 +86,9 @@ /** * Unserialize from WDDX to PHP - * - * @param string $wddx - * @param array $opts + * + * @param string $wddx + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on wddx error */ @@ -100,7 +100,19 @@ // check if the returned NULL is valid // or based on an invalid wddx string try { - $simpleXml = new SimpleXMLElement($wddx); + $oldLibxmlDisableEntityLoader = libxml_disable_entity_loader(true); + $dom = new DOMDocument; + $dom->loadXML($wddx); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/Serializer/Exception.php'; + throw new Zend_Serializer_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + $simpleXml = simplexml_import_dom($dom); + libxml_disable_entity_loader($oldLibxmlDisableEntityLoader); if (isset($simpleXml->data[0]->null[0])) { return null; // valid null } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Serializer/Exception.php --- a/web/lib/Zend/Serializer/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Serializer/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Exception */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Abstract.php --- a/web/lib/Zend/Server/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -51,9 +51,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Server_Abstract implements Zend_Server_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Cache.php --- a/web/lib/Zend/Server/Cache.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Cache.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cache.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Cache diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Definition.php --- a/web/lib/Zend/Server/Definition.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Definition.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Definition.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * @todo Implement iterator * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Definition implements Countable, Iterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Exception.php --- a/web/lib/Zend/Server/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Server * @subpackage Reflection - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Exception extends Zend_Exception { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Interface.php --- a/web/lib/Zend/Server/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,9 +23,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ interface Zend_Server_Interface { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Method/Callback.php --- a/web/lib/Zend/Server/Method/Callback.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Method/Callback.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Callback.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Callback diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Method/Definition.php --- a/web/lib/Zend/Server/Method/Definition.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Method/Definition.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Definition.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Definition diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Method/Parameter.php --- a/web/lib/Zend/Server/Method/Parameter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Method/Parameter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parameter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Parameter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Method/Prototype.php --- a/web/lib/Zend/Server/Method/Prototype.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Method/Prototype.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Prototype.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Prototype.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Prototype diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection.php --- a/web/lib/Zend/Server/Reflection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,9 +34,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reflection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reflection.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Class.php --- a/web/lib/Zend/Server/Reflection/Class.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Class.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection_Class { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Exception.php --- a/web/lib/Zend/Server/Reflection/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection_Exception extends Zend_Server_Exception { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Function.php --- a/web/lib/Zend/Server/Reflection/Function.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Function.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Function.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Function.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection_Function extends Zend_Server_Reflection_Function_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Function/Abstract.php --- a/web/lib/Zend/Server/Reflection/Function/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Function/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,9 +46,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23320 2010-11-12 21:57:29Z alexander $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ abstract class Zend_Server_Reflection_Function_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Method.php --- a/web/lib/Zend/Server/Reflection/Method.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Method.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Method.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection_Method extends Zend_Server_Reflection_Function_Abstract { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Node.php --- a/web/lib/Zend/Server/Reflection/Node.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Node.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,8 +24,8 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @version $Id: Node.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Node.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Reflection_Node diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Parameter.php --- a/web/lib/Zend/Server/Reflection/Parameter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Parameter.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parameter.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection_Parameter { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/Prototype.php --- a/web/lib/Zend/Server/Reflection/Prototype.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/Prototype.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Prototype.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Prototype.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection_Prototype { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Server/Reflection/ReturnValue.php --- a/web/lib/Zend/Server/Reflection/ReturnValue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Server/Reflection/ReturnValue.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReturnValue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ReturnValue.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Server_Reflection_ReturnValue { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Abstract.php --- a/web/lib/Zend/Service/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Akismet.php --- a/web/lib/Zend/Service/Akismet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Akismet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Akismet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Akismet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Akismet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage Akismet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Akismet extends Zend_Service_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon.php --- a/web/lib/Zend/Service/Amazon.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Amazon.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Amazon.php 24782 2012-05-09 12:04:50Z adamlundrigan $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon @@ -104,7 +104,7 @@ * @param array $options Options to use for the Search Query * @throws Zend_Service_Exception * @return Zend_Service_Amazon_ResultSet - * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemSearchOperation + * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2011-08-01&p=ApiReference/ItemSearchOperation */ public function itemSearch(array $options) { @@ -142,7 +142,7 @@ * * @param string $asin Amazon ASIN ID * @param array $options Query Options - * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemLookupOperation + * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2011-08-01&p=ApiReference/ItemLookupOperation * @throws Zend_Service_Exception * @return Zend_Service_Amazon_Item|Zend_Service_Amazon_ResultSet */ @@ -171,7 +171,7 @@ $dom->loadXML($response->getBody()); self::_checkErrors($dom); $xpath = new DOMXPath($dom); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); $items = $xpath->query('//az:Items/az:Item'); if ($items->length == 1) { @@ -229,7 +229,7 @@ $options['AWSAccessKeyId'] = $this->appId; $options['Service'] = 'AWSECommerceService'; $options['Operation'] = (string) $query; - $options['Version'] = '2005-10-05'; + $options['Version'] = '2011-08-01'; // de-canonicalize out sort key if (isset($options['ResponseGroup'])) { @@ -302,7 +302,7 @@ protected static function _checkErrors(DOMDocument $dom) { $xpath = new DOMXPath($dom); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); if ($xpath->query('//az:Error')->length >= 1) { $code = $xpath->query('//az:Error/az:Code/text()')->item(0)->data; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Abstract.php --- a/web/lib/Zend/Service/Amazon/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Accessories.php --- a/web/lib/Zend/Service/Amazon/Accessories.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Accessories.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Accessories.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Accessories.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Accessories @@ -50,7 +50,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); foreach (array('ASIN', 'Title') as $el) { $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Authentication.php --- a/web/lib/Zend/Service/Amazon/Authentication.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Authentication.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Authentication @@ -31,13 +31,13 @@ protected $_accessKey; protected $_secretKey; protected $_apiVersion; - + /** * Constructor - * - * @param string $accessKey - * @param string $secretKey - * @param string $apiVersion + * + * @param string $accessKey + * @param string $secretKey + * @param string $apiVersion * @return void */ public function __construct($accessKey, $secretKey, $apiVersion) @@ -46,36 +46,36 @@ $this->setSecretKey($secretKey); $this->setApiVersion($apiVersion); } - + /** * Set access key - * - * @param string $accessKey + * + * @param string $accessKey * @return void */ - public function setAccessKey($accessKey) + public function setAccessKey($accessKey) { $this->_accessKey = $accessKey; } - + /** * Set secret key - * - * @param string $secretKey + * + * @param string $secretKey * @return void */ - public function setSecretKey($secretKey) + public function setSecretKey($secretKey) { $this->_secretKey = $secretKey; } - + /** * Set API version - * - * @param string $apiVersion + * + * @param string $apiVersion * @return void */ - public function setApiVersion($apiVersion) + public function setApiVersion($apiVersion) { $this->_apiVersion = $apiVersion; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Authentication/Exception.php --- a/web/lib/Zend/Service/Amazon/Authentication/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Authentication/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_Exception extends Zend_Service_Amazon_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Authentication/S3.php --- a/web/lib/Zend/Service/Amazon/Authentication/S3.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Authentication/S3.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_S3 extends Zend_Service_Amazon_Authentication @@ -52,9 +52,9 @@ if (! is_array($headers)) { $headers = array($headers); } - + $type = $md5 = $date = ''; - + // Search for the Content-type, Content-MD5 and Date headers foreach ($headers as $key => $val) { if (strcasecmp($key, 'content-type') == 0) { @@ -65,12 +65,12 @@ $date = $val; } } - + // If we have an x-amz-date header, use that instead of the normal Date if (isset($headers['x-amz-date']) && isset($date)) { $date = ''; } - + $sig_str = "$method\n$md5\n$type\n$date\n"; // For x-amz- headers, combine like keys, lowercase them, sort them @@ -92,18 +92,18 @@ $sig_str .= $key . ':' . implode(',', $val) . "\n"; } } - + $sig_str .= '/'.parse_url($path, PHP_URL_PATH); if (strpos($path, '?location') !== false) { $sig_str .= '?location'; - } else + } else if (strpos($path, '?acl') !== false) { $sig_str .= '?acl'; - } else + } else if (strpos($path, '?torrent') !== false) { $sig_str .= '?torrent'; } - + $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_secretKey, 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY)); $headers['Authorization'] = 'AWS ' . $this->_accessKey . ':' . $signature; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Authentication/V1.php --- a/web/lib/Zend/Service/Amazon/Authentication/V1.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Authentication/V1.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_V1 extends Zend_Service_Amazon_Authentication @@ -47,7 +47,7 @@ * Signature Encoding Method */ protected $_signatureMethod = 'HmacSHA256'; - + /** * Generate the required attributes for the signature * @param string $url @@ -64,7 +64,7 @@ } $data = $this->_signParameters($url, $parameters); - + return $data; } @@ -102,7 +102,7 @@ $hmac = Zend_Crypt_Hmac::compute($this->_secretKey, 'SHA1', $data, Zend_Crypt_Hmac::BINARY); $paramaters['Signature'] = base64_encode($hmac); - + return $data; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Authentication/V2.php --- a/web/lib/Zend/Service/Amazon/Authentication/V2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Authentication/V2.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_V2 extends Zend_Service_Amazon_Authentication @@ -47,7 +47,7 @@ * Signature Encoding Method */ protected $_signatureMethod = 'HmacSHA256'; - + /** * Type of http request * @var string @@ -71,18 +71,18 @@ } $data = $this->_signParameters($url, $parameters); - + return $data; } - + /** * Set http request type to POST or GET - * @param $method string + * @param string $method */ public function setHttpMethod($method = "POST") { $this->_httpMethod = strtoupper($method); } - + /** * Get the current http request type * @return string diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/CustomerReview.php --- a/web/lib/Zend/Service/Amazon/CustomerReview.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/CustomerReview.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CustomerReview.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CustomerReview.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_CustomerReview @@ -75,7 +75,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); foreach (array('Rating', 'HelpfulVotes', 'CustomerId', 'TotalVotes', 'Date', 'Summary', 'Content') as $el) { $result = $xpath->query("./az:$el/text()", $dom); if ($result->length == 1) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2.php --- a/web/lib/Zend/Service/Amazon/Ec2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ec2.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ec2.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2 diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Abstract.php --- a/web/lib/Zend/Service/Amazon/Ec2/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abstract @@ -142,7 +142,7 @@ /** * Sends a HTTP request to the queue service using Zend_Http_Client * - * @param array $params List of parameters to send with the request + * @param array $params List of parameters to send with the request * @return Zend_Service_Amazon_Ec2_Response * @throws Zend_Service_Amazon_Ec2_Exception */ @@ -166,7 +166,7 @@ $request->setParameterPost($params); $httpResponse = $request->request(); - + } catch (Zend_Http_Client_Exception $zhce) { $message = 'Error in request to AWS service: ' . $zhce->getMessage(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Availabilityzones.php --- a/web/lib/Zend/Service/Amazon/Ec2/Availabilityzones.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Availabilityzones.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Availabilityzones.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Availabilityzones.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Availabilityzones extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/CloudWatch.php --- a/web/lib/Zend/Service/Amazon/Ec2/CloudWatch.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/CloudWatch.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CloudWatch.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CloudWatch.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstract @@ -281,7 +281,7 @@ $options['Dimensions.member.' . $x . '.Value'] = $dimVal; $x++; } - + unset($options['Dimensions']); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Ebs.php --- a/web/lib/Zend/Service/Amazon/Ec2/Ebs.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Ebs.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ebs.php 22047 2010-04-28 22:14:51Z shahar $ + * @version $Id: Ebs.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Ebs extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Elasticip.php --- a/web/lib/Zend/Service/Amazon/Ec2/Elasticip.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Elasticip.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Elasticip.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Elasticip.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Elasticip extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Exception.php --- a/web/lib/Zend/Service/Amazon/Ec2/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Exception extends Zend_Service_Amazon_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Image.php --- a/web/lib/Zend/Service/Amazon/Ec2/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Image extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Instance.php --- a/web/lib/Zend/Service/Amazon/Ec2/Instance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Instance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Instance.php 22046 2010-04-28 22:12:32Z shahar $ + * @version $Id: Instance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,12 +32,16 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_Abstract { /** + * Constant for Micro Instance Type + */ + const MICRO = 't1.micro'; + /** * Constant for Small Instance TYpe */ const SMALL = 'm1.small'; @@ -168,7 +172,6 @@ if(isset($options['monitor']) && $options['monitor'] === true) { $params['Monitoring.Enabled'] = true; } - $response = $this->sendRequest($params); $xpath = $response->getXPath(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Instance/Reserved.php --- a/web/lib/Zend/Service/Amazon/Ec2/Instance/Reserved.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Instance/Reserved.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reserved.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reserved.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance_Reserved extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Instance/Windows.php --- a/web/lib/Zend/Service/Amazon/Ec2/Instance/Windows.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Instance/Windows.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Windows.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Windows.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance_Windows extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Keypair.php --- a/web/lib/Zend/Service/Amazon/Ec2/Keypair.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Keypair.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Keypair.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Keypair.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Keypair extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Region.php --- a/web/lib/Zend/Service/Amazon/Ec2/Region.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Region.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Region.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Region.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Region extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Response.php --- a/web/lib/Zend/Service/Amazon/Ec2/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Response { @@ -118,7 +118,7 @@ } catch (Zend_Http_Exception $e) { $body = false; } - + if ($this->_document === null) { if ($body !== false) { // turn off libxml error handling diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Ec2/Securitygroups.php --- a/web/lib/Zend/Service/Amazon/Ec2/Securitygroups.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Ec2/Securitygroups.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Securitygroups.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Securitygroups.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Securitygroups extends Zend_Service_Amazon_Ec2_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/EditorialReview.php --- a/web/lib/Zend/Service/Amazon/EditorialReview.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/EditorialReview.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EditorialReview.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EditorialReview.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_EditorialReview @@ -50,7 +50,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); foreach (array('Source', 'Content') as $el) { $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Exception.php --- a/web/lib/Zend/Service/Amazon/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Image.php --- a/web/lib/Zend/Service/Amazon/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Image @@ -61,7 +61,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); $this->Url = Zend_Uri::factory($xpath->query('./az:URL/text()', $dom)->item(0)->data); $this->Height = (int) $xpath->query('./az:Height/text()', $dom)->item(0)->data; $this->Width = (int) $xpath->query('./az:Width/text()', $dom)->item(0)->data; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Item.php --- a/web/lib/Zend/Service/Amazon/Item.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Item.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Item.php 21883 2010-04-16 14:57:07Z dragonbe $ + * @version $Id: Item.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Item @@ -114,22 +114,22 @@ * * @param null|DOMElement $dom * @return void - * @throws Zend_Service_Amazon_Exception - * + * @throws Zend_Service_Amazon_Exception + * * @group ZF-9547 */ public function __construct($dom) { - if (null === $dom) { - require_once 'Zend/Service/Amazon/Exception.php'; - throw new Zend_Service_Amazon_Exception('Item element is empty'); - } - if (!$dom instanceof DOMElement) { - require_once 'Zend/Service/Amazon/Exception.php'; - throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element'); - } + if (null === $dom) { + require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Item element is empty'); + } + if (!$dom instanceof DOMElement) { + require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element'); + } $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); $this->ASIN = $xpath->query('./az:ASIN/text()', $dom)->item(0)->data; $result = $xpath->query('./az:DetailPageURL/text()', $dom); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/ListmaniaList.php --- a/web/lib/Zend/Service/Amazon/ListmaniaList.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/ListmaniaList.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListmaniaList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListmaniaList.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_ListmaniaList @@ -50,7 +50,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); foreach (array('ListId', 'ListName') as $el) { $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Offer.php --- a/web/lib/Zend/Service/Amazon/Offer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Offer.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Offer.php 21154 2010-02-23 17:10:34Z matthew $ + * @version $Id: Offer.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Offer @@ -85,7 +85,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); $this->MerchantId = (string) $xpath->query('./az:Merchant/az:MerchantId/text()', $dom)->item(0)->data; $name = $xpath->query('./az:Merchant/az:Name/text()', $dom); if ($name->length == 1) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/OfferSet.php --- a/web/lib/Zend/Service/Amazon/OfferSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/OfferSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OfferSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OfferSet.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_OfferSet @@ -85,7 +85,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); $offer = $xpath->query('./az:OfferSummary', $dom); if ($offer->length == 1) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Query.php --- a/web/lib/Zend/Service/Amazon/Query.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Query.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Query extends Zend_Service_Amazon diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/ResultSet.php --- a/web/lib/Zend/Service/Amazon/ResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/ResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_ResultSet implements SeekableIterator @@ -75,7 +75,7 @@ { $this->_dom = $dom; $this->_xpath = new DOMXPath($dom); - $this->_xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $this->_xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); $this->_results = $this->_xpath->query('//az:Item'); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/S3.php --- a/web/lib/Zend/Service/Amazon/S3.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/S3.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: S3.php 23224 2010-10-22 13:45:57Z matthew $ + * @version $Id: S3.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://docs.amazonwebservices.com/AmazonS3/2006-03-01/ */ @@ -157,14 +157,15 @@ public function createBucket($bucket, $location = null) { $this->_validBucketName($bucket); - + $headers=array(); if($location) { $data = '<CreateBucketConfiguration><LocationConstraint>'.$location.'</LocationConstraint></CreateBucketConfiguration>'; - } - else { + $headers[self::S3_CONTENT_TYPE_HEADER]= 'text/plain'; + $headers['Content-size']= strlen($data); + } else { $data = null; } - $response = $this->_makeRequest('PUT', $bucket, null, array(), $data); + $response = $this->_makeRequest('PUT', $bucket, null, $headers, $data); return ($response->getStatus() == 200); } @@ -273,9 +274,16 @@ return false; } - foreach ($objects as $object) { - $this->removeObject("$bucket/$object"); + while (!empty($objects)) { + foreach ($objects as $object) { + $this->removeObject("$bucket/$object"); + } + $params= array ( + 'marker' => $objects[count($objects)-1] + ); + $objects = $this->getObjectsByBucket($bucket,$params); } + return true; } @@ -313,7 +321,52 @@ return $objects; } + /** + * List the objects and common prefixes in a bucket. + * + * Provides the list of object keys and common prefixes that are contained in the bucket. Valid params include the following. + * prefix - Limits the response to keys which begin with the indicated prefix. You can use prefixes to separate a bucket into different sets of keys in a way similar to how a file system uses folders. + * marker - Indicates where in the bucket to begin listing. The list will only include keys that occur lexicographically after marker. This is convenient for pagination: To get the next page of results use the last key of the current page as the marker. + * max-keys - The maximum number of keys you'd like to see in the response body. The server might return fewer than this many keys, but will not return more. + * delimiter - Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the CommonPrefixes collection. These rolled-up keys are not returned elsewhere in the response. + * + * @see ZF-11401 + * @param string $bucket + * @param array $params S3 GET Bucket Paramater + * @return array|false + */ + public function getObjectsAndPrefixesByBucket($bucket, $params = array()) + { + $response = $this->_makeRequest('GET', $bucket, $params); + if ($response->getStatus() != 200) { + return false; + } + + $xml = new SimpleXMLElement($response->getBody()); + + $objects = array(); + if (isset($xml->Contents)) { + foreach ($xml->Contents as $contents) { + foreach ($contents->Key as $object) { + $objects[] = (string)$object; + } + } + } + $prefixes = array(); + if (isset($xml->CommonPrefixes)) { + foreach ($xml->CommonPrefixes as $prefix) { + foreach ($prefix->Prefix as $object) { + $prefixes[] = (string)$object; + } + } + } + + return array( + 'objects' => $objects, + 'prefixes' => $prefixes + ); + } /** * Make sure the object name is valid * @@ -482,7 +535,7 @@ } if(!isset($meta['Content-MD5'])) { - $headers['Content-MD5'] = base64_encode(md5_file($path, true)); + $meta['Content-MD5'] = base64_encode(md5_file($path, true)); } return $this->putObject($object, $data, $meta); @@ -557,11 +610,11 @@ /** * Make a request to Amazon S3 * - * @param string $method Request method - * @param string $path Path to requested object - * @param array $params Request parameters - * @param array $headers HTTP headers - * @param string|resource $data Request data + * @param string $method Request method + * @param string $path Path to requested object + * @param array $params Request parameters + * @param array $headers HTTP headers + * @param string|resource $data Request data * @return Zend_Http_Response */ public function _makeRequest($method, $path='', $params=null, $headers=array(), $data=null) @@ -590,7 +643,11 @@ $endpoint->setHost($parts[0].'.'.$endpoint->getHost()); } if (!empty($parts[1])) { - $endpoint->setPath('/'.$parts[1]); + // ZF-10218, ZF-10122 + $pathparts = explode('?',$parts[1]); + $endpath = $pathparts[0]; + $endpoint->setPath('/'.$endpath); + } else { $endpoint->setPath('/'); @@ -598,16 +655,16 @@ $path = $parts[0].'/'; } } - self::addSignature($method, $path, $headers); $client = self::getHttpClient(); - $client->resetParameters(); + $client->resetParameters(true); $client->setUri($endpoint); $client->setAuth(false); // Work around buglet in HTTP client - it doesn't clean headers // Remove when ZHC is fixed + /* $client->setHeaders(array('Content-MD5' => null, 'Content-Encoding' => null, 'Expect' => null, @@ -615,7 +672,7 @@ 'x-amz-acl' => null, 'x-amz-copy-source' => null, 'x-amz-metadata-directive' => null)); - + */ $client->setHeaders($headers); if (is_array($params)) { @@ -629,7 +686,7 @@ $headers['Content-type'] = self::getMimeType($path); } $client->setRawData($data, $headers['Content-type']); - } + } do { $retry = false; @@ -720,6 +777,9 @@ else if (strpos($path, '?torrent') !== false) { $sig_str .= '?torrent'; } + else if (strpos($path, '?versions') !== false) { + $sig_str .= '?versions'; + } $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY)); $headers['Authorization'] = 'AWS '.$this->_getAccessKey().':'.$signature; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/S3/Exception.php --- a/web/lib/Zend/Service/Amazon/S3/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/S3/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_S3_Exception extends Zend_Service_Amazon_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/S3/Stream.php --- a/web/lib/Zend/Service/Amazon/S3/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/S3/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 22621 2010-07-18 00:35:48Z torio $ + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_S3_Stream @@ -140,8 +140,7 @@ $this->_writeBuffer = true; $this->_getS3Client($path); return true; - } - else { + } else { // Otherwise, just see if the file exists or not $info = $this->_getS3Client($path)->getInfo($name); if ($info) { @@ -175,9 +174,9 @@ /** * Read from the stream * - * http://bugs.php.net/21641 - stream_read() is always passed PHP's - * internal read buffer size (8192) no matter what is passed as $count - * parameter to fread(). + * http://bugs.php.net/21641 - stream_read() is always passed PHP's + * internal read buffer size (8192) no matter what is passed as $count + * parameter to fread(). * * @param integer $count * @return string @@ -194,14 +193,12 @@ } $range_start = $this->_position; - $range_end = $this->_position+$count; + $range_end = $this->_position + $count - 1; // Only fetch more data from S3 if we haven't fetched any data yet (postion=0) - // OR, the range end position is greater than the size of the current object - // buffer AND if the range end position is less than or equal to the object's - // size returned by S3 - if (($this->_position == 0) || (($range_end > strlen($this->_objectBuffer)) && ($range_end <= $this->_objectSize))) { - + // OR, the range end position plus 1 is greater than the size of the current + // object buffer + if ($this->_objectBuffer === null || $range_end >= strlen($this->_objectBuffer)) { $headers = array( 'Range' => "bytes=$range_start-$range_end" ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/SimilarProduct.php --- a/web/lib/Zend/Service/Amazon/SimilarProduct.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/SimilarProduct.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimilarProduct.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimilarProduct.php 24780 2012-05-08 19:34:59Z adamlundrigan $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimilarProduct @@ -50,7 +50,7 @@ public function __construct(DOMElement $dom) { $xpath = new DOMXPath($dom->ownerDocument); - $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); + $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01'); foreach (array('ASIN', 'Title') as $el) { $text = $xpath->query("./az:$el/text()", $dom)->item(0); if($text instanceof DOMText) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/SimpleDb.php --- a/web/lib/Zend/Service/Amazon/SimpleDb.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/SimpleDb.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimpleDb extends Zend_Service_Amazon_Abstract @@ -100,7 +100,7 @@ $this->setEndpoint("https://" . $this->_sdbEndpoint); } - /** + /** * Set SimpleDB endpoint to use * * @param string|Zend_Uri_Http $endpoint @@ -108,15 +108,15 @@ */ public function setEndpoint($endpoint) { - if(!($endpoint instanceof Zend_Uri_Http)) { - $endpoint = Zend_Uri::factory($endpoint); - } - if(!$endpoint->valid()) { - require_once 'Zend/Service/Amazon/SimpleDb/Exception.php'; - throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid endpoint supplied"); - } - $this->_endpoint = $endpoint; - return $this; + if(!($endpoint instanceof Zend_Uri_Http)) { + $endpoint = Zend_Uri::factory($endpoint); + } + if(!$endpoint->valid()) { + require_once 'Zend/Service/Amazon/SimpleDb/Exception.php'; + throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid endpoint supplied"); + } + $this->_endpoint = $endpoint; + return $this; } /** @@ -124,30 +124,30 @@ * * @return Zend_Uri_Http */ - public function getEndpoint() + public function getEndpoint() { - return $this->_endpoint; + return $this->_endpoint; } /** * Get attributes API method * * @param string $domainName Domain name within database - * @param string + * @param string */ public function getAttributes( $domainName, $itemName, $attributeName = null ) { $params = array(); - $params['Action'] = 'GetAttributes'; - $params['DomainName'] = $domainName; - $params['ItemName'] = $itemName; + $params['Action'] = 'GetAttributes'; + $params['DomainName'] = $domainName; + $params['ItemName'] = $itemName; - if (isset($attributeName)) { - $params['AttributeName'] = $attributeName; - } + if (isset($attributeName)) { + $params['AttributeName'] = $attributeName; + } - $response = $this->_sendRequest($params); + $response = $this->_sendRequest($params); $document = $response->getSimpleXMLDocument(); $attributeNodes = $document->GetAttributesResult->Attribute; @@ -167,7 +167,7 @@ $data = (string)$valueNodes; } if (isset($attributes[$name])) { - $attributes[$name]->addValue($data); + $attributes[$name]->addValue($data); } else { $attributes[$name] = new Zend_Service_Amazon_SimpleDb_Attribute($itemName, $name, $data); } @@ -188,38 +188,38 @@ $domainName, $itemName, $attributes, $replace = array() ) { $params = array(); - $params['Action'] = 'PutAttributes'; - $params['DomainName'] = $domainName; - $params['ItemName'] = $itemName; + $params['Action'] = 'PutAttributes'; + $params['DomainName'] = $domainName; + $params['ItemName'] = $itemName; - $index = 0; - foreach ($attributes as $attribute) { - $attributeName = $attribute->getName(); + $index = 0; + foreach ($attributes as $attribute) { + $attributeName = $attribute->getName(); foreach ($attribute->getValues() as $value) { - $params['Attribute.' . $index . '.Name'] = $attributeName; + $params['Attribute.' . $index . '.Name'] = $attributeName; $params['Attribute.' . $index . '.Value'] = $value; - // Check if it should be replaced + // Check if it should be replaced if(array_key_exists($attributeName, $replace) && $replace[$attributeName]) { $params['Attribute.' . $index . '.Replace'] = 'true'; } $index++; } - } + } - // Exception should get thrown if there's an error + // Exception should get thrown if there's an error $response = $this->_sendRequest($params); } /** * Add many attributes at once - * - * @param array $items - * @param string $domainName - * @param array $replace + * + * @param array $items + * @param string $domainName + * @param array $replace * @return void */ - public function batchPutAttributes($items, $domainName, array $replace = array()) + public function batchPutAttributes($items, $domainName, array $replace = array()) { $params = array(); @@ -236,8 +236,8 @@ foreach($attribute->getValues() as $value) { $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Name'] = $attribute->getName(); $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Value'] = $value; - if (isset($replace[$name]) - && isset($replace[$name][$attribute->getName()]) + if (isset($replace[$name]) + && isset($replace[$name][$attribute->getName()]) && $replace[$name][$attribute->getName()] ) { $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Replace'] = 'true'; @@ -253,27 +253,27 @@ /** * Delete attributes - * - * @param string $domainName - * @param string $itemName - * @param array $attributes + * + * @param string $domainName + * @param string $itemName + * @param array $attributes * @return void */ - public function deleteAttributes($domainName, $itemName, array $attributes = array()) + public function deleteAttributes($domainName, $itemName, array $attributes = array()) { $params = array(); - $params['Action'] = 'DeleteAttributes'; - $params['DomainName'] = $domainName; - $params['ItemName'] = $itemName; + $params['Action'] = 'DeleteAttributes'; + $params['DomainName'] = $domainName; + $params['ItemName'] = $itemName; - $attributeIndex = 0; - foreach ($attributes as $attribute) { - foreach ($attribute->getValues() as $value) { - $params['Attribute.' . $attributeIndex . '.Name'] = $attribute->getName(); - $params['Attribute.' . $attributeIndex . '.Value'] = $value; + $attributeIndex = 0; + foreach ($attributes as $attribute) { + foreach ($attribute->getValues() as $value) { + $params['Attribute.' . $attributeIndex . '.Name'] = $attribute->getName(); + $params['Attribute.' . $attributeIndex . '.Value'] = $value; $attributeIndex++; - } - } + } + } $response = $this->_sendRequest($params); @@ -283,19 +283,19 @@ /** * List domains * - * @param $maxNumberOfDomains int - * @param $nextToken int + * @param int $maxNumberOfDomains + * @param int $nextToken * @return array 0 or more domain names */ - public function listDomains($maxNumberOfDomains = 100, $nextToken = null) + public function listDomains($maxNumberOfDomains = 100, $nextToken = null) { $params = array(); - $params['Action'] = 'ListDomains'; - $params['MaxNumberOfDomains'] = $maxNumberOfDomains; + $params['Action'] = 'ListDomains'; + $params['MaxNumberOfDomains'] = $maxNumberOfDomains; - if (null !== $nextToken) { - $params['NextToken'] = $nextToken; - } + if (null !== $nextToken) { + $params['NextToken'] = $nextToken; + } $response = $this->_sendRequest($params); $domainNodes = $response->getSimpleXMLDocument()->ListDomainsResult->DomainName; @@ -315,14 +315,14 @@ /** * Retrieve domain metadata * - * @param $domainName string Name of the domain for which metadata will be requested + * @param string $domainName Name of the domain for which metadata will be requested * @return array Key/value array of metadatum names and values. */ - public function domainMetadata($domainName) + public function domainMetadata($domainName) { $params = array(); - $params['Action'] = 'DomainMetadata'; - $params['DomainName'] = $domainName; + $params['Action'] = 'DomainMetadata'; + $params['DomainName'] = $domainName; $response = $this->_sendRequest($params); $document = $response->getSimpleXMLDocument(); @@ -340,14 +340,14 @@ /** * Create a new domain * - * @param $domainName string Valid domain name of the domain to create - * @return boolean True if successful, false if not + * @param string $domainName Valid domain name of the domain to create + * @return boolean True if successful, false if not */ - public function createDomain($domainName) - { + public function createDomain($domainName) + { $params = array(); - $params['Action'] = 'CreateDomain'; - $params['DomainName'] = $domainName; + $params['Action'] = 'CreateDomain'; + $params['DomainName'] = $domainName; $response = $this->_sendRequest($params); return $response->getHttpResponse()->isSuccessful(); } @@ -355,14 +355,14 @@ /** * Delete a domain * - * @param $domainName string Valid domain name of the domain to delete - * @return boolean True if successful, false if not + * @param string $domainName Valid domain name of the domain to delete + * @return boolean True if successful, false if not */ - public function deleteDomain($domainName) - { - $params = array(); - $params['Action'] = 'DeleteDomain'; - $params['DomainName'] = $domainName; + public function deleteDomain($domainName) + { + $params = array(); + $params['Action'] = 'DeleteDomain'; + $params['DomainName'] = $domainName; $response = $this->_sendRequest($params); return $response->getHttpResponse()->isSuccessful(); } @@ -374,15 +374,15 @@ * @param null|string $nextToken * @return Zend_Service_Amazon_SimpleDb_Page */ - public function select($selectExpression, $nextToken = null) - { + public function select($selectExpression, $nextToken = null) + { $params = array(); - $params['Action'] = 'Select'; - $params['SelectExpression'] = $selectExpression; + $params['Action'] = 'Select'; + $params['SelectExpression'] = $selectExpression; - if (null !== $nextToken) { - $params['NextToken'] = $nextToken; - } + if (null !== $nextToken) { + $params['NextToken'] = $nextToken; + } $response = $this->_sendRequest($params); $xml = $response->getSimpleXMLDocument(); @@ -406,36 +406,36 @@ return new Zend_Service_Amazon_SimpleDb_Page($attributes, $nextToken); } - - /** - * Quote SDB value - * - * Wraps it in '' - * - * @param string $value - * @return string - */ + + /** + * Quote SDB value + * + * Wraps it in '' + * + * @param string $value + * @return string + */ public function quote($value) { - // wrap in single quotes and convert each ' inside to '' - return "'" . str_replace("'", "''", $value) . "'"; + // wrap in single quotes and convert each ' inside to '' + return "'" . str_replace("'", "''", $value) . "'"; } - - /** - * Quote SDB column or table name - * - * Wraps it in `` - * @param string $name - * @return string - */ + + /** + * Quote SDB column or table name + * + * Wraps it in `` + * @param string $name + * @return string + */ public function quoteName($name) { - if (preg_match('/^[a-z_$][a-z0-9_$-]*$/i', $name) == false) { - throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid name: can contain only alphanumeric characters, \$ and _"); - } - return "`$name`"; + if (preg_match('/^[a-z_$][a-z0-9_$-]*$/i', $name) == false) { + throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid name: can contain only alphanumeric characters, \$ and _"); + } + return "`$name`"; } - + /** * Sends a HTTP request to the SimpleDB service using Zend_Http_Client * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/SimpleDb/Attribute.php --- a/web/lib/Zend/Service/Amazon/SimpleDb/Attribute.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/SimpleDb/Attribute.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Response.php 17539 2009-08-10 22:51:26Z mikaelkael $ */ @@ -24,7 +24,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimpleDb_Attribute @@ -35,13 +35,13 @@ /** * Constructor - * - * @param string $itemName - * @param string $name - * @param array $values + * + * @param string $itemName + * @param string $name + * @param array $values * @return void */ - function __construct($itemName, $name, $values) + function __construct($itemName, $name, $values) { $this->_itemName = $itemName; $this->_name = $name; @@ -53,7 +53,7 @@ } } - /** + /** * Return the item name to which the attribute belongs * * @return string @@ -63,7 +63,7 @@ return $this->_itemName; } - /** + /** * Retrieve attribute values * * @return array @@ -73,7 +73,7 @@ return $this->_values; } - /** + /** * Retrieve the attribute name * * @return string @@ -82,17 +82,17 @@ { return $this->_name; } - + /** * Add value - * - * @param mixed $value + * + * @param mixed $value * @return void */ public function addValue($value) { if (is_array($value)) { - $this->_values += $value; + $this->_values += $value; } else { $this->_values[] = $value; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/SimpleDb/Exception.php --- a/web/lib/Zend/Service/Amazon/SimpleDb/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/SimpleDb/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimpleDb_Exception extends Zend_Service_Amazon_Exception @@ -42,10 +42,10 @@ /** * Constructor - * - * @param string $message - * @param int $code - * @param string $awsErrorCode + * + * @param string $message + * @param int $code + * @param string $awsErrorCode * @return void */ public function __construct($message, $code = 0, $awsErrorCode = '') @@ -56,7 +56,7 @@ /** * Get AWS error code - * + * * @return string */ public function getErrorCode() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/SimpleDb/Page.php --- a/web/lib/Zend/Service/Amazon/SimpleDb/Page.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/SimpleDb/Page.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,97 +1,97 @@ -<?php -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service_Amazon - * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ - -/** - * @see Zend_Service_Amazon_Exception - */ -require_once 'Zend/Service/Amazon/Exception.php'; - -/** - * The Custom Exception class that allows you to have access to the AWS Error Code. - * - * @category Zend - * @package Zend_Service_Amazon - * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Amazon_SimpleDb_Page -{ - /** @var string Page data */ - protected $_data; - - /** @var string|null Token identifying page */ - protected $_token; - - /** - * Constructor - * - * @param string $data - * @param string|null $token - * @return void - */ - public function __construct($data, $token = null) - { - $this->_data = $data; - $this->_token = $token; - } - - /** - * Retrieve page data - * - * @return string - */ - public function getData() - { - return $this->_data; - } - - /** - * Retrieve token - * - * @return string|null - */ - public function getToken() - { - return $this->_token; - } - - /** - * Determine whether this is the last page of data - * - * @return void - */ - public function isLast() - { - return (null === $this->_token); - } - - /** - * Cast to string - * - * @return string - */ - public function __toString() - { - return "Page with token: " . $this->_token - . "\n and data: " . $this->_data; - } -} +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Amazon + * @subpackage SimpleDb + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** + * @see Zend_Service_Amazon_Exception + */ +require_once 'Zend/Service/Amazon/Exception.php'; + +/** + * The Custom Exception class that allows you to have access to the AWS Error Code. + * + * @category Zend + * @package Zend_Service_Amazon + * @subpackage SimpleDb + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Amazon_SimpleDb_Page +{ + /** @var string Page data */ + protected $_data; + + /** @var string|null Token identifying page */ + protected $_token; + + /** + * Constructor + * + * @param string $data + * @param string|null $token + * @return void + */ + public function __construct($data, $token = null) + { + $this->_data = $data; + $this->_token = $token; + } + + /** + * Retrieve page data + * + * @return string + */ + public function getData() + { + return $this->_data; + } + + /** + * Retrieve token + * + * @return string|null + */ + public function getToken() + { + return $this->_token; + } + + /** + * Determine whether this is the last page of data + * + * @return void + */ + public function isLast() + { + return (null === $this->_token); + } + + /** + * Cast to string + * + * @return string + */ + public function __toString() + { + return "Page with token: " . $this->_token + . "\n and data: " . $this->_data; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/SimpleDb/Response.php --- a/web/lib/Zend/Service/Amazon/SimpleDb/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/SimpleDb/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,10 +28,10 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Service_Amazon_SimpleDb_Response +class Zend_Service_Amazon_SimpleDb_Response { /** * XML namespace used for SimpleDB responses. @@ -120,20 +120,20 @@ $body = false; } - + return simplexml_load_string($body); } - + /** * Get HTTP response object - * + * * @return Zend_Http_Response */ - public function getHttpResponse() + public function getHttpResponse() { return $this->_httpResponse; } - + /** * Gets the document object for this response * @@ -156,7 +156,7 @@ if (!$this->_document->loadXML($body)) { $this->_document = false; } - + // reset libxml error handling libxml_clear_errors(); libxml_use_internal_errors($errors); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Sqs.php --- a/web/lib/Zend/Service/Amazon/Sqs.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Sqs.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqs.php 22984 2010-09-21 02:52:48Z matthew $ + * @version $Id: Sqs.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://aws.amazon.com/sqs/ Amazon Simple Queue Service */ @@ -67,9 +67,17 @@ */ protected $_sqsSignatureMethod = 'HmacSHA256'; + protected $_sqsEndpoints = array('us-east-1' => 'sqs.us-east-1.amazonaws.com', + 'us-west-1' => 'sqs.us-west-1.amazonaws.com', + 'eu-west-1' => 'sqs.eu-west-1.amazonaws.com', + 'ap-southeast-1' => 'sqs.ap-southeast-1.amazonaws.com', + 'ap-northeast-1' => 'sqs.ap-northeast-1.amazonaws.com'); /** * Constructor * + * The default region is us-east-1. Use the region to set it to one of the regions that is build-in into ZF. + * To add a new AWS region use the setEndpoint() method. + * * @param string $accessKey * @param string $secretKey * @param string $region @@ -77,9 +85,78 @@ public function __construct($accessKey = null, $secretKey = null, $region = null) { parent::__construct($accessKey, $secretKey, $region); + + if (null !== $region) { + $this->_setEndpoint($region); + } } /** + * Set SQS endpoint + * + * Checks and sets endpoint if region exists in $_sqsEndpoints. If a new SQS region is added by amazon, + * please use the setEndpoint function to set it. + * + * @param string $region region + * @throws Zend_Service_Amazon_Sqs_Exception + */ + protected function _setEndpoint($region) + { + if (array_key_exists($region, $this->_sqsEndpoints)) { + $this->_sqsEndpoint = $this->_sqsEndpoints[$region]; + } else { + throw new Zend_Service_Amazon_Sqs_Exception('Invalid SQS region specified.'); + } + } + + /** + * Set SQS endpoint + * + * You can set SQS to on of the build-in regions. If the region does not exsist it will be added. + * + * @param string $region region + * @throws Zend_Service_Amazon_Sqs_Exception + */ + public function setEndpoint($region) + { + if (!empty($region)) { + if (array_key_exists($region, $this->_sqsEndpoints)) { + $this->_sqsEndpoint = $this->_sqsEndpoints[$region]; + } else { + $this->_sqsEndpoints[$region] = "sqs.$region.amazonaws.com"; + $this->_sqsEndpoint = $this->_sqsEndpoints[$region]; + } + } else { + throw new Zend_Service_Amazon_Sqs_Exception('Empty region specified.'); + } + } + + /** + * Get the SQS endpoint + * + * @return string + */ + public function getEndpoint() + { + return $this->_sqsEndpoint; + } + + /** + * Get possible SQS endpoints + * + * Since there is not an SQS webserive to get all possible endpoints, a hardcoded list is available. + * For the actual region list please check: + * http://docs.amazonwebservices.com/AWSSimpleQueueService/2009-02-01/APIReference/index.html?QueueServiceWsdlArticle.html + * + * @param string $region region + * @return array + */ + public function getEndpoints() + { + return $this->_sqsEndpoints; + } + + /** * Create a new queue * * Visibility timeout is how long a message is left in the queue "invisible" @@ -288,7 +365,7 @@ $result = $this->_makeRequest($queue_url, 'DeleteMessage', $params); - if (isset($result->Error->Code) + if (isset($result->Error->Code) && !empty($result->Error->Code) ) { return false; @@ -319,7 +396,7 @@ require_once 'Zend/Service/Amazon/Sqs/Exception.php'; throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code); } - + if(count($result->GetQueueAttributesResult->Attribute) > 1) { $attr_result = array(); foreach($result->GetQueueAttributesResult->Attribute as $attribute) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Amazon/Sqs/Exception.php --- a/web/lib/Zend/Service/Amazon/Sqs/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Amazon/Sqs/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Sqs_Exception extends Zend_Service_Amazon_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Audioscrobbler.php --- a/web/lib/Zend/Service/Audioscrobbler.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Audioscrobbler.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Audioscrobbler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Audioscrobbler.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Audioscrobbler.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Audioscrobbler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Audioscrobbler diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Delicious.php --- a/web/lib/Zend/Service/Delicious.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Delicious.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Delicious.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Delicious.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -54,7 +54,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Delicious/Exception.php --- a/web/lib/Zend/Service/Delicious/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Delicious/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Delicious/Post.php --- a/web/lib/Zend/Service/Delicious/Post.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Delicious/Post.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Post.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Post.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_Post extends Zend_Service_Delicious_SimplePost diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Delicious/PostList.php --- a/web/lib/Zend/Service/Delicious/PostList.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Delicious/PostList.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PostList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PostList.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_PostList implements Countable, Iterator, ArrayAccess diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Delicious/SimplePost.php --- a/web/lib/Zend/Service/Delicious/SimplePost.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Delicious/SimplePost.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimplePost.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimplePost.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_SimplePost diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/BaseUserService.php --- a/web/lib/Zend/Service/DeveloperGarden/BaseUserService.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/BaseUserService.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseUserService.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: BaseUserService.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -64,7 +64,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php --- a/web/lib/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccountBalance.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AccountBalance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Client/ClientAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Client/ClientAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Client/ClientAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ClientAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: ClientAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Client/Exception.php --- a/web/lib/Zend/Service/DeveloperGarden/Client/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Client/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Client/Soap.php --- a/web/lib/Zend/Service/DeveloperGarden/Client/Soap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Client/Soap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Soap.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Soap.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceCall.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -319,7 +319,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceAccount.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceAccount.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceDetail.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceDetail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -90,7 +90,7 @@ /** * set the description of this conference * - * @param $description the $description to set + * @param string $description the $description to set * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail */ public function setDescription($description) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceSchedule.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceSchedule.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Participant.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Participant.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ParticipantDetail.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ParticipantDetail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @see Zend_Validate_EmailAddress @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php --- a/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ParticipantStatus.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ParticipantStatus.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Credential.php --- a/web/lib/Zend/Service/DeveloperGarden/Credential.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Credential.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Credential.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Credential.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -134,7 +134,7 @@ * if $withRealm == true we combine username and realm like * username@realm * - * @param $boolean withRealm + * @param bool $withRealm * @return string|null */ public function getUsername($withRealm = false) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Exception.php --- a/web/lib/Zend/Service/DeveloperGarden/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/IpLocation.php --- a/web/lib/Zend/Service/DeveloperGarden/IpLocation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/IpLocation.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IpLocation.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: IpLocation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -64,11 +64,11 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Service_DeveloperGarden_IpLocation +class Zend_Service_DeveloperGarden_IpLocation extends Zend_Service_DeveloperGarden_Client_ClientAbstract { /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php --- a/web/lib/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IpAddress.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: IpAddress.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/LocalSearch.php --- a/web/lib/Zend/Service/DeveloperGarden/LocalSearch.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/LocalSearch.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearch.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearch.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/LocalSearch/Exception.php --- a/web/lib/Zend/Service/DeveloperGarden/LocalSearch/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/LocalSearch/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php --- a/web/lib/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchParameters.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: SearchParameters.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -294,10 +294,10 @@ * rx = longitude right bottom * ry = latitude right bottom * - * @param $lx - * @param $ly - * @param $rx - * @param $ry + * @param float $lx + * @param float $ly + * @param float $rx + * @param float $ry * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters */ public function setRectangle($lx, $ly, $rx, $ry) @@ -416,8 +416,8 @@ * sets a category filter * * @see http://www.suchen.de/kategorie-katalog - * @param $category - * @return unknown_type + * @param string $category + * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters */ public function setCategory($category = null) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ChangeQuotaPool.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ChangeQuotaPool.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetAccountBalance.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetAccountBalance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetQuotaInformation.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetQuotaInformation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AddConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AddConferenceTemplateParticipantRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommitConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CommitConferenceRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -125,7 +125,7 @@ /** * sets $account * - * @param $account + * @param int $account * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest */ public function setAccount($account = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceTemplateRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceListRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceListRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -93,7 +93,7 @@ /** * sets $ownerId * - * @param $ownerId + * @param int $ownerId * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest */ public function setOwnerId($ownerId) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceStatusRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceStatusRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateListRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateListRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -58,7 +58,7 @@ /** * sets $ownerId * - * @param $ownerId + * @param int $ownerId * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest */ public function setOwnerId($ownerId) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateParticipantRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetParticipantStatusRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetParticipantStatusRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetRunningConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetRunningConferenceRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewParticipantRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateParticipantRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveParticipantRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -147,7 +147,7 @@ /** * sets $account * - * @param $account + * @param int $account * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest */ public function setAccount($account = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateParticipantRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateParticipantRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/Exception.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocateIPRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocateIPRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearchRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearchRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -65,8 +65,8 @@ * @param integer $account * @return Zend_Service_DeveloperGarden_Request_RequestAbstract */ - public function __construct($environment, - Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters, + public function __construct($environment, + Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters, $account = null ) { parent::__construct($environment); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/RequestAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/RequestAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/RequestAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RequestAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RequestAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendFlashSMS.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendFlashSMS.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSMS.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSMS.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSmsAbstract.php 20418 2010-01-19 11:43:30Z bate $ + * @version $Id: SendSmsAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -72,14 +72,14 @@ * @var array */ private $_specialChars = array( - '|', - '^', - '{', - '}', - '[', - ']', - '~', - '\\', + '|', + '^', + '{', + '}', + '[', + ']', + '~', + '\\', "\n", // '€', removed because its counted in utf8 correctly ); @@ -207,7 +207,7 @@ /** * sets a new accounts * - * @param $account the $account to set + * @param int $account the $account to set * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract */ public function setAccount($account) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetValidatedNumbers.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetValidatedNumbers.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Invalidate.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Invalidate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendValidationKeyword.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendValidationKeyword.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Validate.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Validate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallStatus.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CallStatus.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCall.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCallSequenced.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCallSequenced.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TearDownCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: TearDownCall.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VoiceButlerAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: VoiceButlerAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/BaseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/BaseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/BaseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: BaseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ChangeQuotaPoolResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ChangeQuotaPoolResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetAccountBalanceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetAccountBalanceResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetQuotaInformationResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetQuotaInformationResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AddConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AddConferenceTemplateParticipantResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AddConferenceTemplateParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AddConferenceTemplateParticipantResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CCSResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CCSResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommitConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CommitConferenceResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceCallAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceCallAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceTemplateResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceTemplateResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceTemplateResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceListResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceListResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceListResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceListResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceStatusResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceStatusResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceStatusResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateListResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateListResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateListResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateListResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateParticipantResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateParticipantResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetParticipantStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetParticipantStatusResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetParticipantStatusResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetParticipantStatusResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetRunningConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetRunningConferenceResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetRunningConferenceResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetRunningConferenceResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewParticipantResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewParticipantResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateParticipantResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveParticipantResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateParticipantResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateParticipantResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/Exception.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CityType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CityType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GeoCoordinatesType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GeoCoordinatesType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IPAddressLocationType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: IPAddressLocationType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocateIPResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocateIPResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocateIPResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocateIPResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RegionType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RegionType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearchResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearchResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearchResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearchResponseType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResponseAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ResponseAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetTokensResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetTokensResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,16 +16,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SecurityTokenResponse.php 21189 2010-02-24 01:50:33Z stas $ + * @version $Id: SecurityTokenResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendFlashSMSResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendFlashSMSResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSMSResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSMSResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSmsAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSmsAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetValidatedNumbersResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetValidatedNumbersResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InvalidateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: InvalidateResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendValidationKeywordResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendValidationKeywordResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ValidateResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidatedNumber.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ValidatedNumber.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallStatus2Response.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CallStatus2Response.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CallStatusResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCallResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCallResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCallSequencedResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCallSequencedResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TearDownCallResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: TearDownCallResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php --- a/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VoiceButlerAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: VoiceButlerAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/SecurityTokenServer.php --- a/web/lib/Zend/Service/DeveloperGarden/SecurityTokenServer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/SecurityTokenServer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SecurityTokenServer.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SecurityTokenServer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php --- a/web/lib/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Cache.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/SendSms.php --- a/web/lib/Zend/Service/DeveloperGarden/SendSms.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/SendSms.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSms.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSms.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/SmsValidation.php --- a/web/lib/Zend/Service/DeveloperGarden/SmsValidation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/SmsValidation.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SmsValidation.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SmsValidation.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -74,7 +74,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/DeveloperGarden/VoiceCall.php --- a/web/lib/Zend/Service/DeveloperGarden/VoiceCall.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/DeveloperGarden/VoiceCall.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VoiceCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: VoiceCall.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -74,7 +74,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Abstract.php --- a/web/lib/Zend/Service/Ebay/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -24,7 +24,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Ebay_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Exception.php --- a/web/lib/Zend/Service/Ebay/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding.php --- a/web/lib/Zend/Service/Ebay/Finding.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Finding.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Abstract.php --- a/web/lib/Zend/Service/Ebay/Finding/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Ebay_Finding_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Aspect.php --- a/web/lib/Zend/Service/Ebay/Finding/Aspect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Aspect.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Aspect.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php --- a/web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Container.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php --- a/web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Value.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php --- a/web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Aspect/Set.php --- a/web/lib/Zend/Service/Ebay/Finding/Aspect/Set.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Aspect/Set.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Category.php --- a/web/lib/Zend/Service/Ebay/Finding/Category.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Category.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Category.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Category/Histogram.php --- a/web/lib/Zend/Service/Ebay/Finding/Category/Histogram.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Category/Histogram.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Histogram.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Category */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Category/Histogram/Container.php --- a/web/lib/Zend/Service/Ebay/Finding/Category/Histogram/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Category/Histogram/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Container.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Category/Histogram/Set.php --- a/web/lib/Zend/Service/Ebay/Finding/Category/Histogram/Set.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Category/Histogram/Set.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Error/Data.php --- a/web/lib/Zend/Service/Ebay/Finding/Error/Data.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Error/Data.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Data.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Error/Data/Set.php --- a/web/lib/Zend/Service/Ebay/Finding/Error/Data/Set.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Error/Data/Set.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Error/Message.php --- a/web/lib/Zend/Service/Ebay/Finding/Error/Message.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Error/Message.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Message.php 22802 2010-08-07 19:27:37Z ramon $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Exception.php --- a/web/lib/Zend/Service/Ebay/Finding/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/ListingInfo.php --- a/web/lib/Zend/Service/Ebay/Finding/ListingInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/ListingInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: ListingInfo.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/PaginationOutput.php --- a/web/lib/Zend/Service/Ebay/Finding/PaginationOutput.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/PaginationOutput.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: PaginationOutput.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Response/Abstract.php --- a/web/lib/Zend/Service/Ebay/Finding/Response/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Response/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Response/Histograms.php --- a/web/lib/Zend/Service/Ebay/Finding/Response/Histograms.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Response/Histograms.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Histograms.php 22804 2010-08-08 05:08:05Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Response_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Response/Items.php --- a/web/lib/Zend/Service/Ebay/Finding/Response/Items.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Response/Items.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Items.php 22804 2010-08-08 05:08:05Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Response_Histograms */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Response/Keywords.php --- a/web/lib/Zend/Service/Ebay/Finding/Response/Keywords.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Response/Keywords.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Keywords.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Response_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Search/Item.php --- a/web/lib/Zend/Service/Ebay/Finding/Search/Item.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Search/Item.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http:framework.zend.com/license/new-bsd New BSD License * @version $Id: Item.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http:framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Search/Item/Set.php --- a/web/lib/Zend/Service/Ebay/Finding/Search/Item/Set.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Search/Item/Set.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Search/Result.php --- a/web/lib/Zend/Service/Ebay/Finding/Search/Result.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Search/Result.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Result.php 22804 2010-08-08 05:08:05Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/SellerInfo.php --- a/web/lib/Zend/Service/Ebay/Finding/SellerInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/SellerInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: SellerInfo.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/SellingStatus.php --- a/web/lib/Zend/Service/Ebay/Finding/SellingStatus.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/SellingStatus.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: SellingStatus.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Set/Abstract.php --- a/web/lib/Zend/Service/Ebay/Finding/Set/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Set/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -24,7 +24,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Ebay_Finding_Set_Abstract implements SeekableIterator, Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/ShippingInfo.php --- a/web/lib/Zend/Service/Ebay/Finding/ShippingInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/ShippingInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: ShippingInfo.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Ebay/Finding/Storefront.php --- a/web/lib/Zend/Service/Ebay/Finding/Storefront.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Ebay/Finding/Storefront.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Storefront.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Exception.php --- a/web/lib/Zend/Service/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Flickr.php --- a/web/lib/Zend/Service/Flickr.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Flickr.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Flickr.php 22598 2010-07-16 21:24:14Z mikaelkael $ + * @version $Id: Flickr.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Flickr/Image.php --- a/web/lib/Zend/Service/Flickr/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Flickr/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_Image diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Flickr/Result.php --- a/web/lib/Zend/Service/Flickr/Result.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Flickr/Result.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Flickr/ResultSet.php --- a/web/lib/Zend/Service/Flickr/ResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Flickr/ResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_ResultSet implements SeekableIterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/LiveDocx.php --- a/web/lib/Zend/Service/LiveDocx.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/LiveDocx.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LiveDocx.php 23022 2010-10-05 15:30:55Z jonathan_maron $ + * @version $Id: LiveDocx.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @since LiveDocx 1.0 */ @@ -42,37 +42,37 @@ * @since LiveDocx 1.0 */ protected $_soapClient; - + /** * WSDL of LiveDocx web service * @var string * @since LiveDocx 1.0 */ protected $_wsdl; - + /** * Array of credentials (username and password) to log into backend server * @var array * @since LiveDocx 1.2 */ protected $_credentials; - + /** * Set to true, when session is logged into backend server * @var boolean * @since LiveDocx 1.2 */ protected $_loggedIn; - + /** * Constructor * * Optionally, pass an array of options (or Zend_Config object). - * - * If an option with the key 'soapClient' is provided, that value will be + * + * If an option with the key 'soapClient' is provided, that value will be * used to set the internal SOAP client used to connect to the LiveDocx * service. - * + * * Use 'soapClient' in the case that you have a dedicated or (locally * installed) licensed LiveDocx server. For example: * @@ -85,7 +85,7 @@ * ) * ); * {code} - * + * * Replace the URI of the WSDL in the constructor of Zend_Soap_Client with * that of your dedicated or licensed LiveDocx server. * @@ -100,54 +100,54 @@ * ) * ); * {code} - * + * * If you prefer to not pass the username and password through the * constructor, you can also call the following methods: - * + * * {code} * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge(); - * + * * $phpLiveDocx->setUsername('myUsername') * ->setPassword('myPassword'); * {/code} - * + * * Or, if you want to specify your own SoapClient: - * + * * {code} * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge(); - * + * * $phpLiveDocx->setUsername('myUsername') * ->setPassword('myPassword'); - * + * * $phpLiveDocx->setSoapClient( * new Zend_Soap_Client('https://api.example.com/path/mailmerge.asmx?WSDL') * ); - * {/code} + * {/code} * * @param array|Zend_Config $options * @return void * @throws Zend_Service_LiveDocx_Exception * @since LiveDocx 1.0 - */ + */ public function __construct($options = null) { $this->_credentials = array(); $this->_loggedIn = false; - + if ($options instanceof Zend_Config) { $options = $options->toArray(); } - + if (is_array($options)) { $this->setOptions($options); } } - + /** * Set options * One or more of username, password, soapClient - * - * @param $options + * + * @param array $options * @return Zend_Service_LiveDocx * @since LiveDocx 1.2 */ @@ -159,10 +159,10 @@ $this->$method($value); } } - + return $this; } - + /** * Clean up and log out of LiveDocx service * @@ -173,7 +173,7 @@ { return $this->logOut(); } - + /** * Init Soap client - connect to SOAP service * @@ -187,13 +187,13 @@ try { require_once 'Zend/Soap/Client.php'; $this->_soapClient = new Zend_Soap_Client(); - $this->_soapClient->setWsdl($endpoint); + $this->_soapClient->setWsdl($endpoint); } catch (Zend_Soap_Client_Exception $e) { require_once 'Zend/Service/LiveDocx/Exception.php'; throw new Zend_Service_LiveDocx_Exception('Cannot connect to LiveDocx service at ' . $endpoint, 0, $e); - } + } } - + /** * Get SOAP client * @@ -204,7 +204,7 @@ { return $this->_soapClient; } - + /** * Set SOAP client * @@ -237,18 +237,18 @@ 'Username has not been set. To set username specify the options array in the constructor or call setUsername($username) after instantiation' ); } - + if (null === $this->getPassword()) { require_once 'Zend/Service/LiveDocx/Exception.php'; throw new Zend_Service_LiveDocx_Exception( 'Password has not been set. To set password specify the options array in the constructor or call setPassword($password) after instantiation' ); } - + if (null === $this->getSoapClient()) { $this->_initSoapClient($this->_wsdl); - } - + } + try { $this->getSoapClient()->LogIn(array( 'username' => $this->getUsername(), @@ -260,9 +260,9 @@ throw new Zend_Service_LiveDocx_Exception( 'Cannot login into LiveDocx service - username and/or password are invalid', 0, $e ); - } + } } - + return $this->_loggedIn; } @@ -284,15 +284,15 @@ throw new Zend_Service_LiveDocx_Exception( 'Cannot log out of LiveDocx service', 0, $e ); - } + } } - + return $this->_loggedIn; } - + /** * Return true, if session is currently logged into the backend server - * + * * @return boolean * @since LiveDocx 1.2 */ @@ -300,10 +300,10 @@ { return $this->_loggedIn; } - + /** * Set username - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 */ @@ -312,13 +312,13 @@ $this->_credentials['username'] = $username; return $this; } - + /** * Set password - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 - */ + */ public function setPassword($password) { $this->_credentials['password'] = $password; @@ -327,19 +327,19 @@ /** * Set WSDL of LiveDocx web service - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 - */ - public function setWsdl($wsdl) + */ + public function setWsdl($wsdl) { $this->_wsdl = $wsdl; return $this; } - + /** * Return current username - * + * * @return string|null * @since LiveDocx 1.0 */ @@ -348,35 +348,35 @@ if (isset($this->_credentials['username'])) { return $this->_credentials['username']; } - + return null; } - + /** * Return current password - * + * * @return string|null * @since LiveDocx 1.0 - */ + */ public function getPassword() { if (isset($this->_credentials['password'])) { return $this->_credentials['password']; } - - return null; + + return null; } - + /** * Return WSDL of LiveDocx web service - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 - */ - public function getWsdl() + */ + public function getWsdl() { return $this->_wsdl; - } + } /** * Return the document format (extension) of a filename @@ -389,7 +389,7 @@ { return strtolower(substr(strrchr($filename, '.'), 1)); } - + /** * Return the current API version * @@ -400,7 +400,7 @@ { return self::VERSION; } - + /** * Compare the current API version with another version * @@ -412,4 +412,4 @@ { return version_compare($version, $this->getVersion()); } -} \ No newline at end of file +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/LiveDocx/Exception.php --- a/web/lib/Zend/Service/LiveDocx/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/LiveDocx/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @since LiveDocx 1.0 */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/LiveDocx/MailMerge.php --- a/web/lib/Zend/Service/LiveDocx/MailMerge.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/LiveDocx/MailMerge.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MailMerge.php 23022 2010-10-05 15:30:55Z jonathan_maron $ + * @version $Id: MailMerge.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Date **/ @@ -30,15 +30,15 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx { /** * URI of LiveDocx.MailMerge WSDL - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ //const WSDL = 'https://api.livedocx.com/1.2/mailmerge.asmx?WSDL'; const WSDL = 'https://api.livedocx.com/2.0/mailmerge.asmx?WSDL'; @@ -71,7 +71,7 @@ $this->_wsdl = self::WSDL; $this->_fieldValues = array(); $this->_blockFieldValues = array(); - + parent::__construct($options); } @@ -93,7 +93,7 @@ } $this->logIn(); - + try { $this->getSoapClient()->SetLocalTemplate(array( 'template' => base64_encode(file_get_contents($filename)), @@ -121,7 +121,7 @@ public function setRemoteTemplate($filename) { $this->logIn(); - + try { $this->getSoapClient()->SetRemoteTemplate(array( 'filename' => $filename, @@ -147,7 +147,7 @@ public function setFieldValues($values) { $this->logIn(); - + foreach ($values as $value) { if (is_array($value)) { $method = 'multiAssocArrayToArrayOfArrayOfString'; @@ -156,7 +156,7 @@ } break; } - + try { $this->getSoapClient()->SetFieldValues(array( 'fieldValues' => self::$method($values), @@ -184,7 +184,7 @@ public function setFieldValue($field, $value) { $this->_fieldValues[$field] = $value; - + return $this; } @@ -201,7 +201,7 @@ public function setBlockFieldValues($blockName, $blockFieldValues) { $this->logIn(); - + try { $this->getSoapClient()->SetBlockFieldValues(array( 'blockName' => $blockName, @@ -250,9 +250,9 @@ /** * Set a password to open to document - * + * * This method can only be used for PDF documents - * + * * @param string $password * @return Zend_Service_LiveDocx_MailMerge * @throws Zend_Service_LiveDocx_Exception @@ -261,7 +261,7 @@ public function setDocumentPassword($password) { $this->logIn(); - + try { $this->getSoapClient()->SetDocumentPassword(array( 'password' => $password @@ -272,18 +272,18 @@ 'Cannot set document password. This method can be used on PDF files only.', 0, $e ); } - - return $this; + + return $this; } - + /** * Set a master password for document and determine which security features * are accessible without using the master password. - * + * * As default, nothing is allowed. To allow a security setting, * explicatively set it using one of he DOCUMENT_ACCESS_PERMISSION_* class - * constants. - * + * constants. + * * {code} * $phpLiveDocx->setDocumentAccessPermissions( * array ( @@ -293,10 +293,10 @@ * 'myDocumentAccessPassword' * ); * {code} - * + * * This method can only be used for PDF documents - * - * @param array $permissions + * + * @param array $permissions * @param string $password * @return Zend_Service_LiveDocx_MailMerge * @throws Zend_Service_LiveDocx_Exception @@ -305,7 +305,7 @@ public function setDocumentAccessPermissions($permissions, $password) { $this->logIn(); - + try { $this->getSoapClient()->SetDocumentAccessPermissions(array( 'permissions' => $permissions, @@ -317,10 +317,10 @@ 'Cannot set document access permissions', 0, $e ); } - - return $this; - } - + + return $this; + } + /** * Merge assigned data with template to generate document * @@ -331,7 +331,7 @@ public function createDocument() { $this->logIn(); - + if (count($this->_fieldValues) > 0) { $this->setFieldValues($this->_fieldValues); } @@ -361,9 +361,9 @@ public function retrieveDocument($format) { $this->logIn(); - + $format = strtolower($format); - + try { $result = $this->getSoapClient()->RetrieveDocument(array( 'format' => $format, @@ -390,7 +390,7 @@ public function getMetafiles($fromPage, $toPage) { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetMetafiles(array( 'fromPage' => (integer) $fromPage, @@ -422,7 +422,7 @@ public function getAllMetafiles() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetAllMetafiles(); @@ -439,8 +439,8 @@ } return $ret; - } - + } + /** * Return graphical bitmap data for specified page range of created document * Return array contains bitmap data (binary) - array key is page number @@ -451,13 +451,13 @@ * @param string $format * @return array * @since LiveDocx 1.2 - */ + */ public function getBitmaps($fromPage, $toPage, $zoomFactor, $format) { $this->logIn(); - + $ret = array(); - + $result = $this->getSoapClient()->GetBitmaps(array( 'fromPage' => (integer) $fromPage, 'toPage' => (integer) $toPage, @@ -477,9 +477,9 @@ } } - return $ret; + return $ret; } - + /** * Return graphical bitmap data for all pages of created document * Return array contains bitmap data (binary) - array key is page number @@ -488,11 +488,11 @@ * @param string $format * @return array * @since LiveDocx 1.2 - */ + */ public function getAllBitmaps($zoomFactor, $format) { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetAllBitmaps(array( 'zoomFactor' => (integer) $zoomFactor, @@ -511,8 +511,8 @@ } } - return $ret; - } + return $ret; + } /** * Return all the fields in the template @@ -523,7 +523,7 @@ public function getFieldNames() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetFieldNames(); @@ -548,7 +548,7 @@ public function getBlockFieldNames($blockName) { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetBlockFieldNames(array( 'blockName' => $blockName @@ -574,7 +574,7 @@ public function getBlockNames() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetBlockNames(); @@ -600,7 +600,7 @@ public function uploadTemplate($filename) { $this->logIn(); - + try { $this->getSoapClient()->UploadTemplate(array( 'template' => base64_encode(file_get_contents($filename)), @@ -625,7 +625,7 @@ public function downloadTemplate($filename) { $this->logIn(); - + try { $result = $this->getSoapClient()->DownloadTemplate(array( 'filename' => basename($filename), @@ -651,7 +651,7 @@ public function deleteTemplate($filename) { $this->logIn(); - + $this->getSoapClient()->DeleteTemplate(array( 'filename' => basename($filename), )); @@ -661,12 +661,12 @@ * List all templates stored on LiveDocx service * * @return array - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ public function listTemplates() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->ListTemplates(); @@ -687,7 +687,7 @@ public function templateExists($filename) { $this->logIn(); - + $result = $this->getSoapClient()->TemplateExists(array( 'filename' => basename($filename), )); @@ -704,7 +704,7 @@ public function shareDocument() { $this->logIn(); - + $ret = null; $result = $this->getSoapClient()->ShareDocument(); @@ -724,7 +724,7 @@ public function listSharedDocuments() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->ListSharedDocuments(); @@ -747,7 +747,7 @@ public function deleteSharedDocument($filename) { $this->logIn(); - + $this->getSoapClient()->DeleteSharedDocument(array( 'filename' => basename($filename), )); @@ -764,7 +764,7 @@ public function downloadSharedDocument($filename) { $this->logIn(); - + try { $result = $this->getSoapClient()->DownloadSharedDocument(array( 'filename' => basename($filename), @@ -789,11 +789,11 @@ public function sharedDocumentExists($filename) { $this->logIn(); - + $ret = false; $sharedDocuments = $this->listSharedDocuments(); foreach ($sharedDocuments as $shareDocument) { - if (isset($shareDocument['filename']) + if (isset($shareDocument['filename']) && (basename($filename) === $shareDocument['filename']) ) { $ret = true; @@ -813,7 +813,7 @@ public function getTemplateFormats() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetTemplateFormats(); @@ -834,7 +834,7 @@ public function getDocumentFormats() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetDocumentFormats(); @@ -845,7 +845,7 @@ return $ret; } - + /** * Return the names of all fonts that are installed on backend server * @@ -855,7 +855,7 @@ public function getFontNames() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetFontNames(); @@ -864,8 +864,8 @@ } return $ret; - } - + } + /** * Return supported document access options * @@ -875,7 +875,7 @@ public function getDocumentAccessOptions() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetDocumentAccessOptions(); @@ -947,7 +947,7 @@ trigger_error($errorMessage, E_USER_NOTICE); */ - + return $this->$replacement(); } @@ -1062,12 +1062,12 @@ * * @param array $list * @return array - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ protected function _backendListArrayToMultiAssocArray($list) { $this->logIn(); - + $ret = array(); if (isset($list->ArrayOfString)) { foreach ($list->ArrayOfString as $a) { @@ -1108,7 +1108,7 @@ { $arrayKeys = array_keys($assoc); $arrayValues = array_values($assoc); - + return array($arrayKeys, $arrayValues); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Nirvanix.php --- a/web/lib/Zend/Service/Nirvanix.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Nirvanix.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nirvanix.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nirvanix.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Nirvanix/Exception.php --- a/web/lib/Zend/Service/Nirvanix/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Nirvanix/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Nirvanix/Namespace/Base.php --- a/web/lib/Zend/Service/Nirvanix/Namespace/Base.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Nirvanix/Namespace/Base.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Namespace_Base @@ -76,7 +76,7 @@ /** * Class constructor. * - * @param $options array Options and dependency injection + * @param array $options Options and dependency injection */ public function __construct($options = array()) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Nirvanix/Namespace/Imfs.php --- a/web/lib/Zend/Service/Nirvanix/Namespace/Imfs.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Nirvanix/Namespace/Imfs.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imfs.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imfs.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespace_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Nirvanix/Response.php --- a/web/lib/Zend/Service/Nirvanix/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Nirvanix/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Response diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Abstract.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,387 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service + * @subpackage Rackspace + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Http/Client.php'; + +abstract class Zend_Service_Rackspace_Abstract +{ + const VERSION = 'v1.0'; + const US_AUTH_URL = 'https://auth.api.rackspacecloud.com'; + const UK_AUTH_URL = 'https://lon.auth.api.rackspacecloud.com'; + const API_FORMAT = 'json'; + const USER_AGENT = 'Zend_Service_Rackspace'; + const STORAGE_URL = "X-Storage-Url"; + const AUTHTOKEN = "X-Auth-Token"; + const AUTHUSER_HEADER = "X-Auth-User"; + const AUTHKEY_HEADER = "X-Auth-Key"; + const AUTHUSER_HEADER_LEGACY = "X-Storage-User"; + const AUTHKEY_HEADER_LEGACY = "X-Storage-Pass"; + const AUTHTOKEN_LEGACY = "X-Storage-Token"; + const CDNM_URL = "X-CDN-Management-Url"; + const MANAGEMENT_URL = "X-Server-Management-Url"; + /** + * Rackspace Key + * + * @var string + */ + protected $key; + /** + * Rackspace account name + * + * @var string + */ + protected $user; + /** + * Token of authentication + * + * @var string + */ + protected $token; + /** + * Authentication URL + * + * @var string + */ + protected $authUrl; + /** + * @var Zend_Http_Client + */ + protected $httpClient; + /** + * Error Msg + * + * @var string + */ + protected $errorMsg; + /** + * HTTP error code + * + * @var string + */ + protected $errorCode; + /** + * Storage URL + * + * @var string + */ + protected $storageUrl; + /** + * CDN URL + * + * @var string + */ + protected $cdnUrl; + /** + * Server management URL + * + * @var string + */ + protected $managementUrl; + /** + * Do we use ServiceNet? + * + * @var boolean + */ + protected $useServiceNet = false; + /** + * Constructor + * + * You must pass the account and the Rackspace authentication key. + * Optional: the authentication url (default is US) + * + * @param string $user + * @param string $key + * @param string $authUrl + */ + public function __construct($user, $key, $authUrl=self::US_AUTH_URL) + { + if (!isset($user)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("The user cannot be empty"); + } + if (!isset($key)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("The key cannot be empty"); + } + if (!in_array($authUrl, array(self::US_AUTH_URL, self::UK_AUTH_URL))) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("The authentication URL should be valid"); + } + $this->setUser($user); + $this->setKey($key); + $this->setAuthUrl($authUrl); + } + /** + * Get User account + * + * @return string + */ + public function getUser() + { + return $this->user; + } + /** + * Get user key + * + * @return string + */ + public function getKey() + { + return $this->key; + } + /** + * Get authentication URL + * + * @return string + */ + public function getAuthUrl() + { + return $this->authUrl; + } + /** + * Get the storage URL + * + * @return string|boolean + */ + public function getStorageUrl() + { + if (empty($this->storageUrl)) { + if (!$this->authenticate()) { + return false; + } + } + return $this->storageUrl; + } + /** + * Get the CDN URL + * + * @return string|boolean + */ + public function getCdnUrl() + { + if (empty($this->cdnUrl)) { + if (!$this->authenticate()) { + return false; + } + } + return $this->cdnUrl; + } + /** + * Get the management server URL + * + * @return string|boolean + */ + public function getManagementUrl() + { + if (empty($this->managementUrl)) { + if (!$this->authenticate()) { + return false; + } + } + return $this->managementUrl; + } + /** + * Set the user account + * + * @param string $user + * @return void + */ + public function setUser($user) + { + if (!empty($user)) { + $this->user = $user; + } + } + /** + * Set the authentication key + * + * @param string $key + * @return void + */ + public function setKey($key) + { + if (!empty($key)) { + $this->key = $key; + } + } + /** + * Set the Authentication URL + * + * @param string $url + * @return void + */ + public function setAuthUrl($url) + { + if (!empty($url) && in_array($url, array(self::US_AUTH_URL, self::UK_AUTH_URL))) { + $this->authUrl = $url; + } else { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("The authentication URL is not valid"); + } + } + + /** + * Sets whether to use ServiceNet + * + * ServiceNet is Rackspace's internal network. Bandwidth on ServiceNet is + * not charged. + * + * @param boolean $useServiceNet + */ + public function setServiceNet($useServiceNet = true) + { + $this->useServiceNet = $useServiceNet; + return $this; + } + + /** + * Get whether we're using ServiceNet + * + * @return boolean + */ + public function getServiceNet() + { + return $this->useServiceNet; + } + + /** + * Get the authentication token + * + * @return string + */ + public function getToken() + { + if (empty($this->token)) { + if (!$this->authenticate()) { + return false; + } + } + return $this->token; + } + /** + * Get the error msg of the last HTTP call + * + * @return string + */ + public function getErrorMsg() + { + return $this->errorMsg; + } + /** + * Get the error code of the last HTTP call + * + * @return strig + */ + public function getErrorCode() + { + return $this->errorCode; + } + /** + * get the HttpClient instance + * + * @return Zend_Http_Client + */ + public function getHttpClient() + { + if (empty($this->httpClient)) { + $this->httpClient = new Zend_Http_Client(); + } + return $this->httpClient; + } + /** + * Return true is the last call was successful + * + * @return boolean + */ + public function isSuccessful() + { + return ($this->errorMsg==''); + } + /** + * HTTP call + * + * @param string $url + * @param string $method + * @param array $headers + * @param array $get + * @param string $body + * @return Zend_Http_Response + */ + protected function httpCall($url,$method,$headers=array(),$data=array(),$body=null) + { + $client = $this->getHttpClient(); + $client->resetParameters(true); + if (empty($headers[self::AUTHUSER_HEADER])) { + $headers[self::AUTHTOKEN]= $this->getToken(); + } + $client->setMethod($method); + if (empty($data['format'])) { + $data['format']= self::API_FORMAT; + } + $client->setParameterGet($data); + if (!empty($body)) { + $client->setRawData($body); + if (!isset($headers['Content-Type'])) { + $headers['Content-Type']= 'application/json'; + } + } + $client->setHeaders($headers); + $client->setUri($url); + $this->errorMsg=''; + $this->errorCode=''; + return $client->request(); + } + /** + * Authentication + * + * @return boolean + */ + public function authenticate() + { + if (empty($this->user)) { + /** + * @see Zend_Service_Rackspace_Exception + */ + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("User has not been set"); + } + + $headers = array ( + self::AUTHUSER_HEADER => $this->user, + self::AUTHKEY_HEADER => $this->key + ); + $result = $this->httpCall($this->authUrl.'/'.self::VERSION,'GET', $headers); + if ($result->getStatus()==204) { + $this->token = $result->getHeader(self::AUTHTOKEN); + $this->cdnUrl = $result->getHeader(self::CDNM_URL); + $this->managementUrl = $result->getHeader(self::MANAGEMENT_URL); + $storageUrl = $result->getHeader(self::STORAGE_URL); + if ($this->useServiceNet) { + $storageUrl = preg_replace('|(.*)://([^/]*)(.*)|', '$1://snet-$2$3', $storageUrl); + } + $this->storageUrl = $storageUrl; + return true; + } + $this->errorMsg = $result->getBody(); + $this->errorCode = $result->getStatus(); + return false; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,36 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service + * @subpackage Rackspace + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + */ + +/** + * @see Zend_Service_Exception + */ +require_once 'Zend/Service/Exception.php'; + +/** + * @category Zend + * @package Zend_Service + * @subpackage Rackspace + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Exception extends Zend_Service_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Files.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Files.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,691 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service + * @subpackage Rackspace + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Abstract.php'; +require_once 'Zend/Service/Rackspace/Files/ContainerList.php'; +require_once 'Zend/Service/Rackspace/Files/ObjectList.php'; +require_once 'Zend/Service/Rackspace/Files/Container.php'; +require_once 'Zend/Service/Rackspace/Files/Object.php'; + +class Zend_Service_Rackspace_Files extends Zend_Service_Rackspace_Abstract +{ + const ERROR_CONTAINER_NOT_EMPTY = 'The container is not empty, I cannot delete it.'; + const ERROR_CONTAINER_NOT_FOUND = 'The container was not found.'; + const ERROR_OBJECT_NOT_FOUND = 'The object was not found.'; + const ERROR_OBJECT_MISSING_PARAM = 'Missing Content-Length or Content-Type header in the request'; + const ERROR_OBJECT_CHECKSUM = 'Checksum of the file content failed'; + const ERROR_CONTAINER_EXIST = 'The container already exists'; + const ERROR_PARAM_NO_NAME_CONTAINER = 'You must specify the container name'; + const ERROR_PARAM_NO_NAME_OBJECT = 'You must specify the object name'; + const ERROR_PARAM_NO_CONTENT = 'You must specify the content of the object'; + const ERROR_PARAM_NO_NAME_SOURCE_CONTAINER = 'You must specify the source container name'; + const ERROR_PARAM_NO_NAME_SOURCE_OBJECT = 'You must specify the source object name'; + const ERROR_PARAM_NO_NAME_DEST_CONTAINER = 'You must specify the destination container name'; + const ERROR_PARAM_NO_NAME_DEST_OBJECT = 'You must specify the destination object name'; + const ERROR_PARAM_NO_METADATA = 'You must specify the metadata array'; + const ERROR_CDN_TTL_OUT_OF_RANGE = 'TTL must be a number in seconds, min is 900 sec and maximum is 1577836800 (50 years)'; + const ERROR_PARAM_UPDATE_CDN = 'You must specify at least one the parameters: ttl, cdn_enabled or log_retention'; + const HEADER_CONTENT_TYPE = 'Content-Type'; + const HEADER_HASH = 'Etag'; + const HEADER_LAST_MODIFIED = 'Last-Modified'; + const HEADER_CONTENT_LENGTH = 'Content-Length'; + const HEADER_COPY_FROM = 'X-Copy-From'; + const METADATA_OBJECT_HEADER = "X-Object-Meta-"; + const METADATA_CONTAINER_HEADER = "X-Container-Meta-"; + const CDN_URI = "X-CDN-URI"; + const CDN_SSL_URI = "X-CDN-SSL-URI"; + const CDN_ENABLED = "X-CDN-Enabled"; + const CDN_LOG_RETENTION = "X-Log-Retention"; + const CDN_ACL_USER_AGENT = "X-User-Agent-ACL"; + const CDN_ACL_REFERRER = "X-Referrer-ACL"; + const CDN_TTL = "X-TTL"; + const CDN_TTL_MIN = 900; + const CDN_TTL_MAX = 1577836800; + const CDN_EMAIL = "X-Purge-Email"; + const ACCOUNT_CONTAINER_COUNT = "X-Account-Container-Count"; + const ACCOUNT_BYTES_USED = "X-Account-Bytes-Used"; + const ACCOUNT_OBJ_COUNT = "X-Account-Object-Count"; + const CONTAINER_OBJ_COUNT = "X-Container-Object-Count"; + const CONTAINER_BYTES_USE = "X-Container-Bytes-Used"; + const MANIFEST_OBJECT_HEADER = "X-Object-Manifest"; + + /** + * Return the total count of containers + * + * @return integer + */ + public function getCountContainers() + { + $data= $this->getInfoAccount(); + return $data['tot_containers']; + } + /** + * Return the size in bytes of all the containers + * + * @return integer + */ + public function getSizeContainers() + { + $data= $this->getInfoAccount(); + return $data['size_containers']; + } + /** + * Return the count of objects contained in all the containers + * + * @return integer + */ + public function getCountObjects() + { + $data= $this->getInfoAccount(); + return $data['tot_objects']; + } + /** + * Get all the containers + * + * @param array $options + * @return Zend_Service_Rackspace_Files_ContainerList|boolean + */ + public function getContainers($options=array()) + { + $result= $this->httpCall($this->getStorageUrl(),'GET',null,$options); + if ($result->isSuccessful()) { + return new Zend_Service_Rackspace_Files_ContainerList($this,json_decode($result->getBody(),true)); + } + return false; + } + /** + * Get all the CDN containers + * + * @param array $options + * @return array|boolean + */ + public function getCdnContainers($options=array()) + { + $options['enabled_only']= true; + $result= $this->httpCall($this->getCdnUrl(),'GET',null,$options); + if ($result->isSuccessful()) { + return new Zend_Service_Rackspace_Files_ContainerList($this,json_decode($result->getBody(),true)); + } + return false; + } + /** + * Get the metadata information of the accounts: + * - total count containers + * - size in bytes of all the containers + * - total objects in all the containers + * + * @return array|boolean + */ + public function getInfoAccount() + { + $result= $this->httpCall($this->getStorageUrl(),'HEAD'); + if ($result->isSuccessful()) { + $output= array( + 'tot_containers' => $result->getHeader(self::ACCOUNT_CONTAINER_COUNT), + 'size_containers' => $result->getHeader(self::ACCOUNT_BYTES_USED), + 'tot_objects' => $result->getHeader(self::ACCOUNT_OBJ_COUNT) + ); + return $output; + } + return false; + } + /** + * Get all the objects of a container + * + * @param string $container + * @param array $options + * @return Zend_Service_Rackspace_Files_ObjectList|boolean + */ + public function getObjects($container,$options=array()) + { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'GET',null,$options); + if ($result->isSuccessful()) { + return new Zend_Service_Rackspace_Files_ObjectList($this,json_decode($result->getBody(),true),$container); + } + return false; + } + /** + * Create a container + * + * @param string $container + * @param array $metadata + * @return Zend_Service_Rackspace_Files_Container|boolean + */ + public function createContainer($container,$metadata=array()) + { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + $headers=array(); + if (!empty($metadata)) { + foreach ($metadata as $key => $value) { + $headers[self::METADATA_CONTAINER_HEADER.rawurlencode(strtolower($key))]= rawurlencode($value); + } + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'PUT',$headers); + $status= $result->getStatus(); + switch ($status) { + case '201': // break intentionally omitted + $data= array( + 'name' => $container + ); + return new Zend_Service_Rackspace_Files_Container($this,$data); + case '202': + $this->errorMsg= self::ERROR_CONTAINER_EXIST; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Delete a container (only if it's empty) + * + * @param sting $container + * @return boolean + */ + public function deleteContainer($container) + { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'DELETE'); + $status= $result->getStatus(); + switch ($status) { + case '204': // break intentionally omitted + return true; + case '409': + $this->errorMsg= self::ERROR_CONTAINER_NOT_EMPTY; + break; + case '404': + $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the metadata of a container + * + * @param string $container + * @return array|boolean + */ + public function getMetadataContainer($container) + { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'HEAD'); + $status= $result->getStatus(); + switch ($status) { + case '204': // break intentionally omitted + $headers= $result->getHeaders(); + $count= strlen(self::METADATA_CONTAINER_HEADER); + // Zend_Http_Response alters header name in array key, so match our header to what will be in the headers array + $headerName = ucwords(strtolower(self::METADATA_CONTAINER_HEADER)); + $metadata= array(); + foreach ($headers as $type => $value) { + if (strpos($type,$headerName)!==false) { + $metadata[strtolower(substr($type, $count))]= $value; + } + } + $data= array ( + 'name' => $container, + 'count' => $result->getHeader(self::CONTAINER_OBJ_COUNT), + 'bytes' => $result->getHeader(self::CONTAINER_BYTES_USE), + 'metadata' => $metadata + ); + return $data; + case '404': + $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get a container + * + * @param string $container + * @return Container|boolean + */ + public function getContainer($container) { + $result= $this->getMetadataContainer($container); + if (!empty($result)) { + return new Zend_Service_Rackspace_Files_Container($this,$result); + } + return false; + } + /** + * Get an object in a container + * + * @param string $container + * @param string $object + * @param array $headers + * @return Zend_Service_Rackspace_Files_Object|boolean + */ + public function getObject($container,$object,$headers=array()) + { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + if (empty($object)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT); + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'GET',$headers); + $status= $result->getStatus(); + switch ($status) { + case '200': // break intentionally omitted + $data= array( + 'name' => $object, + 'container' => $container, + 'hash' => $result->getHeader(self::HEADER_HASH), + 'bytes' => $result->getHeader(self::HEADER_CONTENT_LENGTH), + 'last_modified' => $result->getHeader(self::HEADER_LAST_MODIFIED), + 'content_type' => $result->getHeader(self::HEADER_CONTENT_TYPE), + 'content' => $result->getBody() + ); + return new Zend_Service_Rackspace_Files_Object($this,$data); + case '404': + $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Store a file in a container + * + * @param string $container + * @param string $object + * @param string $content + * @param array $metadata + * @param string $content_type + * + * @return boolean + */ + public function storeObject($container,$object,$content,$metadata=array(),$content_type=null) { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + if (empty($object)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT); + } + if (empty($content)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_CONTENT); + } + if (!empty($content_type)) { + $headers[self::HEADER_CONTENT_TYPE]= $content_type; + } + if (!empty($metadata) && is_array($metadata)) { + foreach ($metadata as $key => $value) { + $headers[self::METADATA_OBJECT_HEADER.$key]= $value; + } + } + $headers[self::HEADER_HASH]= md5($content); + $headers[self::HEADER_CONTENT_LENGTH]= strlen($content); + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'PUT',$headers,null,$content); + $status= $result->getStatus(); + switch ($status) { + case '201': // break intentionally omitted + return true; + case '412': + $this->errorMsg= self::ERROR_OBJECT_MISSING_PARAM; + break; + case '422': + $this->errorMsg= self::ERROR_OBJECT_CHECKSUM; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Delete an object in a container + * + * @param string $container + * @param string $object + * @return boolean + */ + public function deleteObject($container,$object) { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + if (empty($object)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT); + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'DELETE'); + $status= $result->getStatus(); + switch ($status) { + case '204': // break intentionally omitted + return true; + case '404': + $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Copy an object from a container to another + * + * @param string $container_source + * @param string $obj_source + * @param string $container_dest + * @param string $obj_dest + * @param array $metadata + * @param string $content_type + * @return boolean + */ + public function copyObject($container_source,$obj_source,$container_dest,$obj_dest,$metadata=array(),$content_type=null) { + if (empty($container_source)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_SOURCE_CONTAINER); + } + if (empty($obj_source)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_SOURCE_OBJECT); + } + if (empty($container_dest)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_DEST_CONTAINER); + } + if (empty($obj_dest)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_DEST_OBJECT); + } + $headers= array( + self::HEADER_COPY_FROM => '/'.rawurlencode($container_source).'/'.rawurlencode($obj_source), + self::HEADER_CONTENT_LENGTH => 0 + ); + if (!empty($content_type)) { + $headers[self::HEADER_CONTENT_TYPE]= $content_type; + } + if (!empty($metadata) && is_array($metadata)) { + foreach ($metadata as $key => $value) { + $headers[self::METADATA_OBJECT_HEADER.$key]= $value; + } + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container_dest).'/'.rawurlencode($obj_dest),'PUT',$headers); + $status= $result->getStatus(); + switch ($status) { + case '201': // break intentionally omitted + return true; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the metadata of an object + * + * @param string $container + * @param string $object + * @return array|boolean + */ + public function getMetadataObject($container,$object) { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + if (empty($object)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT); + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'HEAD'); + $status= $result->getStatus(); + switch ($status) { + case '200': // break intentionally omitted + $headers= $result->getHeaders(); + $count= strlen(self::METADATA_OBJECT_HEADER); + // Zend_Http_Response alters header name in array key, so match our header to what will be in the headers array + $headerName = ucwords(strtolower(self::METADATA_OBJECT_HEADER)); + $metadata= array(); + foreach ($headers as $type => $value) { + if (strpos($type,$headerName)!==false) { + $metadata[strtolower(substr($type, $count))]= $value; + } + } + $data= array ( + 'name' => $object, + 'container' => $container, + 'hash' => $result->getHeader(self::HEADER_HASH), + 'bytes' => $result->getHeader(self::HEADER_CONTENT_LENGTH), + 'content_type' => $result->getHeader(self::HEADER_CONTENT_TYPE), + 'last_modified' => $result->getHeader(self::HEADER_LAST_MODIFIED), + 'metadata' => $metadata + ); + return $data; + case '404': + $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Set the metadata of a object in a container + * The old metadata values are replaced with the new one + * + * @param string $container + * @param string $object + * @param array $metadata + * @return boolean + */ + public function setMetadataObject($container,$object,$metadata) + { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + if (empty($object)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT); + } + if (empty($metadata) || !is_array($metadata)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT); + } + $headers=array(); + foreach ($metadata as $key => $value) { + $headers[self::METADATA_OBJECT_HEADER.$key]= $value; + } + $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'POST',$headers); + $status= $result->getStatus(); + switch ($status) { + case '202': // break intentionally omitted + return true; + case '404': + $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Enable the CDN for a container + * + * @param string $container + * @param integer $ttl + * @return array|boolean + */ + public function enableCdnContainer ($container,$ttl=self::CDN_TTL_MIN) { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + $headers=array(); + if (is_numeric($ttl) && ($ttl>=self::CDN_TTL_MIN) && ($ttl<=self::CDN_TTL_MAX)) { + $headers[self::CDN_TTL]= $ttl; + } else { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_CDN_TTL_OUT_OF_RANGE); + } + $result= $this->httpCall($this->getCdnUrl().'/'.rawurlencode($container),'PUT',$headers); + $status= $result->getStatus(); + switch ($status) { + case '201': + case '202': // break intentionally omitted + $data= array ( + 'cdn_uri' => $result->getHeader(self::CDN_URI), + 'cdn_uri_ssl' => $result->getHeader(self::CDN_SSL_URI) + ); + return $data; + case '404': + $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Update the attribute of a CDN container + * + * @param string $container + * @param integer $ttl + * @param boolean $cdn_enabled + * @param boolean $log + * @return boolean + */ + public function updateCdnContainer($container,$ttl=null,$cdn_enabled=null,$log=null) + { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + if (empty($ttl) && (!isset($cdn_enabled)) && (!isset($log))) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_UPDATE_CDN); + } + $headers=array(); + if (isset($ttl)) { + if (is_numeric($ttl) && ($ttl>=self::CDN_TTL_MIN) && ($ttl<=self::CDN_TTL_MAX)) { + $headers[self::CDN_TTL]= $ttl; + } else { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_CDN_TTL_OUT_OF_RANGE); + } + } + if (isset($cdn_enabled)) { + if ($cdn_enabled===true) { + $headers[self::CDN_ENABLED]= 'true'; + } else { + $headers[self::CDN_ENABLED]= 'false'; + } + } + if (isset($log)) { + if ($log===true) { + $headers[self::CDN_LOG_RETENTION]= 'true'; + } else { + $headers[self::CDN_LOG_RETENTION]= 'false'; + } + } + $result= $this->httpCall($this->getCdnUrl().'/'.rawurlencode($container),'POST',$headers); + $status= $result->getStatus(); + switch ($status) { + case '200': + case '202': // break intentionally omitted + return true; + case '404': + $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the information of a Cdn container + * + * @param string $container + * @return array|boolean + */ + public function getInfoCdnContainer($container) { + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER); + } + $result= $this->httpCall($this->getCdnUrl().'/'.rawurlencode($container),'HEAD'); + $status= $result->getStatus(); + switch ($status) { + case '204': // break intentionally omitted + $data= array ( + 'ttl' => $result->getHeader(self::CDN_TTL), + 'cdn_uri' => $result->getHeader(self::CDN_URI), + 'cdn_uri_ssl' => $result->getHeader(self::CDN_SSL_URI) + ); + $data['cdn_enabled']= (strtolower($result->getHeader(self::CDN_ENABLED))!=='false'); + $data['log_retention']= (strtolower($result->getHeader(self::CDN_LOG_RETENTION))!=='false'); + return $data; + case '404': + $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Files/Container.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Files/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,329 @@ +<?php + +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Files.php'; + +class Zend_Service_Rackspace_Files_Container +{ + const ERROR_PARAM_FILE_CONSTRUCT = 'The Zend_Service_Rackspace_Files passed in construction is not valid'; + const ERROR_PARAM_ARRAY_CONSTRUCT = 'The array passed in construction is not valid'; + const ERROR_PARAM_NO_NAME = 'The container name is empty'; + /** + * @var string + */ + protected $name; + /** + * Construct + * + * @param Zend_Service_Rackspace_Files $service + * @param string $name + */ + public function __construct($service, $data) + { + if (!($service instanceof Zend_Service_Rackspace_Files)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception(self::ERROR_PARAM_FILE_CONSTRUCT); + } + if (!is_array($data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception(self::ERROR_PARAM_ARRAY_CONSTRUCT); + } + if (!array_key_exists('name', $data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception(self::ERROR_PARAM_NO_NAME); + } + $this->service = $service; + $this->name = $data['name']; + } + /** + * Get the name of the container + * + * @return string + */ + public function getName() + { + return $this->name; + } + /** + * Get the size in bytes of the container + * + * @return integer|boolean + */ + public function getSize() + { + $data = $this->getInfo(); + if (isset($data['bytes'])) { + return $data['bytes']; + } + return false; + } + /** + * Get the total count of objects in the container + * + * @return integer|boolean + */ + public function getObjectCount() + { + $data = $this->getInfo(); + if (isset($data['count'])) { + return $data['count']; + } + return false; + } + /** + * Return true if the container is CDN enabled + * + * @return boolean + */ + public function isCdnEnabled() + { + $data = $this->getCdnInfo(); + if (isset($data['cdn_enabled'])) { + return $data['cdn_enabled']; + } + return false; + } + /** + * Get the TTL of the CDN + * + * @return integer|boolean + */ + public function getCdnTtl() + { + $data = $this->getCdnInfo(); + if (!isset($data['ttl'])) { + return $data['ttl']; + } + return false; + } + /** + * Return true if the log retention is enabled for the CDN + * + * @return boolean + */ + public function isCdnLogEnabled() + { + $data = $this->getCdnInfo(); + if (!isset($data['log_retention'])) { + return $data['log_retention']; + } + return false; + } + /** + * Get the CDN URI + * + * @return string|boolean + */ + public function getCdnUri() + { + $data = $this->getCdnInfo(); + if (!isset($data['cdn_uri'])) { + return $data['cdn_uri']; + } + return false; + } + /** + * Get the CDN URI SSL + * + * @return string|boolean + */ + public function getCdnUriSsl() + { + $data = $this->getCdnInfo(); + if (!isset($data['cdn_uri_ssl'])) { + return $data['cdn_uri_ssl']; + } + return false; + } + /** + * Get the metadata of the container + * + * If $key is empty return the array of metadata + * + * @param string $key + * @return array|string|boolean + */ + public function getMetadata($key=null) + { + $result = $this->service->getMetadataContainer($this->getName()); + if (!empty($result) && is_array($result)) { + if (empty($key)) { + return $result['metadata']; + } else { + if (isset ($result['metadata'][$key])) { + return $result['metadata'][$key]; + } + } + } + return false; + } + /** + * Get the information of the container (total of objects, total size) + * + * @return array|boolean + */ + public function getInfo() + { + $result = $this->service->getMetadataContainer($this->getName()); + if (!empty($result) && is_array($result)) { + return $result; + } + return false; + } + /** + * Get all the object of the container + * + * @return Zend_Service_Rackspace_Files_ObjectList + */ + public function getObjects() + { + return $this->service->getObjects($this->getName()); + } + /** + * Get an object of the container + * + * @param string $name + * @param array $headers + * @return Zend_Service_Rackspace_Files_Object|boolean + */ + public function getObject($name, $headers=array()) + { + return $this->service->getObject($this->getName(), $name, $headers); + } + /** + * Add an object in the container + * + * @param string $name + * @param string $file the content of the object + * @param array $metadata + * @return boolen + */ + public function addObject($name, $file, $metadata=array()) + { + return $this->service->storeObject($this->getName(), $name, $file, $metadata); + } + /** + * Delete an object in the container + * + * @param string $obj + * @return boolean + */ + public function deleteObject($obj) + { + return $this->service->deleteObject($this->getName(), $obj); + } + /** + * Copy an object to another container + * + * @param string $obj_source + * @param string $container_dest + * @param string $obj_dest + * @param array $metadata + * @param string $content_type + * @return boolean + */ + public function copyObject($obj_source, $container_dest, $obj_dest, $metadata=array(), $content_type=null) + { + return $this->service->copyObject($this->getName(), $obj_source, $container_dest, $obj_dest, $metadata, $content_type); + } + /** + * Get the metadata of an object in the container + * + * @param string $object + * @return array + */ + public function getMetadataObject($object) + { + return $this->service->getMetadataObject($this->getName(),$object); + } + /** + * Set the metadata of an object in the container + * + * @param string $object + * @param array $metadata + * @return boolean + */ + public function setMetadataObject($object,$metadata=array()) + { + return $this->service->setMetadataObject($this->getName(),$object,$metadata); + } + /** + * Enable the CDN for the container + * + * @param integer $ttl + * @return array|boolean + */ + public function enableCdn($ttl=Zend_Service_Rackspace_Files::CDN_TTL_MIN) + { + return $this->service->enableCdnContainer($this->getName(),$ttl); + } + /** + * Disable the CDN for the container + * + * @return boolean + */ + public function disableCdn() + { + $result = $this->service->updateCdnContainer($this->getName(),null,false); + return ($result!==false); + } + /** + * Change the TTL for the CDN container + * + * @param integer $ttl + * @return boolean + */ + public function changeTtlCdn($ttl) + { + $result = $this->service->updateCdnContainer($this->getName(),$ttl); + return ($result!==false); + } + /** + * Enable the log retention for the CDN + * + * @return boolean + */ + public function enableLogCdn() + { + $result = $this->service->updateCdnContainer($this->getName(),null,null,true); + return ($result!==false); + } + /** + * Disable the log retention for the CDN + * + * @return boolean + */ + public function disableLogCdn() + { + $result = $this->service->updateCdnContainer($this->getName(),null,null,false); + return ($result!==false); + } + /** + * Get the CDN information + * + * @return array|boolean + */ + public function getCdnInfo() + { + return $this->service->getInfoCdnContainer($this->getName()); + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Files/ContainerList.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Files/ContainerList.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,221 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Files/Container.php'; +require_once 'Zend/Service/Rackspace/Files.php'; + +/** + * List of servers retrived from the Rackspace web service + * + * @uses ArrayAccess + * @uses Countable + * @uses Iterator + * @uses OutOfBoundsException + * @uses Zend_Service_Rackspace_Files_Container + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Files_ContainerList implements Countable, Iterator, ArrayAccess +{ + /** + * @var array Array of Zend_Service_Rackspace_Files_Container + */ + protected $objects = array(); + /** + * @var int Iterator key + */ + protected $iteratorKey = 0; + /** + * @var RackspaceFiles + */ + protected $service; + /** + * Constructor + * + * @param array $list + * @return boolean + */ + public function __construct($service,$list = array()) + { + if (!($service instanceof Zend_Service_Rackspace_Files ) || !is_array($list)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass a Zend_Service_Rackspace_Files_Exception object and an array"); + } + $this->service= $service; + $this->_constructFromArray($list); + } + /** + * Transforms the Array to array of container + * + * @param array $list + * @return void + */ + private function _constructFromArray(array $list) + { + foreach ($list as $container) { + $this->_addObject(new Zend_Service_Rackspace_Files_Container($this->service,$container)); + } + } + /** + * Add an object + * + * @param Zend_Service_Rackspace_Files_Container $obj + * @return Zend_Service_Rackspace_Files_ContainerList + */ + protected function _addObject (Zend_Service_Rackspace_Files_Container $obj) + { + $this->objects[] = $obj; + return $this; + } + /** + * Return number of servers + * + * Implement Countable::count() + * + * @return int + */ + public function count() + { + return count($this->objects); + } + /** + * Return the current element + * + * Implement Iterator::current() + * + * @return Zend_Service_Rackspace_Files_Container + */ + public function current() + { + return $this->objects[$this->iteratorKey]; + } + /** + * Return the key of the current element + * + * Implement Iterator::key() + * + * @return int + */ + public function key() + { + return $this->iteratorKey; + } + /** + * Move forward to next element + * + * Implement Iterator::next() + * + * @return void + */ + public function next() + { + $this->iteratorKey += 1; + } + /** + * Rewind the Iterator to the first element + * + * Implement Iterator::rewind() + * + * @return void + */ + public function rewind() + { + $this->iteratorKey = 0; + } + /** + * Check if there is a current element after calls to rewind() or next() + * + * Implement Iterator::valid() + * + * @return bool + */ + public function valid() + { + $numItems = $this->count(); + if ($numItems > 0 && $this->iteratorKey < $numItems) { + return true; + } else { + return false; + } + } + /** + * Whether the offset exists + * + * Implement ArrayAccess::offsetExists() + * + * @param int $offset + * @return bool + */ + public function offsetExists($offset) + { + return ($offset < $this->count()); + } + /** + * Return value at given offset + * + * Implement ArrayAccess::offsetGet() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Files_Exception + * @return Zend_Service_Rackspace_Files_Container + */ + public function offsetGet($offset) + { + if ($this->offsetExists($offset)) { + return $this->objects[$offset]; + } else { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception('Illegal index'); + } + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetSet() + * + * @param int $offset + * @param string $value + * @throws Zend_Service_Rackspace_Files_Exception + */ + public function offsetSet($offset, $value) + { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception('You are trying to set read-only property'); + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetUnset() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Files_Exception + */ + public function offsetUnset($offset) + { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception('You are trying to unset read-only property'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Files/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Files/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,36 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + */ + +/** + * @see Zend_Service_Rackspace_Exception + */ +require_once 'Zend/Service/Rackspace/Exception.php'; + +/** + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Files_Exception extends Zend_Service_Rackspace_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Files/Object.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Files/Object.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,271 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Files.php'; + +class Zend_Service_Rackspace_Files_Object +{ + /** + * The service that has created the object + * + * @var Zend_Service_Rackspace_Files + */ + protected $service; + /** + * Name of the object + * + * @var string + */ + protected $name; + /** + * MD5 value of the object's content + * + * @var string + */ + protected $hash; + /** + * Size in bytes of the object's content + * + * @var integer + */ + protected $size; + /** + * Content type of the object's content + * + * @var string + */ + protected $contentType; + /** + * Date of the last modified of the object + * + * @var string + */ + protected $lastModified; + /** + * Object content + * + * @var string + */ + protected $content; + /** + * Name of the container where the object is stored + * + * @var string + */ + protected $container; + /** + * Constructor + * + * You must pass the Zend_Service_Rackspace_Files object of the caller and an associative + * array with the keys "name", "container", "hash", "bytes", "content_type", + * "last_modified", "file" where: + * name= name of the object + * container= name of the container where the object is stored + * hash= the MD5 of the object's content + * bytes= size in bytes of the object's content + * content_type= content type of the object's content + * last_modified= date of the last modified of the object + * content= content of the object + * + * @param Zend_Service_Rackspace_Files $service + * @param array $data + */ + public function __construct($service,$data) + { + if (!($service instanceof Zend_Service_Rackspace_Files) || !is_array($data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass a RackspaceFiles and an array"); + } + if (!array_key_exists('name', $data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass the name of the object in the array (name)"); + } + if (!array_key_exists('container', $data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass the container of the object in the array (container)"); + } + if (!array_key_exists('hash', $data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass the hash of the object in the array (hash)"); + } + if (!array_key_exists('bytes', $data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass the byte size of the object in the array (bytes)"); + } + if (!array_key_exists('content_type', $data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass the content type of the object in the array (content_type)"); + } + if (!array_key_exists('last_modified', $data)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass the last modified data of the object in the array (last_modified)"); + } + $this->name= $data['name']; + $this->container= $data['container']; + $this->hash= $data['hash']; + $this->size= $data['bytes']; + $this->contentType= $data['content_type']; + $this->lastModified= $data['last_modified']; + if (!empty($data['content'])) { + $this->content= $data['content']; + } + $this->service= $service; + } + /** + * Get name + * + * @return string + */ + public function getName() + { + return $this->name; + } + /** + * Get the name of the container + * + * @return string + */ + public function getContainer() + { + return $this->container; + } + /** + * Get the MD5 of the object's content + * + * @return string|boolean + */ + public function getHash() + { + return $this->hash; + } + /** + * Get the size (in bytes) of the object's content + * + * @return integer|boolean + */ + public function getSize() + { + return $this->size; + } + /** + * Get the content type of the object's content + * + * @return string + */ + public function getContentType() + { + return $this->contentType; + } + /** + * Get the data of the last modified of the object + * + * @return string + */ + public function getLastModified() + { + return $this->lastModified; + } + /** + * Get the content of the object + * + * @return string + */ + public function getContent() + { + return $this->content; + } + /** + * Get the metadata of the object + * If you don't pass the $key it returns the entire array of metadata value + * + * @param string $key + * @return string|array|boolean + */ + public function getMetadata($key=null) + { + $result= $this->service->getMetadataObject($this->container,$this->name); + if (!empty($result)) { + if (empty($key)) { + return $result['metadata']; + } + if (isset($result['metadata'][$key])) { + return $result['metadata'][$key]; + } + } + return false; + } + /** + * Set the metadata value + * The old metadata values are replaced with the new one + * + * @param array $metadata + * @return boolean + */ + public function setMetadata($metadata) + { + return $this->service->setMetadataObject($this->container,$this->name,$metadata); + } + /** + * Copy the object to another container + * You can add metadata information to the destination object, change the + * content_type and the name of the object + * + * @param string $container_dest + * @param string $name_dest + * @param array $metadata + * @param string $content_type + * @return boolean + */ + public function copyTo($container_dest,$name_dest,$metadata=array(),$content_type=null) + { + return $this->service->copyObject($this->container,$this->name,$container_dest,$name_dest,$metadata,$content_type); + } + /** + * Get the CDN URL of the object + * + * @return string + */ + public function getCdnUrl() + { + $result= $this->service->getInfoCdnContainer($this->container); + if ($result!==false) { + if ($result['cdn_enabled']) { + return $result['cdn_uri'].'/'.$this->name; + } + } + return false; + } + /** + * Get the CDN SSL URL of the object + * + * @return string + */ + public function getCdnUrlSsl() + { + $result= $this->service->getInfoCdnContainer($this->container); + if ($result!==false) { + if ($result['cdn_enabled']) { + return $result['cdn_uri_ssl'].'/'.$this->name; + } + } + return false; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Files/ObjectList.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Files/ObjectList.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,237 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Files/Object.php'; +require_once 'Zend/Service/Rackspace/Files.php'; + +/** + * List of servers retrived from the GoGrid web service + * + * @uses ArrayAccess + * @uses Countable + * @uses Iterator + * @uses OutOfBoundsException + * @uses Zend_Service_Rackspace_Files + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Files_ObjectList implements Countable, Iterator, ArrayAccess +{ + /** + * @var array of Zend_Service_Rackspace_Files_Object + */ + protected $objects = array(); + /** + * @var int Iterator key + */ + protected $iteratorKey = 0; + /** + * @var RackspaceFiles + */ + protected $service; + /** + * The container name of the object list + * + * @var string + */ + protected $container; + /** + * Construct + * + * @param array $list + * @return boolean + */ + public function __construct($service,$list,$container) + { + if (!($service instanceof Zend_Service_Rackspace_Files)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass a Zend_Service_Rackspace_Files object"); + } + if (!is_array($list)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass an array of data objects"); + } + if (empty($container)) { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception("You must pass the container of the object list"); + } + $this->service= $service; + $this->container= $container; + $this->_constructFromArray($list); + } + /** + * Transforms the Array to array of container + * + * @param array $list + * @return void + */ + private function _constructFromArray(array $list) + { + foreach ($list as $obj) { + $obj['container']= $this->container; + $this->_addObject(new Zend_Service_Rackspace_Files_Object($this->service,$obj)); + } + } + /** + * Add an object + * + * @param Zend_Service_Rackspace_Files_Object $obj + * @return Zend_Service_Rackspace_Files_ObjectList + */ + protected function _addObject (Zend_Service_Rackspace_Files_Object $obj) + { + $this->objects[] = $obj; + return $this; + } + /** + * Return number of servers + * + * Implement Countable::count() + * + * @return int + */ + public function count() + { + return count($this->objects); + } + /** + * Return the current element + * + * Implement Iterator::current() + * + * @return Zend_Service_Rackspace_Files_Object + */ + public function current() + { + return $this->objects[$this->iteratorKey]; + } + /** + * Return the key of the current element + * + * Implement Iterator::key() + * + * @return int + */ + public function key() + { + return $this->iteratorKey; + } + /** + * Move forward to next element + * + * Implement Iterator::next() + * + * @return void + */ + public function next() + { + $this->iteratorKey += 1; + } + /** + * Rewind the Iterator to the first element + * + * Implement Iterator::rewind() + * + * @return void + */ + public function rewind() + { + $this->iteratorKey = 0; + } + /** + * Check if there is a current element after calls to rewind() or next() + * + * Implement Iterator::valid() + * + * @return bool + */ + public function valid() + { + $numItems = $this->count(); + if ($numItems > 0 && $this->iteratorKey < $numItems) { + return true; + } else { + return false; + } + } + /** + * Whether the offset exists + * + * Implement ArrayAccess::offsetExists() + * + * @param int $offset + * @return bool + */ + public function offsetExists($offset) + { + return ($offset < $this->count()); + } + /** + * Return value at given offset + * + * Implement ArrayAccess::offsetGet() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Files_Exception + * @return Zend_Service_Rackspace_Files_Object + */ + public function offsetGet($offset) + { + if ($this->offsetExists($offset)) { + return $this->objects[$offset]; + } else { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception('Illegal index'); + } + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetSet() + * + * @param int $offset + * @param string $value + * @throws Zend_Service_Rackspace_Files_Exception + */ + public function offsetSet($offset, $value) + { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception('You are trying to set read-only property'); + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetUnset() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Files_Exception + */ + public function offsetUnset($offset) + { + require_once 'Zend/Service/Rackspace/Files/Exception.php'; + throw new Zend_Service_Rackspace_Files_Exception('You are trying to unset read-only property'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,1281 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service + * @subpackage Rackspace + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Abstract.php'; +require_once 'Zend/Service/Rackspace/Servers/Server.php'; +require_once 'Zend/Service/Rackspace/Servers/ServerList.php'; +require_once 'Zend/Service/Rackspace/Servers/Image.php'; +require_once 'Zend/Service/Rackspace/Servers/ImageList.php'; +require_once 'Zend/Service/Rackspace/Servers/SharedIpGroup.php'; +require_once 'Zend/Service/Rackspace/Servers/SharedIpGroupList.php'; +require_once 'Zend/Validate/Ip.php'; + +class Zend_Service_Rackspace_Servers extends Zend_Service_Rackspace_Abstract +{ + const LIMIT_FILE_SIZE = 10240; + const LIMIT_NUM_FILE = 5; + const ERROR_SERVICE_UNAVAILABLE = 'The service is unavailable'; + const ERROR_UNAUTHORIZED = 'Unauthorized'; + const ERROR_OVERLIMIT = 'You reached the limit of requests, please wait some time before retry'; + const ERROR_PARAM_NO_ID = 'You must specify the item\'s id'; + const ERROR_PARAM_NO_NAME = 'You must specify the name'; + const ERROR_PARAM_NO_SERVERID = 'You must specify the server Id'; + const ERROR_PARAM_NO_IMAGEID = 'You must specify the server\'s image ID'; + const ERROR_PARAM_NO_FLAVORID = 'You must specify the server\'s flavor ID'; + const ERROR_PARAM_NO_ARRAY = 'You must specify an array of parameters'; + const ERROR_PARAM_NO_WEEKLY = 'You must specify a weekly backup schedule'; + const ERROR_PARAM_NO_DAILY = 'You must specify a daily backup schedule'; + const ERROR_ITEM_NOT_FOUND = 'The item specified doesn\'t exist.'; + const ERROR_NO_FILE_EXISTS = 'The file specified doesn\'t exist'; + const ERROR_LIMIT_FILE_SIZE = 'You reached the size length of a file'; + const ERROR_IN_PROGRESS = 'The item specified is still in progress'; + const ERROR_BUILD_IN_PROGRESS = 'The build is still in progress'; + const ERROR_RESIZE_NOT_ALLOWED = 'The resize is not allowed'; + /** + * Get the list of the servers + * If $details is true returns detail info + * + * @param boolean $details + * @return Zend_Service_Rackspace_Servers_ServerList|boolean + */ + public function listServers($details=false) + { + $url= '/servers'; + if ($details) { + $url.= '/detail'; + } + $result= $this->httpCall($this->getManagementUrl().$url,'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $servers= json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_ServerList($this,$servers['servers']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the specified server + * + * @param string $id + * @return Zend_Service_Rackspace_Servers_Server + */ + public function getServer($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + $result= $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $server = json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_Server($this,$server['server']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Create a new server + * + * The required parameters are specified in $data (name, imageId, falvorId) + * The $files is an associative array with 'serverPath' => 'localPath' + * + * @param array $data + * @param array $metadata + * @param array $files + * @return Zend_Service_Rackspace_Servers_Server|boolean + */ + public function createServer(array $data, $metadata=array(),$files=array()) + { + if (empty($data) || !is_array($data) || !is_array($metadata) || !is_array($files)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ARRAY); + } + if (!isset($data['name'])) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME); + } + if (!isset($data['flavorId'])) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_FLAVORID); + } + if (!isset($data['imageId'])) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_IMAGEID); + } + if (count($files)>self::LIMIT_NUM_FILE) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You can attach '.self::LIMIT_NUM_FILE.' files maximum'); + } + if (!empty($metadata)) { + $data['metadata']= $metadata; + } + $data['flavorId']= (integer) $data['flavorId']; + $data['imageId']= (integer) $data['imageId']; + if (!empty($files)) { + foreach ($files as $serverPath => $filePath) { + if (!file_exists($filePath)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception( + sprintf("The file %s doesn't exist",$filePath)); + } + $content= file_get_contents($filePath); + if (strlen($content) > self::LIMIT_FILE_SIZE) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception( + sprintf("The size of the file %s is greater than the max size of %d bytes", + $filePath,self::LIMIT_FILE_SIZE)); + } + $data['personality'][] = array ( + 'path' => $serverPath, + 'contents' => base64_encode(file_get_contents($filePath)) + ); + } + } + $result = $this->httpCall($this->getManagementUrl().'/servers','POST', + null,null,json_encode(array ('server' => $data))); + $status = $result->getStatus(); + switch ($status) { + case '200' : + case '202' : // break intentionally omitted + $server = json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_Server($this,$server['server']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Change the name or the admin password for a server + * + * @param string $id + * @param string $name + * @param string $password + * @return boolean + */ + protected function updateServer($id,$name=null,$password=null) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server'); + } + if (empty($name) && empty($password)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("You must specify the new name or password of server"); + } + $data= array(); + if (!empty($name)) { + $data['name']= $name; + } + if (!empty($password)) { + $data['adminPass']= $password; + } + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'PUT', + null,null,json_encode(array('server' => $data))); + $status = $result->getStatus(); + switch ($status) { + case '204' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Change the server's name + * + * @param string $id + * @param string $name + * @return boolean + */ + public function changeServerName($id,$name) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server'); + } + if (empty($name)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("You must specify the new name of the server"); + } + return $this->updateServer($id, $name); + } + /** + * Change the admin password of the server + * + * @param string $id + * @param string $password + * @return boolean + */ + public function changeServerPassword($id,$password) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server'); + } + if (empty($password)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("You must specify the new password of the server"); + } + return $this->updateServer($id, null,$password); + } + /** + * Delete a server + * + * @param string $id + * @return boolean + */ + public function deleteServer($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server'); + } + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'DELETE'); + $status = $result->getStatus(); + switch ($status) { + case '202' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the server's IPs (public and private) + * + * @param string $id + * @return array|boolean + */ + public function getServerIp($id) + { + $result= $this->getServer($id); + if ($result===false) { + return false; + } + $result= $result->toArray(); + return $result['addresses']; + } + /** + * Get the Public IPs of a server + * + * @param string $id + * @return array|boolean + */ + public function getServerPublicIp($id) + { + $addresses= $this->getServerIp($id); + if ($addresses===false) { + return false; + } + return $addresses['public']; + } + /** + * Get the Private IPs of a server + * + * @param string $id + * @return array|boolean + */ + public function getServerPrivateIp($id) + { + $addresses= $this->getServerIp($id); + if ($addresses===false) { + return false; + } + return $addresses['private']; + } + /** + * Share an ip address for a server (id) + * + * @param string $id server + * @param string $ip + * @param string $groupId + * @return boolean + */ + public function shareIpAddress($id,$ip,$groupId,$configure=true) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server'); + } + if (empty($ip)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the IP address to share'); + } + $validator = new Zend_Validate_Ip(); + if (!$validator->isValid($ip)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("The parameter $ip specified is not a valid IP address"); + } + if (empty($groupId)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the group id to use'); + } + $data= array ( + 'sharedIpGroupId' => (integer) $groupId, + 'configureServer' => $configure + ); + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/ips/public/'.rawurlencode($ip),'PUT', + null,null,json_encode(array('shareIp' => $data))); + $status = $result->getStatus(); + switch ($status) { + case '202' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Unshare IP address for a server ($id) + * + * @param string $id + * @param string $ip + * @return boolean + */ + public function unshareIpAddress($id,$ip) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server'); + } + if (empty($ip)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the IP address to share'); + } + $validator = new Zend_Validate_Ip(); + if (!$validator->isValid($ip)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception("The parameter $ip specified is not a valid IP address"); + } + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/ips/public/'.rawurlencode($ip), + 'DELETE'); + $status = $result->getStatus(); + switch ($status) { + case '202' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Reboot a server + * + * $hard true is the equivalent of power cycling the server + * $hard false is a graceful shutdown + * + * @param string $id + * @param boolean $hard + * @return boolean + */ + public function rebootServer($id,$hard=false) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server'); + } + if (!$hard) { + $type= 'SOFT'; + } else { + $type= 'HARD'; + } + $data= array ( + 'reboot' => array ( + 'type' => $type + ) + ); + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action', + 'POST', null, null, json_encode($data)); + $status = $result->getStatus(); + switch ($status) { + case '200' : + case '202' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Rebuild a server + * + * The rebuild function removes all data on the server and replaces it with the specified image, + * serverId and IP addresses will remain the same. + * + * @param string $id + * @param string $imageId + * @return boolean + */ + public function rebuildServer($id,$imageId) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server'); + } + if (empty($imageId)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the new imageId of the server'); + } + $data= array ( + 'rebuild' => array ( + 'imageId' => (integer) $imageId + ) + ); + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action', + 'POST', null, null, json_encode($data)); + $status = $result->getStatus(); + switch ($status) { + case '202' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Resize a server + * + * The resize function converts an existing server to a different flavor, in essence, scaling the + * server up or down. The original server is saved for a period of time to allow rollback if there + * is a problem. All resizes should be tested and explicitly confirmed, at which time the original + * server is removed. All resizes are automatically confirmed after 24 hours if they are not + * explicitly confirmed or reverted. + * + * @param string $id + * @param string $flavorId + * @return boolean + */ + public function resizeServer($id,$flavorId) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server'); + } + if (empty($flavorId)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the new flavorId of the server'); + } + $data= array ( + 'resize' => array ( + 'flavorId' => (integer) $flavorId + ) + ); + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action', + 'POST', null, null, json_encode($data)); + $status = $result->getStatus(); + switch ($status) { + case '202' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '403' : + $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Confirm resize of a server + * + * During a resize operation, the original server is saved for a period of time to allow roll + * back if there is a problem. Once the newly resized server is tested and has been confirmed + * to be functioning properly, use this operation to confirm the resize. After confirmation, + * the original server is removed and cannot be rolled back to. All resizes are automatically + * confirmed after 24 hours if they are not explicitly confirmed or reverted. + * + * @param string $id + * @return boolean + */ + public function confirmResizeServer($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server'); + } + $data= array ( + 'confirmResize' => null + ); + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action', + 'POST', null, null, json_encode($data)); + $status = $result->getStatus(); + switch ($status) { + case '204' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '403' : + $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Revert resize of a server + * + * During a resize operation, the original server is saved for a period of time to allow for roll + * back if there is a problem. If you determine there is a problem with a newly resized server, + * use this operation to revert the resize and roll back to the original server. All resizes are + * automatically confirmed after 24 hours if they have not already been confirmed explicitly or + * reverted. + * + * @param string $id + * @return boolean + */ + public function revertResizeServer($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server'); + } + $data= array ( + 'revertResize' => null + ); + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action', + 'POST', null, null, json_encode($data)); + $status = $result->getStatus(); + switch ($status) { + case '202' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '403' : + $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the list of the flavors + * + * If $details is true returns detail info + * + * @param boolean $details + * @return array|boolean + */ + public function listFlavors($details=false) + { + $url= '/flavors'; + if ($details) { + $url.= '/detail'; + } + $result= $this->httpCall($this->getManagementUrl().$url,'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $flavors= json_decode($result->getBody(),true); + return $flavors['flavors']; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the detail of a flavor + * + * @param string $flavorId + * @return array|boolean + */ + public function getFlavor($flavorId) + { + if (empty($flavorId)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception('You didn\'t specified the new flavorId of the server'); + } + $result= $this->httpCall($this->getManagementUrl().'/flavors/'.rawurlencode($flavorId),'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $flavor= json_decode($result->getBody(),true); + return $flavor['flavor']; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the list of the images + * + * @param boolean $details + * @return Zend_Service_Rackspace_Servers_ImageList|boolean + */ + public function listImages($details=false) + { + $url= '/images'; + if ($details) { + $url.= '/detail'; + } + $result= $this->httpCall($this->getManagementUrl().$url,'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $images= json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_ImageList($this,$images['images']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get detail about an image + * + * @param string $id + * @return Zend_Service_Rackspace_Servers_Image|boolean + */ + public function getImage($id) + { + $result= $this->httpCall($this->getManagementUrl().'/images/'.rawurlencode($id),'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $image= json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_Image($this,$image['image']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Create an image for a serverId + * + * @param string $serverId + * @param string $name + * @return Zend_Service_Rackspace_Servers_Image + */ + public function createImage($serverId,$name) + { + if (empty($serverId)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_SERVERID); + } + if (empty($name)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME); + } + $data = array( + 'image' => array ( + 'serverId' => (integer) $serverId, + 'name' => $name + ) + ); + $result = $this->httpCall($this->getManagementUrl().'/images', 'POST', + null, null, json_encode($data)); + $status = $result->getStatus(); + switch ($status) { + case '202' : // break intentionally omitted + $image= json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_Image($this,$image['image']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '403' : + $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Delete an image + * + * @param string $id + * @return boolean + */ + public function deleteImage($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + $result = $this->httpCall($this->getManagementUrl().'/images/'.rawurlencode($id),'DELETE'); + $status = $result->getStatus(); + switch ($status) { + case '204' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the backup schedule of a server + * + * @param string $id server's Id + * @return array|boolean + */ + public function getBackupSchedule($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + $result= $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/backup_schedule', + 'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $backup = json_decode($result->getBody(),true); + return $backup['backupSchedule']; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Change the backup schedule of a server + * + * @param string $id server's Id + * @param string $weekly + * @param string $daily + * @return boolean + */ + public function changeBackupSchedule($id,$weekly,$daily) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + if (empty($weekly)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_WEEKLY); + } + if (empty($daily)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_DAILY); + } + $data = array ( + 'backupSchedule' => array ( + 'enabled' => true, + 'weekly' => $weekly, + 'daily' => $daily + ) + ); + $result= $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/backup_schedule', + 'POST',null,null,json_encode($data)); + $status= $result->getStatus(); + switch ($status) { + case '204' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Disable the backup schedule for a server + * + * @param string $id server's Id + * @return boolean + */ + public function disableBackupSchedule($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/backup_schedule', + 'DELETE'); + $status = $result->getStatus(); + switch ($status) { + case '204' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '409' : + $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the list of shared IP groups + * + * @param boolean $details + * @return Zend_Service_Rackspace_Servers_SharedIpGroupList|boolean + */ + public function listSharedIpGroups($details=false) + { + $url= '/shared_ip_groups'; + if ($details) { + $url.= '/detail'; + } + $result= $this->httpCall($this->getManagementUrl().$url,'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $groups= json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_SharedIpGroupList($this,$groups['sharedIpGroups']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Get the shared IP group + * + * @param integer $id + * @return Zend_Service_Rackspace_Servers_SharedIpGroup|boolean + */ + public function getSharedIpGroup($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups/'.rawurlencode($id),'GET'); + $status= $result->getStatus(); + switch ($status) { + case '200' : + case '203' : // break intentionally omitted + $group= json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_SharedIpGroup($this,$group['sharedIpGroup']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Create a shared Ip group + * + * @param string $name + * @param string $serverId + * @return array|boolean + */ + public function createSharedIpGroup($name,$serverId) + { + if (empty($name)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME); + } + if (empty($serverId)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + $data = array ( + 'sharedIpGroup' => array ( + 'name' => $name, + 'server' => (integer) $serverId + ) + ); + $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups', + 'POST',null,null,json_encode($data)); + $status= $result->getStatus(); + switch ($status) { + case '201' : // break intentionally omitted + $group = json_decode($result->getBody(),true); + return new Zend_Service_Rackspace_Servers_SharedIpGroup($this,$group['sharedIpGroup']); + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } + /** + * Delete a Shared Ip Group + * + * @param integer $id + * @return boolean + */ + public function deleteSharedIpGroup($id) + { + if (empty($id)) { + require_once 'Zend/Service/Rackspace/Exception.php'; + throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID); + } + $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups/'.rawurlencode($id),'DELETE'); + $status= $result->getStatus(); + switch ($status) { + case '204' : // break intentionally omitted + return true; + case '503' : + $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE; + break; + case '401' : + $this->errorMsg= self::ERROR_UNAUTHORIZED; + break; + case '404' : + $this->errorMsg= self::ERROR_ITEM_NOT_FOUND; + break; + case '413' : + $this->errorMsg= self::ERROR_OVERLIMIT; + break; + default: + $this->errorMsg= $result->getBody(); + break; + } + $this->errorCode= $status; + return false; + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,36 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + */ + +/** + * @see Zend_Service_Rackspace_Exception + */ +require_once 'Zend/Service/Rackspace/Exception.php'; + +/** + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Files + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Servers_Exception extends Zend_Service_Rackspace_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers/Image.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,209 @@ +<?php + +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Servers.php'; + +class Zend_Service_Rackspace_Servers_Image +{ + const ERROR_PARAM_CONSTRUCT = 'You must pass a Zend_Service_Rackspace_Servers object and an array'; + const ERROR_PARAM_NO_NAME = 'You must pass the image\'s name in the array (name)'; + const ERROR_PARAM_NO_ID = 'You must pass the image\'s id in the array (id)'; + /** + * Name of the image + * + * @var string + */ + protected $name; + /** + * Id of the image + * + * @var string + */ + protected $id; + /** + * Server Id of the image + * + * @var string + */ + protected $serverId; + /** + * Updated data + * + * @var string + */ + protected $updated; + /** + * Created data + * + * @var string + */ + protected $created; + /** + * Status + * + * @var string + */ + protected $status; + /** + * Status progress + * + * @var integer + */ + protected $progress; + /** + * The service that has created the image object + * + * @var Zend_Service_Rackspace_Servers + */ + protected $service; + /** + * Construct + * + * @param array $data + * @return void + */ + public function __construct($service, $data) + { + if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_CONSTRUCT); + } + if (!array_key_exists('name', $data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_NAME); + } + if (!array_key_exists('id', $data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_ID); + } + $this->service= $service; + $this->name = $data['name']; + $this->id = $data['id']; + if (isset($data['serverId'])) { + $this->serverId= $data['serverId']; + } + if (isset($data['updated'])) { + $this->updated= $data['updated']; + } + if (isset($data['created'])) { + $this->created= $data['created']; + } + if (isset($data['status'])) { + $this->status= $data['status']; + } + if (isset($data['progress'])) { + $this->progress= $data['progress']; + } + } + /** + * Get the name of the image + * + * @return string + */ + public function getName() + { + return $this->name; + } + /** + * Get the image's id + * + * @return string + */ + public function getId() + { + return $this->id; + } + /** + * Get the server's id of the image + * + * @return string + */ + public function getServerId() + { + return $this->serverId; + } + /** + * Get the updated data + * + * @return string + */ + public function getUpdated() + { + return $this->updated; + } + /** + * Get the created data + * + * @return string + */ + public function getCreated() + { + return $this->created; + } + /** + * Get the image's status + * + * @return string|boolean + */ + public function getStatus() + { + $data= $this->service->getImage($this->id); + if ($data!==false) { + $data= $data->toArray(); + $this->status= $data['status']; + return $this->status; + } + return false; + } + /** + * Get the progress's status + * + * @return integer|boolean + */ + public function getProgress() + { + $data= $this->service->getImage($this->id); + if ($data!==false) { + $data= $data->toArray(); + $this->progress= $data['progress']; + return $this->progress; + } + return false; + } + /** + * To Array + * + * @return array + */ + public function toArray() + { + return array ( + 'name' => $this->name, + 'id' => $this->id, + 'serverId' => $this->serverId, + 'updated' => $this->updated, + 'created' => $this->created, + 'status' => $this->status, + 'progress' => $this->progress + ); + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers/ImageList.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers/ImageList.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,234 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Servers.php'; +require_once 'Zend/Service/Rackspace/Servers/Image.php'; + +/** + * List of images of Rackspace + * + * @uses ArrayAccess + * @uses Countable + * @uses Iterator + * @uses Zend_Service_Rackspace_Servers + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Servers_ImageList implements Countable, Iterator, ArrayAccess +{ + /** + * @var array of Zend_Service_Rackspace_Servers_Image + */ + protected $images = array(); + /** + * @var int Iterator key + */ + protected $iteratorKey = 0; + /** + * @var Zend_Service_Rackspace_Servers + */ + protected $service; + /** + * Construct + * + * @param RackspaceServers $service + * @param array $list + * @return void + */ + public function __construct($service,$list = array()) + { + if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($list)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception("You must pass a Zend_Service_Rackspace_Servers object and an array"); + } + $this->service= $service; + $this->constructFromArray($list); + } + /** + * Transforms the array to array of Server + * + * @param array $list + * @return void + */ + private function constructFromArray(array $list) + { + foreach ($list as $image) { + $this->addImage(new Zend_Service_Rackspace_Servers_Image($this->service,$image)); + } + } + /** + * Add an image + * + * @param Zend_Service_Rackspace_Servers_Image $image + * @return Zend_Service_Rackspace_Servers_ImageList + */ + protected function addImage (Zend_Service_Rackspace_Servers_Image $image) + { + $this->images[] = $image; + return $this; + } + /** + * To Array + * + * @return array + */ + public function toArray() + { + $array= array(); + foreach ($this->images as $image) { + $array[]= $image->toArray(); + } + return $array; + } + /** + * Return number of images + * + * Implement Countable::count() + * + * @return int + */ + public function count() + { + return count($this->images); + } + /** + * Return the current element + * + * Implement Iterator::current() + * + * @return Zend_Service_Rackspace_Servers_Image + */ + public function current() + { + return $this->images[$this->iteratorKey]; + } + /** + * Return the key of the current element + * + * Implement Iterator::key() + * + * @return int + */ + public function key() + { + return $this->iteratorKey; + } + /** + * Move forward to next element + * + * Implement Iterator::next() + * + * @return void + */ + public function next() + { + $this->iteratorKey += 1; + } + /** + * Rewind the Iterator to the first element + * + * Implement Iterator::rewind() + * + * @return void + */ + public function rewind() + { + $this->iteratorKey = 0; + } + /** + * Check if there is a current element after calls to rewind() or next() + * + * Implement Iterator::valid() + * + * @return bool + */ + public function valid() + { + $numItems = $this->count(); + if ($numItems > 0 && $this->iteratorKey < $numItems) { + return true; + } else { + return false; + } + } + /** + * Whether the offset exists + * + * Implement ArrayAccess::offsetExists() + * + * @param int $offset + * @return bool + */ + public function offsetExists($offset) + { + return ($offset < $this->count()); + } + /** + * Return value at given offset + * + * Implement ArrayAccess::offsetGet() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Servers_Exception + * @return Zend_Service_Rackspace_Servers_Image + */ + public function offsetGet($offset) + { + if ($this->offsetExists($offset)) { + return $this->images[$offset]; + } else { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('Illegal index'); + } + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetSet() + * + * @param int $offset + * @param string $value + * @throws Zend_Service_Rackspace_Servers_Exception + */ + public function offsetSet($offset, $value) + { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('You are trying to set read-only property'); + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetUnset() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Servers_Exception + */ + public function offsetUnset($offset) + { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('You are trying to unset read-only property'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers/Server.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers/Server.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,325 @@ +<?php + +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Servers.php'; + +class Zend_Service_Rackspace_Servers_Server +{ + const ERROR_PARAM_CONSTRUCT = 'You must pass a Zend_Service_Rackspace_Servers object and an array'; + const ERROR_PARAM_NO_NAME = 'You must pass the server\'s name in the array (name)'; + const ERROR_PARAM_NO_ID = 'You must pass the server\'s id in the array (id)'; + /** + * Server's name + * + * @var string + */ + protected $name; + /** + * Server's id + * + * @var string + */ + protected $id; + /** + * Image id of the server + * + * @var string + */ + protected $imageId; + /** + * Flavor id of the server + * + * @var string + */ + protected $flavorId; + /** + * Host id + * + * @var string + */ + protected $hostId; + /** + * Server's status + * + * @var string + */ + protected $status; + /** + * Progress of the status + * + * @var integer + */ + protected $progress; + /** + * Admin password, generated on a new server + * + * @var string + */ + protected $adminPass; + /** + * Public and private IP addresses + * + * @var array + */ + protected $addresses = array(); + /** + * @var array + */ + protected $metadata = array(); + /** + * The service that has created the server object + * + * @var Zend_Service_Rackspace_Servers + */ + protected $service; + /** + * Constructor + * + * @param Zend_Service_Rackspace_Servers $service + * @param array $data + * @return void + */ + public function __construct($service, $data) + { + if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_CONSTRUCT); + } + if (!array_key_exists('name', $data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_NAME); + } + if (!array_key_exists('id', $data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_ID); + } + $this->service = $service; + $this->name = $data['name']; + $this->id = $data['id']; + if (isset($data['imageId'])) { + $this->imageId= $data['imageId']; + } + if (isset($data['flavorId'])) { + $this->flavorId= $data['flavorId']; + } + if (isset($data['hostId'])) { + $this->hostId= $data['hostId']; + } + if (isset($data['status'])) { + $this->status= $data['status']; + } + if (isset($data['progress'])) { + $this->progress= $data['progress']; + } + if (isset($data['adminPass'])) { + $this->adminPass= $data['adminPass']; + } + if (isset($data['addresses']) && is_array($data['addresses'])) { + $this->addresses= $data['addresses']; + } + if (isset($data['metadata']) && is_array($data['metadata'])) { + $this->metadata= $data['metadata']; + } + } + /** + * Get the name of the server + * + * @return string + */ + public function getName() + { + return $this->name; + } + /** + * Get the server's id + * + * @return string + */ + public function getId() + { + return $this->id; + } + /** + * Get the server's image Id + * + * @return string + */ + public function getImageId() + { + return $this->imageId; + } + /** + * Get the server's flavor Id + * + * @return string + */ + public function getFlavorId() + { + return $this->flavorId; + } + /** + * Get the server's host Id + * + * @return string + */ + public function getHostId() + { + return $this->hostId; + } + /** + * Ge the server's admin password + * + * @return string + */ + public function getAdminPass() + { + return $this->adminPass; + } + /** + * Get the server's status + * + * @return string|boolean + */ + public function getStatus() + { + $data= $this->service->getServer($this->id); + if ($data!==false) { + $data= $data->toArray(); + $this->status= $data['status']; + return $this->status; + } + return false; + } + /** + * Get the progress's status + * + * @return integer|boolean + */ + public function getProgress() + { + $data= $this->service->getServer($this->id); + if ($data!==false) { + $data= $data->toArray(); + $this->progress= $data['progress']; + return $this->progress; + } + return false; + } + /** + * Get the private IPs + * + * @return array|boolean + */ + public function getPrivateIp() + { + if (isset($this->addresses['private'])) { + return $this->addresses['private']; + } + return false; + } + /** + * Get the public IPs + * + * @return array|boolean + */ + public function getPublicIp() + { + if (isset($this->addresses['public'])) { + return $this->addresses['public']; + } + return false; + } + /** + * Get the metadata of the container + * + * If $key is empty return the array of metadata + * + * @param string $key + * @return array|string + */ + public function getMetadata($key=null) + { + if (!empty($key) && isset($this->metadata[$key])) { + return $this->metadata[$key]; + } + return $this->metadata; + } + /** + * Change the name of the server + * + * @param string $name + * @return boolean + */ + public function changeName($name) + { + $result= $this->service->changeServerName($this->id, $name); + if ($result!==false) { + $this->name= $name; + return true; + } + return false; + } + /** + * Change the admin password of the server + * + * @param string $password + * @return boolean + */ + public function changePassword($password) + { + $result= $this->service->changeServerPassword($this->id, $password); + if ($result!==false) { + $this->adminPass= $password; + return true; + } + return false; + } + /** + * Reboot the server + * + * @return boolean + */ + public function reboot($hard=false) + { + return $this->service->rebootServer($this->id,$hard); + } + /** + * To Array + * + * @return array + */ + public function toArray() + { + return array ( + 'name' => $this->name, + 'id' => $this->id, + 'imageId' => $this->imageId, + 'flavorId' => $this->flavorId, + 'hostId' => $this->hostId, + 'status' => $this->status, + 'progress' => $this->progress, + 'adminPass' => $this->adminPass, + 'addresses' => $this->addresses, + 'metadata' => $this->metadata + ); + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers/ServerList.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers/ServerList.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,235 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Servers.php'; +require_once 'Zend/Service/Rackspace/Servers/Server.php'; + +/** + * List of servers of Rackspace + * + * @uses ArrayAccess + * @uses Countable + * @uses Iterator + * @uses OutOfBoundsException + * @uses Zend_Service_Rackspace_Servers + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Servers_ServerList implements Countable, Iterator, ArrayAccess +{ + /** + * @var array of Zend_Service_Rackspace_Servers_Server + */ + protected $servers = array(); + /** + * @var int Iterator key + */ + protected $iteratorKey = 0; + /** + * @var Zend_Service_Rackspace_Servers + */ + protected $service; + /** + * Construct + * + * @param Zend_Service_Rackspace_Servers $service + * @param array $list + * @return void + */ + public function __construct($service,$list = array()) + { + if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($list)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception("You must pass a Zend_Service_Rackspace_Servers object and an array"); + } + $this->service= $service; + $this->constructFromArray($list); + } + /** + * Transforms the array to array of Server + * + * @param array $list + * @return void + */ + private function constructFromArray(array $list) + { + foreach ($list as $server) { + $this->addServer(new Zend_Service_Rackspace_Servers_Server($this->service,$server)); + } + } + /** + * Add a server + * + * @param Zend_Service_Rackspace_Servers_Server $server + * @return Zend_Service_Rackspace_Servers_ServerList + */ + protected function addServer (Zend_Service_Rackspace_Servers_Server $server) + { + $this->servers[] = $server; + return $this; + } + /** + * To Array + * + * @return array + */ + public function toArray() + { + $array= array(); + foreach ($this->servers as $server) { + $array[]= $server->toArray(); + } + return $array; + } + /** + * Return number of servers + * + * Implement Countable::count() + * + * @return int + */ + public function count() + { + return count($this->servers); + } + /** + * Return the current element + * + * Implement Iterator::current() + * + * @return Zend_Service_Rackspace_Servers_Server + */ + public function current() + { + return $this->servers[$this->iteratorKey]; + } + /** + * Return the key of the current element + * + * Implement Iterator::key() + * + * @return int + */ + public function key() + { + return $this->iteratorKey; + } + /** + * Move forward to next element + * + * Implement Iterator::next() + * + * @return void + */ + public function next() + { + $this->iteratorKey += 1; + } + /** + * Rewind the Iterator to the first element + * + * Implement Iterator::rewind() + * + * @return void + */ + public function rewind() + { + $this->iteratorKey = 0; + } + /** + * Check if there is a current element after calls to rewind() or next() + * + * Implement Iterator::valid() + * + * @return bool + */ + public function valid() + { + $numItems = $this->count(); + if ($numItems > 0 && $this->iteratorKey < $numItems) { + return true; + } else { + return false; + } + } + /** + * Whether the offset exists + * + * Implement ArrayAccess::offsetExists() + * + * @param int $offset + * @return bool + */ + public function offsetExists($offset) + { + return ($offset < $this->count()); + } + /** + * Return value at given offset + * + * Implement ArrayAccess::offsetGet() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Servers_Exception + * @return Zend_Service_Rackspace_Servers_Server + */ + public function offsetGet($offset) + { + if ($this->offsetExists($offset)) { + return $this->servers[$offset]; + } else { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('Illegal index'); + } + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetSet() + * + * @param int $offset + * @param string $value + * @throws Zend_Service_Rackspace_Servers_Exception + */ + public function offsetSet($offset, $value) + { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('You are trying to set read-only property'); + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetUnset() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Servers_Exception + */ + public function offsetUnset($offset) + { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('You are trying to unset read-only property'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers/SharedIpGroup.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers/SharedIpGroup.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,165 @@ +<?php + +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Servers.php'; + +class Zend_Service_Rackspace_Servers_SharedIpGroup +{ + const ERROR_PARAM_CONSTRUCT = 'You must pass a Zend_Service_Rackspace_Servers object and an array'; + const ERROR_PARAM_NO_NAME = 'You must pass the image\'s name in the array (name)'; + const ERROR_PARAM_NO_ID = 'You must pass the image\'s id in the array (id)'; + const ERROR_PARAM_NO_SERVERS = 'The servers parameter must be an array of Ids'; + /** + * Name of the shared IP group + * + * @var string + */ + protected $name; + /** + * Id of the shared IP group + * + * @var string + */ + protected $id; + /** + * Array of servers of the shared IP group + * + * @var array + */ + protected $serversId = array(); + /** + * The service that has created the image object + * + * @var Zend_Service_Rackspace_Servers + */ + protected $service; + /** + * Construct + * + * @param Zend_Service_Rackspace_Servers $service + * @param array $data + * @return void + */ + public function __construct($service, $data) + { + if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_CONSTRUCT); + } + if (!array_key_exists('name', $data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_NAME); + } + if (!array_key_exists('id', $data)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_ID); + } + if (isset($data['servers']) && !is_array($data['servers'])) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_SERVERS); + } + $this->service= $service; + $this->name = $data['name']; + $this->id = $data['id']; + if (isset($data['servers'])) { + $this->serversId= $data['servers']; + } + } + /** + * Get the name of the shared IP group + * + * @return string + */ + public function getName() + { + return $this->name; + } + /** + * Get the id of the shared IP group + * + * @return string + */ + public function getId() + { + return $this->id; + } + /** + * Get the server's array of the shared IP group + * + * @return string + */ + public function getServersId() + { + if (empty($this->serversId)) { + $info= $this->service->getSharedIpGroup($this->id); + if (($info!==false)) { + $info= $info->toArray(); + if (isset($info['servers'])) { + $this->serversId= $info['servers']; + } + } + } + return $this->serversId; + } + /** + * Get the server + * + * @param integer $id + * @return Zend_Service_Rackspace_Servers_Server|boolean + */ + public function getServer($id) + { + if (empty($this->serversId)) { + $this->getServersId(); + } + if (in_array($id,$this->serversId)) { + return $this->service->getServer($id); + } + return false; + } + /** + * Create a server in the shared Ip Group + * + * @param array $data + * @param array $metadata + * @param array $files + * @return Zend_Service_Rackspace_Servers_Server|boolean + */ + public function createServer(array $data, $metadata=array(),$files=array()) + { + $data['sharedIpGroupId']= (integer) $this->id; + return $this->service->createServer($data,$metadata,$files); + } + /** + * To Array + * + * @return array + */ + public function toArray() + { + return array ( + 'name' => $this->name, + 'id' => $this->id, + 'servers' => $this->serversId + ); + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Rackspace/Servers/SharedIpGroupList.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Rackspace/Servers/SharedIpGroupList.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,234 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Service/Rackspace/Servers.php'; +require_once 'Zend/Service/Rackspace/Servers/SharedIpGroup.php'; + +/** + * List of shared Ip group of Rackspace + * + * @uses ArrayAccess + * @uses Countable + * @uses Iterator + * @uses Zend_Service_Rackspace_Servers + * @category Zend + * @package Zend_Service_Rackspace + * @subpackage Servers + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Rackspace_Servers_SharedIpGroupList implements Countable, Iterator, ArrayAccess +{ + /** + * @var array of Zend_Service_Rackspace_Servers_SharedIpGroup + */ + protected $shared = array(); + /** + * @var int Iterator key + */ + protected $iteratorKey = 0; + /** + * @var Zend_Service_Rackspace_Servers + */ + protected $service; + /** + * Construct + * + * @param Zend_Service_Rackspace_Servers $service + * @param array $list + * @return void + */ + public function __construct($service,$list = array()) + { + if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($list)) { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception("You must pass a Zend_Service_Rackspace_Servers object and an array"); + } + $this->service= $service; + $this->constructFromArray($list); + } + /** + * Transforms the array to array of Shared Ip Group + * + * @param array $list + * @return void + */ + private function constructFromArray(array $list) + { + foreach ($list as $share) { + $this->addSharedIpGroup(new Zend_Service_Rackspace_Servers_SharedIpGroup($this->service,$share)); + } + } + /** + * Add a shared Ip group + * + * @param Zend_Service_Rackspace_Servers_SharedIpGroup $shared + * @return Zend_Service_Rackspace_Servers_SharedIpGroupList + */ + protected function addSharedIpGroup (Zend_Service_Rackspace_Servers_SharedIpGroup $share) + { + $this->shared[] = $share; + return $this; + } + /** + * To Array + * + * @return array + */ + public function toArray() + { + $array= array(); + foreach ($this->shared as $share) { + $array[]= $share->toArray(); + } + return $array; + } + /** + * Return number of shared Ip Groups + * + * Implement Countable::count() + * + * @return int + */ + public function count() + { + return count($this->shared); + } + /** + * Return the current element + * + * Implement Iterator::current() + * + * @return Zend_Service_Rackspace_Servers_SharedIpGroup + */ + public function current() + { + return $this->shared[$this->iteratorKey]; + } + /** + * Return the key of the current element + * + * Implement Iterator::key() + * + * @return int + */ + public function key() + { + return $this->iteratorKey; + } + /** + * Move forward to next element + * + * Implement Iterator::next() + * + * @return void + */ + public function next() + { + $this->iteratorKey += 1; + } + /** + * Rewind the Iterator to the first element + * + * Implement Iterator::rewind() + * + * @return void + */ + public function rewind() + { + $this->iteratorKey = 0; + } + /** + * Check if there is a current element after calls to rewind() or next() + * + * Implement Iterator::valid() + * + * @return boolean + */ + public function valid() + { + $numItems = $this->count(); + if ($numItems > 0 && $this->iteratorKey < $numItems) { + return true; + } else { + return false; + } + } + /** + * Whether the offset exists + * + * Implement ArrayAccess::offsetExists() + * + * @param int $offset + * @return boolean + */ + public function offsetExists($offset) + { + return ($offset < $this->count()); + } + /** + * Return value at given offset + * + * Implement ArrayAccess::offsetGet() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Servers_Exception + * @return Zend_Service_Rackspace_Servers_SharedIpGroup + */ + public function offsetGet($offset) + { + if ($this->offsetExists($offset)) { + return $this->shared[$offset]; + } else { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('Illegal index'); + } + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetSet() + * + * @param int $offset + * @param string $value + * @throws Zend_Service_Rackspace_Servers_Exception + */ + public function offsetSet($offset, $value) + { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('You are trying to set read-only property'); + } + + /** + * Throws exception because all values are read-only + * + * Implement ArrayAccess::offsetUnset() + * + * @param int $offset + * @throws Zend_Service_Rackspace_Servers_Exception + */ + public function offsetUnset($offset) + { + require_once 'Zend/Service/Rackspace/Servers/Exception.php'; + throw new Zend_Service_Rackspace_Servers_Exception('You are trying to unset read-only property'); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ReCaptcha.php --- a/web/lib/Zend/Service/ReCaptcha.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ReCaptcha.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,9 +34,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReCaptcha.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ReCaptcha.php 25153 2012-11-28 11:56:23Z cogo $ */ class Zend_Service_ReCaptcha extends Zend_Service_Abstract { @@ -45,21 +45,21 @@ * * @var string */ - const API_SERVER = 'http://api.recaptcha.net'; + const API_SERVER = 'http://www.google.com/recaptcha/api'; /** * URI to the secure API * * @var string */ - const API_SECURE_SERVER = 'https://api-secure.recaptcha.net'; + const API_SECURE_SERVER = 'https://www.google.com/recaptcha/api'; /** * URI to the verify server * * @var string */ - const VERIFY_SERVER = 'http://api-verify.recaptcha.net/verify'; + const VERIFY_SERVER = 'http://www.google.com/recaptcha/api/verify'; /** * Public key used when displaying the captcha @@ -373,10 +373,11 @@ * * This method uses the public key to fetch a recaptcha form. * + * @param null|string $name Base name for recaptcha form elements * @return string * @throws Zend_Service_ReCaptcha_Exception */ - public function getHtml() + public function getHtml($name = null) { if ($this->_publicKey === null) { /** @see Zend_Service_ReCaptcha_Exception */ @@ -415,6 +416,12 @@ </script> SCRIPT; } + $challengeField = 'recaptcha_challenge_field'; + $responseField = 'recaptcha_response_field'; + if (!empty($name)) { + $challengeField = $name . '[' . $challengeField . ']'; + $responseField = $name . '[' . $responseField . ']'; + } $return = $reCaptchaOptions; $return .= <<<HTML @@ -426,9 +433,9 @@ <noscript> <iframe src="{$host}/noscript?k={$this->_publicKey}{$errorPart}" height="300" width="500" frameborder="0"></iframe>{$htmlBreak} - <textarea name="recaptcha_challenge_field" rows="3" cols="40"> + <textarea name="{$challengeField}" rows="3" cols="40"> </textarea> - <input type="hidden" name="recaptcha_response_field" + <input type="hidden" name="{$responseField}" value="manual_challenge"{$htmlInputClosing} </noscript> HTML; @@ -460,21 +467,9 @@ throw new Zend_Service_ReCaptcha_Exception('Missing ip address'); } - if (empty($challengeField)) { - /** @see Zend_Service_ReCaptcha_Exception */ - require_once 'Zend/Service/ReCaptcha/Exception.php'; - throw new Zend_Service_ReCaptcha_Exception('Missing challenge field'); - } - - if (empty($responseField)) { - /** @see Zend_Service_ReCaptcha_Exception */ - require_once 'Zend/Service/ReCaptcha/Exception.php'; - - throw new Zend_Service_ReCaptcha_Exception('Missing response field'); - } - /* Fetch an instance of the http client */ $httpClient = self::getHttpClient(); + $httpClient->resetParameters(true); $postParams = array('privatekey' => $this->_privateKey, 'remoteip' => $this->_ip, diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ReCaptcha/Exception.php --- a/web/lib/Zend/Service/ReCaptcha/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ReCaptcha/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Service_ReCaptcha_Exception extends Zend_Service_Exception {} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ReCaptcha/MailHide.php --- a/web/lib/Zend/Service/ReCaptcha/MailHide.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ReCaptcha/MailHide.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MailHide.php 20108 2010-01-06 22:05:31Z matthew $ + * @version $Id: MailHide.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha { @@ -312,18 +312,18 @@ $enc = $this->getOption('encoding'); /* Genrate the HTML used to represent the email address */ - $html = htmlentities($this->getEmailLocalPart(), ENT_COMPAT, $enc) - . '<a href="' - . htmlentities($url, ENT_COMPAT, $enc) - . '" onclick="window.open(\'' - . htmlentities($url, ENT_COMPAT, $enc) + $html = htmlentities($this->getEmailLocalPart(), ENT_COMPAT, $enc) + . '<a href="' + . htmlentities($url, ENT_COMPAT, $enc) + . '" onclick="window.open(\'' + . htmlentities($url, ENT_COMPAT, $enc) . '\', \'\', \'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=' - . $this->_options['popupWidth'] - . ',height=' - . $this->_options['popupHeight'] - . '\'); return false;" title="' - . $this->_options['linkTitle'] - . '">' . $this->_options['linkHiddenText'] . '</a>@' + . $this->_options['popupWidth'] + . ',height=' + . $this->_options['popupHeight'] + . '\'); return false;" title="' + . $this->_options['linkTitle'] + . '">' . $this->_options['linkHiddenText'] . '</a>@' . htmlentities($this->getEmailDomainPart(), ENT_COMPAT, $enc); return $html; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ReCaptcha/MailHide/Exception.php --- a/web/lib/Zend/Service/ReCaptcha/MailHide/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ReCaptcha/MailHide/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Service_ReCaptcha_MailHide_Exception extends Zend_Service_ReCaptcha_Exception {} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ReCaptcha/Response.php --- a/web/lib/Zend/Service/ReCaptcha/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ReCaptcha/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,9 +25,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 25152 2012-11-28 11:55:44Z cogo $ */ class Zend_Service_ReCaptcha_Response { @@ -142,13 +142,18 @@ { $body = $response->getBody(); - $parts = explode("\n", $body, 2); + // Default status and error code + $status = 'false'; + $errorCode = ''; + + $parts = explode("\n", $body); - if (count($parts) !== 2) { - $status = 'false'; - $errorCode = ''; - } else { - list($status, $errorCode) = $parts; + if ($parts[0] === 'true') { + $status = 'true'; + } + + if (!empty($parts[1])) { + $errorCode = $parts[1]; } $this->setStatus($status); @@ -156,4 +161,4 @@ return $this; } -} \ No newline at end of file +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/AbstractShortener.php --- a/web/lib/Zend/Service/ShortUrl/AbstractShortener.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ShortUrl/AbstractShortener.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -32,11 +32,11 @@ /** * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_ShortUrl_AbstractShortener - extends Zend_Service_Abstract + extends Zend_Service_Abstract implements Zend_Service_ShortUrl_Shortener { /** @@ -46,7 +46,7 @@ */ protected $_baseUri = null; - + /** * Checks whether URL to be shortened is valid * @@ -63,7 +63,7 @@ )); } } - + /** * Verifies that the URL has been shortened by this service * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/BitLy.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/ShortUrl/BitLy.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,167 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_ShortUrl + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_ShortUrl_AbstractShortener + */ +require_once 'Zend/Service/ShortUrl/AbstractShortener.php'; + +/** + * Bit.ly API implementation + * + * @category Zend + * @package Zend_Service_ShortUrl + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_ShortUrl_BitLy extends Zend_Service_ShortUrl_AbstractShortener +{ + + /** + * Base URI of the service + * + * @var string + */ + protected $_apiUri = 'http://api.bitly.com'; + + /** + * user login name + * + * @var string + */ + protected $_loginName; + + /** + * user API key or application access token + * + * @var string + */ + protected $_apiKey; + + /** + * @param string $login user login name or application access token + * @param null|string $apiKey user API key + */ + public function __construct($login, $apiKey = null) + { + if(null === $apiKey) { + $this->setOAuthAccessToken($login); + } else { + $this->setApiLogin($login, $apiKey); + } + } + + /** + * set OAuth credentials + * + * @param $accessToken + * @return Zend_Service_ShortUrl_BitLy + */ + public function setOAuthAccessToken($accessToken) + { + $this->_apiKey = $accessToken; + $this->_loginName = null; + return $this; + } + + /** + * set login credentials + * + * @param $login + * @param $apiKey + * @return Zend_Service_ShortUrl_BitLy + */ + public function setApiLogin($login, $apiKey) + { + $this->_apiKey = $apiKey; + $this->_loginName = $login; + return $this; + } + + /** + * prepare http client + * @return void + */ + protected function _setAccessParameter() + { + if(null === $this->_loginName) { + //OAuth login + $this->getHttpClient()->setParameterGet('access_token', $this->_apiKey); + } else { + //login/APIKey authentication + $this->getHttpClient()->setParameterGet('login',$this->_loginName); + $this->getHttpClient()->setParameterGet('apiKey',$this->_apiKey); + } + } + + /** + * handle bit.ly response + * + * @return string + * @throws Zend_Service_ShortUrl_Exception + */ + protected function _processRequest() + { + $response = $this->getHttpClient()->request(); + if(500 == $response->getStatus()) { + throw new Zend_Service_ShortUrl_Exception('Bit.ly :: '.$response->getBody()); + } + return $response->getBody(); + } + + /** + * This function shortens long url + * + * @param string $url URL to Shorten + * @throws Zend_Service_ShortUrl_Exception if bit.ly reports an error + * @return string Shortened Url + */ + public function shorten($url) + { + $this->_validateUri($url); + $this->_setAccessParameter(); + + $this->getHttpClient()->setUri($this->_apiUri.'/v3/shorten'); + $this->getHttpClient()->setParameterGet('longUrl',$url); + $this->getHttpClient()->setParameterGet('format','txt'); + + return $this->_processRequest(); + } + + /** + * Reveals target for short URL + * + * @param string $shortenedUrl URL to reveal target of + * @throws Zend_Service_ShortUrl_Exception if bit.ly reports an error + * @return string Unshortened Url + */ + public function unshorten($shortenedUrl) + { + $this->_validateUri($shortenedUrl); + $this->_setAccessParameter(); + + $this->getHttpClient()->setUri($this->_apiUri.'/v3/expand'); + $this->getHttpClient()->setParameterGet('shortUrl',$shortenedUrl); + $this->getHttpClient()->setParameterGet('format','txt'); + + return $this->_processRequest(); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/Exception.php --- a/web/lib/Zend/Service/ShortUrl/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ShortUrl/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/IsGd.php --- a/web/lib/Zend/Service/ShortUrl/IsGd.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ShortUrl/IsGd.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_IsGd extends Zend_Service_ShortUrl_AbstractShortener @@ -40,7 +40,7 @@ * @var string */ protected $_baseUri = 'http://is.gd'; - + /** * This function shortens long url * @@ -51,15 +51,15 @@ public function shorten($url) { $this->_validateUri($url); - + $serviceUri = 'http://is.gd/api.php'; - + $this->getHttpClient()->resetParameters(true); $this->getHttpClient()->setUri($serviceUri); $this->getHttpClient()->setParameterGet('longurl', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -75,21 +75,21 @@ $this->_validateUri($shortenedUrl); $this->_verifyBaseUri($shortenedUrl); - + $this->getHttpClient()->resetParameters(true); $this->getHttpClient()->setUri($shortenedUrl); $this->getHttpClient()->setConfig(array('maxredirects' => 0)); - + $response = $this->getHttpClient()->request(); if ($response->isError()) { require_once 'Zend/Service/ShortUrl/Exception.php'; throw new Zend_Service_ShortUrl_Exception($response->getMessage()); } - + if ($response->isRedirect()) { return $response->getHeader('Location'); } - + require_once 'Zend/Service/ShortUrl/Exception.php'; throw new Zend_Service_ShortUrl_Exception('Url unshortening was not successful'); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/JdemCz.php --- a/web/lib/Zend/Service/ShortUrl/JdemCz.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ShortUrl/JdemCz.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_JdemCz extends Zend_Service_ShortUrl_AbstractShortener @@ -40,7 +40,7 @@ * @var string */ protected $_baseUri = 'http://jdem.cz'; - + /** * This function shortens long url * @@ -51,14 +51,14 @@ public function shorten($url) { $this->_validateUri($url); - + $serviceUri = 'http://www.jdem.cz/get'; - + $this->getHttpClient()->setUri($serviceUri); $this->getHttpClient()->setParameterGet('url', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -74,11 +74,11 @@ $this->_validateUri($shortenedUrl); $this->_verifyBaseUri($shortenedUrl); - + $this->getHttpClient()->setUri($shortenedUrl)->setParameterGet('kam', 1); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/MetamarkNet.php --- a/web/lib/Zend/Service/ShortUrl/MetamarkNet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ShortUrl/MetamarkNet.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_MetamarkNet extends Zend_Service_ShortUrl_AbstractShortener @@ -40,9 +40,9 @@ * @var string */ protected $_baseUri = 'http://xrl.us/'; - + protected $_apiUri = 'http://metamark.net/api/rest/simple'; - + /** * This function shortens long url * @@ -53,12 +53,12 @@ public function shorten($url) { $this->_validateUri($url); - + $this->getHttpClient()->setUri($this->_apiUri); $this->getHttpClient()->setParameterGet('long_url', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -74,12 +74,12 @@ $this->_validateUri($shortenedUrl); $this->_verifyBaseUri($shortenedUrl); - + $this->getHttpClient()->setUri($this->_apiUri); $this->getHttpClient()->setParameterGet('short_url', $shortenedUrl); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/Shortener.php --- a/web/lib/Zend/Service/ShortUrl/Shortener.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ShortUrl/Shortener.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -22,19 +22,19 @@ /** * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Service_ShortUrl_Shortener { /** * This function shortens long url - * + * * @param string $url URL to Shorten * @return string Shortened Url */ - public function shorten($shortenedUrl); - + public function shorten($url); + /** * Reveals target for short URL * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/ShortUrl/TinyUrlCom.php --- a/web/lib/Zend/Service/ShortUrl/TinyUrlCom.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/ShortUrl/TinyUrlCom.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_TinyUrlCom extends Zend_Service_ShortUrl_AbstractShortener @@ -40,7 +40,7 @@ * @var string */ protected $_baseUri = 'http://tinyurl.com'; - + /** * This function shortens long url * @@ -53,12 +53,12 @@ $this->_validateUri($url); $serviceUri = 'http://tinyurl.com/api-create.php'; - + $this->getHttpClient()->setUri($serviceUri); $this->getHttpClient()->setParameterGet('url', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -72,29 +72,29 @@ public function unshorten($shortenedUrl) { $this->_validateUri($shortenedUrl); - + $this->_verifyBaseUri($shortenedUrl); - + //TinyUrl.com does not have an API for that, but we can use preview feature //we need new Zend_Http_Client $this->setHttpClient(new Zend_Http_Client()); - + $this->getHttpClient() ->setCookie('preview', 1) ->setUri($shortenedUrl); //get response $response = $this->getHttpClient()->request(); - + require_once 'Zend/Dom/Query.php'; $dom = new Zend_Dom_Query($response->getBody()); - + //find the redirect url link $results = $dom->query('a#redirecturl'); - + //get href $originalUrl = $results->current()->getAttribute('href'); - + return $originalUrl; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy.php --- a/web/lib/Zend/Service/Simpy.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,433 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Simpy.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @link http://www.simpy.com/doc/api/rest/ - */ -class Zend_Service_Simpy -{ - /** - * Base URI to which API methods and parameters will be appended - * - * @var string - */ - protected $_baseUri = 'http://simpy.com/simpy/api/rest/'; - - /** - * HTTP client for use in making web service calls - * - * @var Zend_Http_Client - */ - protected $_http; - - /** - * Constructs a new Simpy (free) REST API Client - * - * @param string $username Username for the Simpy user account - * @param string $password Password for the Simpy user account - * @return void - */ - public function __construct($username, $password) - { - $this->_http = new Zend_Http_Client; - $this->_http->setAuth($username, $password); - } - - /** - * Returns the HTTP client currently in use by this class for REST API - * calls, intended mainly for testing. - * - * @return Zend_Http_Client - */ - public function getHttpClient() - { - return $this->_http; - } - - /** - * Sends a request to the REST API service and does initial processing - * on the response. - * - * @param string $op Name of the operation for the request - * @param array $query Query data for the request (optional) - * @throws Zend_Service_Exception - * @return DOMDocument Parsed XML response - */ - protected function _makeRequest($op, $query = null) - { - if ($query != null) { - $query = array_diff($query, array_filter($query, 'is_null')); - $query = '?' . http_build_query($query); - } - - $this->_http->setUri($this->_baseUri . $op . '.do' . $query); - $response = $this->_http->request('GET'); - - if ($response->isSuccessful()) { - $doc = new DOMDocument(); - $doc->loadXML($response->getBody()); - $xpath = new DOMXPath($doc); - $list = $xpath->query('/status/code'); - - if ($list->length > 0) { - $code = $list->item(0)->nodeValue; - - if ($code != 0) { - $list = $xpath->query('/status/message'); - $message = $list->item(0)->nodeValue; - /** - * @see Zend_Service_Exception - */ - require_once 'Zend/Service/Exception.php'; - throw new Zend_Service_Exception($message, $code); - } - } - - return $doc; - } - - /** - * @see Zend_Service_Exception - */ - require_once 'Zend/Service/Exception.php'; - throw new Zend_Service_Exception($response->getMessage(), $response->getStatus()); - } - - /** - * Returns a list of all tags and their counts, ordered by count in - * decreasing order - * - * @param int $limit Limits the number of tags returned (optional) - * @link http://www.simpy.com/doc/api/rest/GetTags - * @throws Zend_Service_Exception - * @return Zend_Service_Simpy_TagSet - */ - public function getTags($limit = null) - { - $query = array( - 'limit' => $limit - ); - - $doc = $this->_makeRequest('GetTags', $query); - - /** - * @see Zend_Service_Simpy_TagSet - */ - require_once 'Zend/Service/Simpy/TagSet.php'; - return new Zend_Service_Simpy_TagSet($doc); - } - - /** - * Removes a tag. - * - * @param string $tag Tag to be removed - * @link http://www.simpy.com/doc/api/rest/RemoveTag - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function removeTag($tag) - { - $query = array( - 'tag' => $tag - ); - - $this->_makeRequest('RemoveTag', $query); - - return $this; - } - - /** - * Renames a tag. - * - * @param string $fromTag Tag to be renamed - * @param string $toTag New tag name - * @link http://www.simpy.com/doc/api/rest/RenameTag - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function renameTag($fromTag, $toTag) - { - $query = array( - 'fromTag' => $fromTag, - 'toTag' => $toTag - ); - - $this->_makeRequest('RenameTag', $query); - - return $this; - } - - /** - * Merges two tags into a new tag. - * - * @param string $fromTag1 First tag to merge. - * @param string $fromTag2 Second tag to merge. - * @param string $toTag Tag to merge the two tags into. - * @link http://www.simpy.com/doc/api/rest/MergeTags - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function mergeTags($fromTag1, $fromTag2, $toTag) - { - $query = array( - 'fromTag1' => $fromTag1, - 'fromTag2' => $fromTag2, - 'toTag' => $toTag - ); - - $this->_makeRequest('MergeTags', $query); - - return $this; - } - - /** - * Splits a single tag into two separate tags. - * - * @param string $tag Tag to split - * @param string $toTag1 First tag to split into - * @param string $toTag2 Second tag to split into - * @link http://www.simpy.com/doc/api/rest/SplitTag - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function splitTag($tag, $toTag1, $toTag2) - { - $query = array( - 'tag' => $tag, - 'toTag1' => $toTag1, - 'toTag2' => $toTag2 - ); - - $this->_makeRequest('SplitTag', $query); - - return $this; - } - - /** - * Performs a query on existing links and returns the results or returns all - * links if no particular query is specified (which should be used sparingly - * to prevent overloading Simpy servers) - * - * @param Zend_Service_Simpy_LinkQuery $q Query object to use (optional) - * @return Zend_Service_Simpy_LinkSet - */ - public function getLinks(Zend_Service_Simpy_LinkQuery $q = null) - { - if ($q != null) { - $query = array( - 'q' => $q->getQueryString(), - 'limit' => $q->getLimit(), - 'date' => $q->getDate(), - 'afterDate' => $q->getAfterDate(), - 'beforeDate' => $q->getBeforeDate() - ); - - $doc = $this->_makeRequest('GetLinks', $query); - } else { - $doc = $this->_makeRequest('GetLinks'); - } - - /** - * @see Zend_Service_Simpy_LinkSet - */ - require_once 'Zend/Service/Simpy/LinkSet.php'; - return new Zend_Service_Simpy_LinkSet($doc); - } - - /** - * Saves a given link. - * - * @param string $title Title of the page to save - * @param string $href URL of the page to save - * @param int $accessType ACCESSTYPE_PUBLIC or ACCESSTYPE_PRIVATE - * @param mixed $tags String containing a comma-separated list of - * tags or array of strings containing tags - * (optional) - * @param string $urlNickname Alternative custom title (optional) - * @param string $note Free text note (optional) - * @link Zend_Service_Simpy::ACCESSTYPE_PUBLIC - * @link Zend_Service_Simpy::ACCESSTYPE_PRIVATE - * @link http://www.simpy.com/doc/api/rest/SaveLink - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function saveLink($title, $href, $accessType, $tags = null, $urlNickname = null, $note = null) - { - if (is_array($tags)) { - $tags = implode(',', $tags); - } - - $query = array( - 'title' => $title, - 'href' => $href, - 'accessType' => $accessType, - 'tags' => $tags, - 'urlNickname' => $urlNickname, - 'note' => $note - ); - - $this->_makeRequest('SaveLink', $query); - - return $this; - } - - /** - * Deletes a given link. - * - * @param string $href URL of the bookmark to delete - * @link http://www.simpy.com/doc/api/rest/DeleteLink - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function deleteLink($href) - { - $query = array( - 'href' => $href - ); - - $this->_makeRequest('DeleteLink', $query); - - return $this; - } - - /** - * Return a list of watchlists and their meta-data, including the number - * of new links added to each watchlist since last login. - * - * @link http://www.simpy.com/doc/api/rest/GetWatchlists - * @return Zend_Service_Simpy_WatchlistSet - */ - public function getWatchlists() - { - $doc = $this->_makeRequest('GetWatchlists'); - - /** - * @see Zend_Service_Simpy_WatchlistSet - */ - require_once 'Zend/Service/Simpy/WatchlistSet.php'; - return new Zend_Service_Simpy_WatchlistSet($doc); - } - - /** - * Returns the meta-data for a given watchlist. - * - * @param int $watchlistId ID of the watchlist to retrieve - * @link http://www.simpy.com/doc/api/rest/GetWatchlist - * @return Zend_Service_Simpy_Watchlist - */ - public function getWatchlist($watchlistId) - { - $query = array( - 'watchlistId' => $watchlistId - ); - - $doc = $this->_makeRequest('GetWatchlist', $query); - - /** - * @see Zend_Service_Simpy_Watchlist - */ - require_once 'Zend/Service/Simpy/Watchlist.php'; - return new Zend_Service_Simpy_Watchlist($doc->documentElement); - } - - /** - * Returns all notes in reverse chronological order by add date or by - * rank. - * - * @param string $q Query string formatted using Simpy search syntax - * and search fields (optional) - * @param int $limit Limits the number notes returned (optional) - * @link http://www.simpy.com/doc/api/rest/GetNotes - * @link http://www.simpy.com/simpy/FAQ.do#searchSyntax - * @link http://www.simpy.com/simpy/FAQ.do#searchFieldsLinks - * @return Zend_Service_Simpy_NoteSet - */ - public function getNotes($q = null, $limit = null) - { - $query = array( - 'q' => $q, - 'limit' => $limit - ); - - $doc = $this->_makeRequest('GetNotes', $query); - - /** - * @see Zend_Service_Simpy_NoteSet - */ - require_once 'Zend/Service/Simpy/NoteSet.php'; - return new Zend_Service_Simpy_NoteSet($doc); - } - - /** - * Saves a note. - * - * @param string $title Title of the note - * @param mixed $tags String containing a comma-separated list of - * tags or array of strings containing tags - * (optional) - * @param string $description Free-text note (optional) - * @param int $noteId Unique identifier for an existing note to - * update (optional) - * @link http://www.simpy.com/doc/api/rest/SaveNote - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function saveNote($title, $tags = null, $description = null, $noteId = null) - { - if (is_array($tags)) { - $tags = implode(',', $tags); - } - - $query = array( - 'title' => $title, - 'tags' => $tags, - 'description' => $description, - 'noteId' => $noteId - ); - - $this->_makeRequest('SaveNote', $query); - - return $this; - } - - /** - * Deletes a given note. - * - * @param int $noteId ID of the note to delete - * @link http://www.simpy.com/doc/api/rest/DeleteNote - * @return Zend_Service_Simpy Provides a fluent interface - */ - public function deleteNote($noteId) - { - $query = array( - 'noteId' => $noteId - ); - - $this->_makeRequest('DeleteNote', $query); - - return $this; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/Link.php --- a/web/lib/Zend/Service/Simpy/Link.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,215 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_Link -{ - /** - * Private access type - * - * @var string - */ - const ACCESSTYPE_PRIVATE = '0'; - - /** - * Public access type - * - * @var string - */ - const ACCESSTYPE_PUBLIC = '1'; - - /** - * Access type assigned to the link - * - * @var string - */ - protected $_accessType; - - /** - * URL of the link - * - * @var string - */ - protected $_url; - - /** - * Date of the last modification made to the link - * - * @var string - */ - protected $_modDate; - - /** - * Date the link was added - * - * @var string - */ - protected $_addDate; - - /** - * Title assigned to the link - * - * @var string - */ - protected $_title; - - /** - * Nickname assigned to the link - * - * @var string - */ - protected $_nickname; - - /** - * Tags assigned to the link - * - * @var array - */ - protected $_tags; - - /** - * Note assigned to the link - * - * @var string - */ - protected $_note; - - /** - * Constructor to initialize the object with data - * - * @param DOMNode $node Individual <link> node from a parsed response from - * a GetLinks operation - * @return void - */ - public function __construct($node) - { - $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue; - - $doc = new DOMDocument(); - $doc->appendChild($doc->importNode($node, true)); - $xpath = new DOMXPath($doc); - - $this->_url = $xpath->evaluate('/link/url')->item(0)->nodeValue; - $this->_modDate = $xpath->evaluate('/link/modDate')->item(0)->nodeValue; - $this->_addDate = $xpath->evaluate('/link/addDate')->item(0)->nodeValue; - $this->_title = $xpath->evaluate('/link/title')->item(0)->nodeValue; - $this->_nickname = $xpath->evaluate('/link/nickname')->item(0)->nodeValue; - $this->_note = $xpath->evaluate('/link/note')->item(0)->nodeValue; - - $list = $xpath->query('/link/tags/tag'); - $this->_tags = array(); - - for ($x = 0; $x < $list->length; $x++) { - $this->_tags[$x] = $list->item($x)->nodeValue; - } - } - - /** - * Returns the access type assigned to the link - * - * @see ACCESSTYPE_PRIVATE - * @see ACCESSTYPE_PUBLIC - * @return string - */ - public function getAccessType() - { - return $this->_accessType; - } - - /** - * Returns the URL of the link - * - * @return string - */ - public function getUrl() - { - return $this->_url; - } - - /** - * Returns the date of the last modification made to the link - * - * @return string - */ - public function getModDate() - { - return $this->_modDate; - } - - /** - * Returns the date the link was added - * - * @return string - */ - public function getAddDate() - { - return $this->_addDate; - } - - /** - * Returns the title assigned to the link - * - * @return string - */ - public function getTitle() - { - return $this->_title; - } - - /** - * Returns the nickname assigned to the link - * - * @return string - */ - public function getNickname() - { - return $this->_nickname; - } - - /** - * Returns the tags assigned to the link - * - * @return array - */ - public function getTags() - { - return $this->_tags; - } - - /** - * Returns the note assigned to the link - * - * @return string - */ - public function getNote() - { - return $this->_note; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/LinkQuery.php --- a/web/lib/Zend/Service/Simpy/LinkQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,200 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LinkQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_LinkQuery -{ - /** - * Query string for the query - * - * @var string - */ - protected $_query = null; - - /** - * Maximum number of search results to return - * - * @var int - */ - protected $_limit = null; - - /** - * Date on which search results must have been added - * - * @var string - */ - protected $_date = null; - - /** - * Date after which search results must have been added - * - * @var string - */ - protected $_afterDate = null; - - /** - * Date before which search results must have been added - * - * @var string - */ - protected $_beforeDate = null; - - /** - * Sets the query string for the query - * - * @param string $query Query string in valid Simpy syntax - * @see http://www.simpy.com/faq#searchSyntax - * @see http://www.simpy.com/faq#searchFieldsLinks - * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface - */ - public function setQueryString($query) - { - $this->_query = $query; - - return $this; - } - - /** - * Returns the query string set for this query - * - * @return string - */ - public function getQueryString() - { - return $this->_query; - } - - /** - * Sets the maximum number of search results to return - * - * @param int $limit - * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface - */ - public function setLimit($limit) - { - $this->_limit = intval($limit); - - if ($this->_limit == 0) { - $this->_limit = null; - } - - return $this; - } - - /** - * Returns the maximum number of search results to return - * - * @return int - */ - public function getLimit() - { - return $this->_limit; - } - - /** - * Sets the date on which search results must have been added, which will - * override any existing values set using setAfterDate() and setBeforeDate() - * - * @param string $date - * @see setAfterDate() - * @see setBeforeDate() - * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface - */ - public function setDate($date) - { - $this->_date = $date; - $this->_afterDate = null; - $this->_beforeDate = null; - - return $this; - } - - /** - * Returns the date on which search results must have been added - * - * @return string - */ - public function getDate() - { - return $this->_date; - } - - /** - * Sets the date after which search results must have been added, which will - * override any existing values set using setDate() - * - * @param string $date - * @see setDate() - * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface - */ - public function setAfterDate($date) - { - $this->_afterDate = $date; - $this->_date = null; - - return $this; - } - - /** - * Returns the date after which search results must have been added - * - * @return string - */ - public function getAfterDate() - { - return $this->_afterDate; - } - - /** - * Sets the date before which search results must have been added, which - * will override any existing values set using setDate() - * - * @param string $date - * @see setDate() - * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface - */ - public function setBeforeDate($date) - { - $this->_beforeDate = $date; - $this->_date = null; - - return $this; - } - - /** - * Returns the date before which search results must have been added - * - * @return string - */ - public function getBeforeDate() - { - return $this->_beforeDate; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/LinkSet.php --- a/web/lib/Zend/Service/Simpy/LinkSet.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LinkSet.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @see Zend_Service_Simpy_Link - */ -require_once 'Zend/Service/Simpy/Link.php'; - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_LinkSet implements IteratorAggregate -{ - /** - * List of links - * - * @var array of Zend_Service_Simpy_Link objects - */ - protected $_links; - - /** - * Constructor to initialize the object with data - * - * @param DOMDocument $doc Parsed response from a GetLinks operation - * @return void - */ - public function __construct(DOMDocument $doc) - { - $xpath = new DOMXPath($doc); - $list = $xpath->query('//links/link'); - $this->_links = array(); - - for ($x = 0; $x < $list->length; $x++) { - $this->_links[$x] = new Zend_Service_Simpy_Link($list->item($x)); - } - } - - /** - * Returns an iterator for the link set - * - * @return ArrayIterator - */ - public function getIterator() - { - return new ArrayIterator($this->_links); - } - - /** - * Returns the number of links in the set - * - * @return int - */ - public function getLength() - { - return count($this->_links); - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/Note.php --- a/web/lib/Zend/Service/Simpy/Note.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,215 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Note.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_Note -{ - /** - * Private access type - * - * @var string - */ - const ACCESSTYPE_PRIVATE = 'private'; - - /** - * Public access type - * - * @var string - */ - const ACCESSTYPE_PUBLIC = 'public'; - - /** - * Access type assigned to the note - * - * @var string - */ - protected $_accessType; - - /** - * ID of the note - * - * @var int - */ - protected $_id; - - /** - * URI of the note - * - * @var string - */ - protected $_uri; - - /** - * Date of the last modification made to the note - * - * @var string - */ - protected $_modDate; - - /** - * Date the note was added - * - * @var string - */ - protected $_addDate; - - /** - * Title of to the note - * - * @var string - */ - protected $_title; - - /** - * Tags assigned to the note - * - * @var array - */ - protected $_tags; - - /** - * Description of the note - * - * @var string - */ - protected $_description; - - /** - * Constructor to initialize the object with data - * - * @param DOMNode $node Individual <link> node from a parsed response from - * a GetLinks operation - * @return void - */ - public function __construct($node) - { - $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue; - - $doc = new DOMDocument(); - $doc->appendChild($doc->importNode($node, true)); - $xpath = new DOMXPath($doc); - - $this->_uri = $xpath->evaluate('/note/uri')->item(0)->nodeValue; - $this->_id = substr($this->_uri, strrpos($this->_uri, '=') + 1); - $this->_modDate = trim($xpath->evaluate('/note/modDate')->item(0)->nodeValue); - $this->_addDate = trim($xpath->evaluate('/note/addDate')->item(0)->nodeValue); - $this->_title = $xpath->evaluate('/note/title')->item(0)->nodeValue; - $this->_description = $xpath->evaluate('/note/description')->item(0)->nodeValue; - - $list = $xpath->query('/note/tags/tag'); - $this->_tags = array(); - - for ($x = 0; $x < $list->length; $x++) { - $this->_tags[$x] = $list->item($x)->nodeValue; - } - } - - /** - * Returns the access type assigned to the note - * - * @see ACCESSTYPE_PRIVATE - * @see ACCESSTYPE_PUBLIC - * @return string - */ - public function getAccessType() - { - return $this->_accessType; - } - - /** - * Returns the ID of the note - * - * @return int - */ - public function getId() - { - return $this->_id; - } - - /** - * Returns the URI of the note - * - * @return string - */ - public function getUri() - { - return $this->_uri; - } - - /** - * Returns the date of the last modification made to the note - * - * @return string - */ - public function getModDate() - { - return $this->_modDate; - } - - /** - * Returns the date the note was added - * - * @return string - */ - public function getAddDate() - { - return $this->_addDate; - } - - /** - * Returns the title assigned to the note - * - * @return string - */ - public function getTitle() - { - return $this->_title; - } - - /** - * Returns the tags assigned to the note - * - * @return array - */ - public function getTags() - { - return $this->_tags; - } - - /** - * Returns the description assigned to the note - * - * @return string - */ - public function getDescription() - { - return $this->_description; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/NoteSet.php --- a/web/lib/Zend/Service/Simpy/NoteSet.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NoteSet.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @see Zend_Service_Simpy_Note - */ -require_once 'Zend/Service/Simpy/Note.php'; - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_NoteSet implements IteratorAggregate -{ - /** - * List of notes - * - * @var array of Zend_Service_Simpy_Note objects - */ - protected $_notes; - - /** - * Constructor to initialize the object with data - * - * @param DOMDocument $doc Parsed response from a GetNotes operation - * @return void - */ - public function __construct(DOMDocument $doc) - { - $xpath = new DOMXPath($doc); - $list = $xpath->query('//notes/note'); - $this->_notes = array(); - - for ($x = 0; $x < $list->length; $x++) { - $this->_notes[$x] = new Zend_Service_Simpy_Note($list->item($x)); - } - } - - /** - * Returns an iterator for the note set - * - * @return ArrayIterator - */ - public function getIterator() - { - return new ArrayIterator($this->_notes); - } - - /** - * Returns the number of notes in the set - * - * @return int - */ - public function getLength() - { - return count($this->_notes); - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/Tag.php --- a/web/lib/Zend/Service/Simpy/Tag.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_Tag -{ - /** - * Name of the tag - * - * @var string - */ - protected $_tag; - - /** - * Number of links with the tag - * - * @var int - */ - protected $_count; - - /** - * Constructor to initialize the object with data - * - * @param DOMNode $node Individual <tag> node from a parsed response from - * a GetTags operation - * @return void - */ - public function __construct($node) - { - $map =& $node->attributes; - $this->_tag = $map->getNamedItem('name')->nodeValue; - $this->_count = $map->getNamedItem('count')->nodeValue; - } - - /** - * Returns the name of the tag - * - * @return string - */ - public function getTag() - { - return $this->_tag; - } - - /** - * Returns the number of links with the tag - * - * @return int - */ - public function getCount() - { - return $this->_count; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/TagSet.php --- a/web/lib/Zend/Service/Simpy/TagSet.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagSet.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @see Zend_Service_Simpy_Tag - */ -require_once 'Zend/Service/Simpy/Tag.php'; - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_TagSet implements IteratorAggregate -{ - /** - * List of tags - * - * @var array of Zend_Service_Simpy_Tag objects - */ - protected $_tags; - - /** - * Constructor to initialize the object with data - * - * @param DOMDocument $doc Parsed response from a GetTags operation - * @return void - */ - public function __construct(DOMDocument $doc) - { - $xpath = new DOMXPath($doc); - $list = $xpath->query('//tags/tag'); - $this->_tags = array(); - - for ($x = 0; $x < $list->length; $x++) { - $this->_tags[$x] = new Zend_Service_Simpy_Tag($list->item($x)); - } - } - - /** - * Returns an iterator for the tag set - * - * @return ArrayIterator - */ - public function getIterator() - { - return new ArrayIterator($this->_tags); - } - - /** - * Returns the number of tags in the set - * - * @return int - */ - public function getLength() - { - return count($this->_tags); - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/Watchlist.php --- a/web/lib/Zend/Service/Simpy/Watchlist.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Watchlist.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @see Zend_Service_Simpy_WatchlistFilterSet - */ -require_once 'Zend/Service/Simpy/WatchlistFilterSet.php'; - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_Watchlist -{ - /** - * Identifier for the watchlist - * - * @var int - */ - protected $_id; - - /** - * Name of the watchlist - * - * @var string - */ - protected $_name; - - /** - * Description of the watchlist - * - * @var string - */ - protected $_description; - - /** - * Timestamp for when the watchlist was added - * - * @var string - */ - protected $_addDate; - - /** - * Number of new links in the watchlist - * - * @var int - */ - protected $_newLinks; - - /** - * List of usernames for users included in the watchlist - * - * @var array - */ - protected $_users; - - /** - * List of filters included in the watchlist - * - * @var Zend_Service_Simpy_WatchlistFilterSet - */ - protected $_filters; - - /** - * Constructor to initialize the object with data - * - * @param DOMNode $node Individual <watchlist> node from a parsed - * response from a GetWatchlists or GetWatchlist - * operation - * @return void - */ - public function __construct($node) - { - $map =& $node->attributes; - - $this->_id = $map->getNamedItem('id')->nodeValue; - $this->_name = $map->getNamedItem('name')->nodeValue; - $this->_description = $map->getNamedItem('description')->nodeValue; - $this->_addDate = $map->getNamedItem('addDate')->nodeValue; - $this->_newLinks = $map->getNamedItem('newLinks')->nodeValue; - - $this->_users = array(); - $this->_filters = new Zend_Service_Simpy_WatchlistFilterSet(); - - $childNode = $node->firstChild; - while ($childNode !== null) { - if ($childNode->nodeName == 'user') { - $this->_users[] = $childNode->attributes->getNamedItem('username')->nodeValue; - } elseif ($childNode->nodeName == 'filter') { - $filter = new Zend_Service_Simpy_WatchlistFilter($childNode); - $this->_filters->add($filter); - } - $childNode = $childNode->nextSibling; - } - } - - /** - * Returns the identifier for the watchlist - * - * @return int - */ - public function getId() - { - return $this->_id; - } - - /** - * Returns the name of the watchlist - * - * @return string - */ - public function getName() - { - return $this->_name; - } - - /** - * Returns the description of the watchlist - * - * @return string - */ - public function getDescription() - { - return $this->_description; - } - - /** - * Returns a timestamp for when the watchlist was added - * - * @return string - */ - public function getAddDate() - { - return $this->_addDate; - } - - /** - * Returns the number of new links in the watchlist - * - * @return int - */ - public function getNewLinks() - { - return $this->_newLinks; - } - - /** - * Returns a list of usernames for users included in the watchlist - * - * @return array - */ - public function getUsers() - { - return $this->_users; - } - - /** - * Returns a list of filters included in the watchlist - * - * @return Zend_Service_Simpy_WatchlistFilterSet - */ - public function getFilters() - { - return $this->_filters; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/WatchlistFilter.php --- a/web/lib/Zend/Service/Simpy/WatchlistFilter.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WatchlistFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_WatchlistFilter -{ - /** - * Name of the filter - * - * @var string - */ - protected $_name; - - /** - * Query for the filter - * - * @var string - */ - protected $_query; - - /** - * Constructor to initialize the object with data - * - * @param DOMNode $node Individual <filter> node from a parsed response from - * a GetWatchlists or GetWatchlist operation - * @return void - */ - public function __construct($node) - { - $map =& $node->attributes; - $this->_name = $map->getNamedItem('name')->nodeValue; - $this->_query = $map->getNamedItem('query')->nodeValue; - } - - /** - * Returns the name of the filter - * - * @return string - */ - public function getName() - { - return $this->_name; - } - - /** - * Returns the query for the filter - * - * @return string - */ - public function getQuery() - { - return $this->_query; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/WatchlistFilterSet.php --- a/web/lib/Zend/Service/Simpy/WatchlistFilterSet.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WatchlistFilterSet.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @see Zend_Service_Simpy_WatchlistFilter - */ -require_once 'Zend/Service/Simpy/WatchlistFilter.php'; - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_WatchlistFilterSet implements IteratorAggregate -{ - /** - * List of filters in the set - * - * @var array of Zend_Service_Simpy_WatchlistFilter objects - */ - protected $_filters = array(); - - /** - * Adds a filter to the set - * - * @param Zend_Service_Simpy_WatchlistFilter $filter Filter to be added - * @return void - */ - public function add(Zend_Service_Simpy_WatchlistFilter $filter) - { - $this->_filters[] = $filter; - } - - /** - * Returns an iterator for the watchlist filter set - * - * @return ArrayIterator - */ - public function getIterator() - { - return new ArrayIterator($this->_filters); - } - - /** - * Returns the number of filters in the set - * - * @return int - */ - public function getLength() - { - return count($this->_filters); - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Simpy/WatchlistSet.php --- a/web/lib/Zend/Service/Simpy/WatchlistSet.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -<?php - -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WatchlistSet.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - - -/** - * @see Zend_Service_Simpy_Watchlist - */ -require_once 'Zend/Service/Simpy/Watchlist.php'; - - -/** - * @category Zend - * @package Zend_Service - * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Service_Simpy_WatchlistSet implements IteratorAggregate -{ - /** - * List of watchlists - * - * @var array of Zend_Service_Simpy_Watchlist objects - */ - protected $_watchlists = array(); - - /** - * Constructor to initialize the object with data - * - * @param DOMDocument $doc Parsed response from a GetWatchlists operation - * @return void - */ - public function __construct(DOMDocument $doc) - { - $xpath = new DOMXPath($doc); - $list = $xpath->query('//watchlists/watchlist'); - - for ($x = 0; $x < $list->length; $x++) { - $this->_watchlists[$x] = new Zend_Service_Simpy_Watchlist($list->item($x)); - } - } - - /** - * Returns an iterator for the watchlist set - * - * @return ArrayIterator - */ - public function getIterator() - { - return new ArrayIterator($this->_watchlists); - } - - /** - * Returns the number of watchlists in the set - * - * @return int - */ - public function getLength() - { - return count($this->_watchlists); - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SlideShare.php --- a/web/lib/Zend/Service/SlideShare.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/SlideShare.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SlideShare.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SlideShare.php 25283 2013-03-09 10:07:13Z frosch $ */ /** @@ -44,12 +44,11 @@ * @package Zend_Service * @subpackage SlideShare * @throws Zend_Service_SlideShare_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare { - /** * Web service result code mapping */ @@ -71,17 +70,17 @@ /** * Slide share Web service communication URIs */ - const SERVICE_UPLOAD_URI = 'http://www.slideshare.net/api/1/upload_slideshow'; - const SERVICE_GET_SHOW_URI = 'http://www.slideshare.net/api/1/get_slideshow'; - const SERVICE_GET_SHOW_BY_USER_URI = 'http://www.slideshare.net/api/1/get_slideshow_by_user'; - const SERVICE_GET_SHOW_BY_TAG_URI = 'http://www.slideshare.net/api/1/get_slideshow_by_tag'; - const SERVICE_GET_SHOW_BY_GROUP_URI = 'http://www.slideshare.net/api/1/get_slideshows_from_group'; + const SERVICE_UPLOAD_URI = 'https://www.slideshare.net/api/2/upload_slideshow'; + const SERVICE_GET_SHOW_URI = 'https://www.slideshare.net/api/2/get_slideshow'; + const SERVICE_GET_SHOW_BY_USER_URI = 'https://www.slideshare.net/api/2/get_slideshows_by_user'; + const SERVICE_GET_SHOW_BY_TAG_URI = 'https://www.slideshare.net/api/2/get_slideshows_by_tag'; + const SERVICE_GET_SHOW_BY_GROUP_URI = 'https://www.slideshare.net/api/2/get_slideshows_by_group'; /** * The MIME type of Slideshow files * */ - const POWERPOINT_MIME_TYPE = "application/vnd.ms-powerpoint"; + const POWERPOINT_MIME_TYPE = "application/vnd.ms-powerpoint"; /** * The API key to use in requests @@ -147,15 +146,20 @@ public function getHttpClient() { - if(!($this->_httpclient instanceof Zend_Http_Client)) { + if (!($this->_httpclient instanceof Zend_Http_Client)) { $client = new Zend_Http_Client(); - $client->setConfig(array('maxredirects' => 2, - 'timeout' => 5)); + $client->setConfig( + array( + 'maxredirects' => 2, + 'timeout' => 5 + ) + ); $this->setHttpClient($client); } $this->_httpclient->resetParameters(); + return $this->_httpclient; } @@ -181,10 +185,16 @@ public function getCacheObject() { - if(!($this->_cacheobject instanceof Zend_Cache_Core)) { - $cache = Zend_Cache::factory('Core', 'File', array('lifetime' => 43200, - 'automatic_serialization' => true), - array('cache_dir' => '/tmp')); + if (!($this->_cacheobject instanceof Zend_Cache_Core)) { + $cache = Zend_Cache::factory( + 'Core', + 'File', + array( + 'lifetime' => 43200, + 'automatic_serialization' => true + ), + array('cache_dir' => '/tmp') + ); $this->setCacheObject($cache); } @@ -283,17 +293,19 @@ /** * The Constructor * - * @param string $apikey The API key + * @param string $apikey The API key * @param string $sharedSecret The shared secret - * @param string $username The username - * @param string $password The password + * @param string $username The username + * @param string $password The password */ - public function __construct($apikey, $sharedSecret, $username = null, $password = null) + public function __construct( + $apikey, $sharedSecret, $username = null, $password = null + ) { $this->setApiKey($apikey) - ->setSharedSecret($sharedSecret) - ->setUserName($username) - ->setPassword($password); + ->setSharedSecret($sharedSecret) + ->setUserName($username) + ->setPassword($password); $this->_httpclient = new Zend_Http_Client(); } @@ -301,41 +313,47 @@ /** * Uploads the specified Slide show the the server * - * @param Zend_Service_SlideShare_SlideShow $ss The slide show object representing the slide show to upload - * @param boolean $make_src_public Determines if the the slide show's source file is public or not upon upload + * @param Zend_Service_SlideShare_SlideShow $ss The slide show object representing the slide show to upload + * @param boolean $makeSrcPublic Determines if the the slide show's source file is public or not upon upload * @return Zend_Service_SlideShare_SlideShow The passed Slide show object, with the new assigned ID provided + * @throws Zend_Service_SlideShare_Exception */ - public function uploadSlideShow(Zend_Service_SlideShare_SlideShow $ss, $make_src_public = true) + public function uploadSlideShow( + Zend_Service_SlideShare_SlideShow $ss, $makeSrcPublic = true + ) { - $timestamp = time(); - $params = array('api_key' => $this->getApiKey(), - 'ts' => $timestamp, - 'hash' => sha1($this->getSharedSecret().$timestamp), - 'username' => $this->getUserName(), - 'password' => $this->getPassword(), - 'slideshow_title' => $ss->getTitle()); + $params = array( + 'api_key' => $this->getApiKey(), + 'ts' => $timestamp, + 'hash' => sha1($this->getSharedSecret() . $timestamp), + 'username' => $this->getUserName(), + 'password' => $this->getPassword(), + 'slideshow_title' => $ss->getTitle() + ); $description = $ss->getDescription(); - $tags = $ss->getTags(); + $tags = $ss->getTags(); $filename = $ss->getFilename(); - if(!file_exists($filename) || !is_readable($filename)) { + if (!file_exists($filename) || !is_readable($filename)) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Specified Slideshow for upload not found or unreadable"); + throw new Zend_Service_SlideShare_Exception( + 'Specified Slideshow for upload not found or unreadable' + ); } - if(!empty($description)) { + if (!empty($description)) { $params['slideshow_description'] = $description; } else { $params['slideshow_description'] = ""; } - if(!empty($tags)) { + if (!empty($tags)) { $tmp = array(); - foreach($tags as $tag) { + foreach ($tags as $tag) { $tmp[] = "\"$tag\""; } $params['slideshow_tags'] = implode(' ', $tmp); @@ -343,7 +361,6 @@ $params['slideshow_tags'] = ""; } - $client = $this->getHttpClient(); $client->setUri(self::SERVICE_UPLOAD_URI); $client->setParameterPost($params); @@ -352,23 +369,29 @@ require_once 'Zend/Http/Client/Exception.php'; try { $response = $client->request('POST'); - } catch(Zend_Http_Client_Exception $e) { + } catch (Zend_Http_Client_Exception $e) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e); + throw new Zend_Service_SlideShare_Exception( + "Service Request Failed: {$e->getMessage()}", 0, $e + ); } $sxe = simplexml_load_string($response->getBody()); - if($sxe->getName() == "SlideShareServiceError") { + if ($sxe->getName() == "SlideShareServiceError") { $message = (string)$sxe->Message[0]; list($code, $error_str) = explode(':', $message); require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception(trim($error_str), $code); + throw new Zend_Service_SlideShare_Exception(trim( + $error_str + ), $code); } - if(!$sxe->getName() == "SlideShowUploaded") { + if (!$sxe->getName() == "SlideShowUploaded") { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Unknown XML Respons Received"); + throw new Zend_Service_SlideShare_Exception( + 'Unknown XML Respons Received' + ); } $ss->setId((int)(string)$sxe->SlideShowID); @@ -381,21 +404,24 @@ * * @param int $ss_id The slide show ID * @return Zend_Service_SlideShare_SlideShow the Slideshow object + * @throws Zend_Service_SlideShare_Exception */ public function getSlideShow($ss_id) { $timestamp = time(); - $params = array('api_key' => $this->getApiKey(), - 'ts' => $timestamp, - 'hash' => sha1($this->getSharedSecret().$timestamp), - 'slideshow_id' => $ss_id); + $params = array( + 'api_key' => $this->getApiKey(), + 'ts' => $timestamp, + 'hash' => sha1($this->getSharedSecret() . $timestamp), + 'slideshow_id' => $ss_id + ); $cache = $this->getCacheObject(); $cache_key = md5("__zendslideshare_cache_$ss_id"); - if(!$retval = $cache->load($cache_key)) { + if (!$retval = $cache->load($cache_key)) { $client = $this->getHttpClient(); $client->setUri(self::SERVICE_GET_SHOW_URI); @@ -404,26 +430,31 @@ require_once 'Zend/Http/Client/Exception.php'; try { $response = $client->request('POST'); - } catch(Zend_Http_Client_Exception $e) { + } catch (Zend_Http_Client_Exception $e) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e); + throw new Zend_Service_SlideShare_Exception( + "Service Request Failed: {$e->getMessage()}", 0, $e + ); } $sxe = simplexml_load_string($response->getBody()); - if($sxe->getName() == "SlideShareServiceError") { + if ($sxe->getName() == "SlideShareServiceError") { $message = (string)$sxe->Message[0]; list($code, $error_str) = explode(':', $message); require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception(trim($error_str), $code); + throw new Zend_Service_SlideShare_Exception(trim( + $error_str + ), $code); } - if(!$sxe->getName() == 'Slideshows') { + if (!($sxe->getName() == 'Slideshow')) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception('Unknown XML Repsonse Received'); + throw new Zend_Service_SlideShare_Exception( + 'Unknown XML Repsonse Received' + ); } - - $retval = $this->_slideShowNodeToObject(clone $sxe->Slideshow[0]); + $retval = $this->_slideShowNodeToObject(clone $sxe); $cache->save($retval, $cache_key); } @@ -439,9 +470,13 @@ * @param int $limit The maximum number of slide shows to retrieve * @return array An array of Zend_Service_SlideShare_SlideShow objects */ - public function getSlideShowsByUsername($username, $offset = null, $limit = null) + public function getSlideShowsByUsername( + $username, $offset = null, $limit = null + ) { - return $this->_getSlideShowsByType('username_for', $username, $offset, $limit); + return $this->_getSlideShowsByType( + 'username_for', $username, $offset, $limit + ); } /** @@ -455,9 +490,9 @@ public function getSlideShowsByTag($tag, $offset = null, $limit = null) { - if(is_array($tag)) { + if (is_array($tag)) { $tmp = array(); - foreach($tag as $t) { + foreach ($tag as $t) { $tmp[] = "\"$t\""; } @@ -484,33 +519,35 @@ * Retrieves Zend_Service_SlideShare_SlideShow object arrays based on the type of * list desired * - * @param string $key The type of slide show object to retrieve - * @param string $value The specific search query for the slide show type to look up - * @param int $offset The offset of the list to start retrieving from - * @param int $limit The maximum number of slide shows to retrieve + * @param string $key The type of slide show object to retrieve + * @param string $value The specific search query for the slide show type to look up + * @param int $offset The offset of the list to start retrieving from + * @param int $limit The maximum number of slide shows to retrieve * @return array An array of Zend_Service_SlideShare_SlideShow objects + * @throws Zend_Service_SlideShare_Exception */ protected function _getSlideShowsByType($key, $value, $offset = null, $limit = null) { - $key = strtolower($key); - switch($key) { + switch ($key) { case 'username_for': $responseTag = 'User'; - $queryUri = self::SERVICE_GET_SHOW_BY_USER_URI; + $queryUri = self::SERVICE_GET_SHOW_BY_USER_URI; break; case 'group_name': $responseTag = 'Group'; - $queryUri = self::SERVICE_GET_SHOW_BY_GROUP_URI; + $queryUri = self::SERVICE_GET_SHOW_BY_GROUP_URI; break; case 'tag': $responseTag = 'Tag'; - $queryUri = self::SERVICE_GET_SHOW_BY_TAG_URI; + $queryUri = self::SERVICE_GET_SHOW_BY_TAG_URI; break; default: require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Invalid SlideShare Query"); + throw new Zend_Service_SlideShare_Exception( + 'Invalid SlideShare Query' + ); } $timestamp = time(); @@ -520,11 +557,11 @@ 'hash' => sha1($this->getSharedSecret().$timestamp), $key => $value); - if($offset !== null) { + if ($offset !== null) { $params['offset'] = (int)$offset; } - if($limit !== null) { + if ($limit !== null) { $params['limit'] = (int)$limit; } @@ -532,8 +569,7 @@ $cache_key = md5($key.$value.$offset.$limit); - if(!$retval = $cache->load($cache_key)) { - + if (!$retval = $cache->load($cache_key)) { $client = $this->getHttpClient(); $client->setUri($queryUri); @@ -542,29 +578,35 @@ require_once 'Zend/Http/Client/Exception.php'; try { $response = $client->request('POST'); - } catch(Zend_Http_Client_Exception $e) { + } catch (Zend_Http_Client_Exception $e) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e); + throw new Zend_Service_SlideShare_Exception( + "Service Request Failed: {$e->getMessage()}", 0, $e + ); } $sxe = simplexml_load_string($response->getBody()); - if($sxe->getName() == "SlideShareServiceError") { + if ($sxe->getName() == "SlideShareServiceError") { $message = (string)$sxe->Message[0]; list($code, $error_str) = explode(':', $message); require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception(trim($error_str), $code); + throw new Zend_Service_SlideShare_Exception( + trim($error_str), $code + ); } - if(!$sxe->getName() == $responseTag) { + if (!$sxe->getName() == $responseTag) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception('Unknown or Invalid XML Repsonse Received'); + throw new Zend_Service_SlideShare_Exception( + 'Unknown or Invalid XML Repsonse Received' + ); } $retval = array(); - foreach($sxe->children() as $node) { - if($node->getName() == 'Slideshow') { + foreach ($sxe->children() as $node) { + if ($node->getName() == 'Slideshow') { $retval[] = $this->_slideShowNodeToObject($node); } } @@ -581,12 +623,12 @@ * * @param SimpleXMLElement $node The input XML from the slideshare.net service * @return Zend_Service_SlideShare_SlideShow The resulting object + * @throws Zend_Service_SlideShare_Exception */ protected function _slideShowNodeToObject(SimpleXMLElement $node) { if($node->getName() == 'Slideshow') { - $ss = new Zend_Service_SlideShare_SlideShow(); $ss->setId((string)$node->ID); @@ -597,9 +639,8 @@ $ss->setStatus((string)$node->Status); $ss->setStatusDescription((string)$node->StatusDescription); - foreach(explode(",", (string)$node->Tags) as $tag) { - - if(!in_array($tag, $ss->getTags())) { + foreach (explode(",", (string)$node->Tags) as $tag) { + if (!in_array($tag, $ss->getTags())) { $ss->addTag($tag); } } @@ -610,10 +651,11 @@ $ss->setTranscript((string)$node->Transcript); return $ss; - } require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Was not provided the expected XML Node for processing"); + throw new Zend_Service_SlideShare_Exception( + 'Was not provided the expected XML Node for processing' + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SlideShare/Exception.php --- a/web/lib/Zend/Service/SlideShare/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/SlideShare/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SlideShare/SlideShow.php --- a/web/lib/Zend/Service/SlideShare/SlideShow.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/SlideShare/SlideShow.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SlideShow.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SlideShow.php 25283 2013-03-09 10:07:13Z frosch $ */ @@ -28,12 +28,11 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare_SlideShow { - /** * Status constant mapping for web service * @@ -328,7 +327,7 @@ /** * Sets the description for the Slide show * - * @param strign $desc The description of the slide show + * @param string $desc The description of the slide show * @return Zend_Service_SlideShare_SlideShow */ public function setDescription($desc) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SqlAzure/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/SqlAzure/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Exception + * @version $Id$ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** + * @see Zend_Service_Exception + */ +require_once 'Zend/Service/Exception.php'; + +/** + * @category Zend + * @package Zend_Service_SqlAzure + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_SqlAzure_Exception extends Zend_Service_Exception +{} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SqlAzure/Management/Client.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/SqlAzure/Management/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,609 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Http_Client + */ + require_once 'Zend/Http/Client.php'; + + /** + * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract + */ + require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php'; + + /** + * @see Zend_Service_SqlAzure_Management_ServerInstance + */ + require_once 'Zend/Service/SqlAzure/Management/ServerInstance.php'; + + /** + * @see Zend_Service_SqlAzure_Management_FirewallRuleInstance + */ + require_once 'Zend/Service/SqlAzure/Management/FirewallRuleInstance.php'; + +/** + * @category Zend + * @package Zend_Service_SqlAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_SqlAzure_Management_Client +{ + /** + * Management service URL + */ + const URL_MANAGEMENT = "https://management.database.windows.net:8443"; + + /** + * Operations + */ + const OP_OPERATIONS = "operations"; + const OP_SERVERS = "servers"; + const OP_FIREWALLRULES = "firewallrules"; + + /** + * Current API version + * + * @var string + */ + protected $_apiVersion = '1.0'; + + /** + * Subscription ID + * + * @var string + */ + protected $_subscriptionId = ''; + + /** + * Management certificate path (.PEM) + * + * @var string + */ + protected $_certificatePath = ''; + + /** + * Management certificate passphrase + * + * @var string + */ + protected $_certificatePassphrase = ''; + + /** + * Zend_Http_Client channel used for communication with REST services + * + * @var Zend_Http_Client + */ + protected $_httpClientChannel = null; + + /** + * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance + * + * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract + */ + protected $_retryPolicy = null; + + /** + * Returns the last request ID + * + * @var string + */ + protected $_lastRequestId = null; + + /** + * Creates a new Zend_Service_SqlAzure_Management instance + * + * @param string $subscriptionId Subscription ID + * @param string $certificatePath Management certificate path (.PEM) + * @param string $certificatePassphrase Management certificate passphrase + * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests + */ + public function __construct( + $subscriptionId, + $certificatePath, + $certificatePassphrase, + Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null + ) { + $this->_subscriptionId = $subscriptionId; + $this->_certificatePath = $certificatePath; + $this->_certificatePassphrase = $certificatePassphrase; + + $this->_retryPolicy = $retryPolicy; + if (is_null($this->_retryPolicy)) { + $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry(); + } + + // Setup default Zend_Http_Client channel + $options = array( + 'adapter' => 'Zend_Http_Client_Adapter_Socket', + 'ssltransport' => 'ssl', + 'sslcert' => $this->_certificatePath, + 'sslpassphrase' => $this->_certificatePassphrase, + 'sslusecontext' => true, + ); + if (function_exists('curl_init')) { + // Set cURL options if cURL is used afterwards + $options['curloptions'] = array( + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_TIMEOUT => 120, + ); + } + $this->_httpClientChannel = new Zend_Http_Client(null, $options); + } + + /** + * Set the HTTP client channel to use + * + * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name. + */ + public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Socket') + { + $this->_httpClientChannel->setAdapter($adapterInstance); + } + + /** + * Retrieve HTTP client channel + * + * @return Zend_Http_Client_Adapter_Interface + */ + public function getHttpClientChannel() + { + return $this->_httpClientChannel; + } + + /** + * Returns the Windows Azure subscription ID + * + * @return string + */ + public function getSubscriptionId() + { + return $this->_subscriptionId; + } + + /** + * Returns the last request ID. + * + * @return string + */ + public function getLastRequestId() + { + return $this->_lastRequestId; + } + + /** + * Get base URL for creating requests + * + * @return string + */ + public function getBaseUrl() + { + return self::URL_MANAGEMENT . '/' . $this->_subscriptionId; + } + + /** + * Perform request using Zend_Http_Client channel + * + * @param string $path Path + * @param string $queryString Query string + * @param string $httpVerb HTTP verb the request will use + * @param array $headers x-ms headers to add + * @param mixed $rawData Optional RAW HTTP data to be sent over the wire + * @return Zend_Http_Response + */ + protected function _performRequest( + $path = '/', + $queryString = '', + $httpVerb = Zend_Http_Client::GET, + $headers = array(), + $rawData = null + ) { + // Clean path + if (strpos($path, '/') !== 0) { + $path = '/' . $path; + } + + // Clean headers + if (is_null($headers)) { + $headers = array(); + } + + // Ensure cUrl will also work correctly: + // - disable Content-Type if required + // - disable Expect: 100 Continue + if (!isset($headers["Content-Type"])) { + $headers["Content-Type"] = ''; + } + //$headers["Expect"] = ''; + + // Add version header + $headers['x-ms-version'] = $this->_apiVersion; + + // URL encoding + $path = self::urlencode($path); + $queryString = self::urlencode($queryString); + + // Generate URL and sign request + $requestUrl = $this->getBaseUrl() . $path . $queryString; + $requestHeaders = $headers; + + // Prepare request + $this->_httpClientChannel->resetParameters(true); + $this->_httpClientChannel->setUri($requestUrl); + $this->_httpClientChannel->setHeaders($requestHeaders); + $this->_httpClientChannel->setRawData($rawData); + + // Execute request + $response = $this->_retryPolicy->execute( + array($this->_httpClientChannel, 'request'), + array($httpVerb) + ); + + // Store request id + $this->_lastRequestId = $response->getHeader('x-ms-request-id'); + + return $response; + } + + /** + * Parse result from Zend_Http_Response + * + * @param Zend_Http_Response $response Response from HTTP call + * @return object + * @throws Zend_Service_WindowsAzure_Exception + */ + protected function _parseResponse(Zend_Http_Response $response = null) + { + if (is_null($response)) { + require_once 'Zend/Service/SqlAzure/Exception.php'; + throw new Zend_Service_SqlAzure_Exception('Response should not be null.'); + } + + $xml = @simplexml_load_string($response->getBody()); + + if ($xml !== false) { + // Fetch all namespaces + $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); + + // Register all namespace prefixes + foreach ($namespaces as $prefix => $ns) { + if ($prefix != '') { + $xml->registerXPathNamespace($prefix, $ns); + } + } + } + + return $xml; + } + + /** + * URL encode function + * + * @param string $value Value to encode + * @return string Encoded value + */ + public static function urlencode($value) + { + return str_replace(' ', '%20', $value); + } + + /** + * Builds a query string from an array of elements + * + * @param array Array of elements + * @return string Assembled query string + */ + public static function createQueryStringFromArray($queryString) + { + return count($queryString) > 0 ? '?' . implode('&', $queryString) : ''; + } + + /** + * Get error message from Zend_Http_Response + * + * @param Zend_Http_Response $response Repsonse + * @param string $alternativeError Alternative error message + * @return string + */ + protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.') + { + $response = $this->_parseResponse($response); + if ($response && $response->Message) { + return (string)$response->Message; + } else { + return $alternativeError; + } + } + + /** + * The Create Server operation adds a new SQL Azure server to a subscription. + * + * @param string $administratorLogin Administrator login. + * @param string $administratorPassword Administrator password. + * @param string $location Location of the server. + * @return Zend_Service_SqlAzure_Management_ServerInstance Server information. + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function createServer($administratorLogin, $administratorPassword, $location) + { + if ($administratorLogin == '' || is_null($administratorLogin)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Administrator login should be specified.'); + } + if ($administratorPassword == '' || is_null($administratorPassword)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Administrator password should be specified.'); + } + if (is_null($location) && is_null($affinityGroup)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Please specify a location for the server.'); + } + + $response = $this->_performRequest(self::OP_SERVERS, '', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<Server xmlns="http://schemas.microsoft.com/sqlazure/2010/12/"><AdministratorLogin>' . $administratorLogin . '</AdministratorLogin><AdministratorLoginPassword>' . $administratorPassword . '</AdministratorLoginPassword><Location>' . $location . '</Location></Server>'); + + if ($response->isSuccessful()) { + $xml = $this->_parseResponse($response); + + return new Zend_Service_SqlAzure_Management_ServerInstance( + (string)$xml, + $administratorLogin, + $location + ); + } else { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Servers operation enumerates SQL Azure servers that are provisioned for a subscription. + * + * @return array An array of Zend_Service_SqlAzure_Management_ServerInstance. + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function listServers() + { + $response = $this->_performRequest(self::OP_SERVERS); + + if ($response->isSuccessful()) { + $xml = $this->_parseResponse($response); + $xmlServices = null; + + if (!$xml->Server) { + return array(); + } + if (count($xml->Server) > 1) { + $xmlServices = $xml->Server; + } else { + $xmlServices = array($xml->Server); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_SqlAzure_Management_ServerInstance( + (string)$xmlServices[$i]->Name, + (string)$xmlServices[$i]->AdministratorLogin, + (string)$xmlServices[$i]->Location + ); + } + } + return $services; + } else { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Drop Server operation drops a SQL Azure server from a subscription. + * + * @param string $serverName Server to drop. + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function dropServer($serverName) + { + if ($serverName == '' || is_null($serverName)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.'); + } + + $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName, '', Zend_Http_Client::DELETE); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Set Server Administrator Password operation sets the administrative password of a SQL Azure server for a subscription. + * + * @param string $serverName Server to set password for. + * @param string $administratorPassword Administrator password. + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function setAdministratorPassword($serverName, $administratorPassword) + { + if ($serverName == '' || is_null($serverName)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.'); + } + if ($administratorPassword == '' || is_null($administratorPassword)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Administrator password should be specified.'); + } + + $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName, '?op=ResetPassword', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<AdministratorLoginPassword xmlns="http://schemas.microsoft.com/sqlazure/2010/12/">' . $administratorPassword . '</AdministratorLoginPassword>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Set Server Firewall Rule operation updates an existing firewall rule or adds a new firewall rule for a SQL Azure server that belongs to a subscription. + * + * @param string $serverName Server name. + * @param string $ruleName Firewall rule name. + * @param string $startIpAddress Start IP address. + * @param string $endIpAddress End IP address. + * @return Zend_Service_SqlAzure_Management_FirewallRuleInstance + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function createFirewallRule($serverName, $ruleName, $startIpAddress, $endIpAddress) + { + if ($serverName == '' || is_null($serverName)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.'); + } + if ($ruleName == '' || is_null($ruleName)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Rule name should be specified.'); + } + if ($startIpAddress == '' || is_null($startIpAddress) || !filter_var($startIpAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Start IP address should be specified.'); + } + if ($endIpAddress == '' || is_null($endIpAddress) || !filter_var($endIpAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('End IP address should be specified.'); + } + + $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES . '/' . $ruleName, '', + Zend_Http_Client::PUT, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<FirewallRule xmlns="http://schemas.microsoft.com/sqlazure/2010/12/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.microsoft.com/sqlazure/2010/12/ FirewallRule.xsd"><StartIpAddress>' . $startIpAddress . '</StartIpAddress><EndIpAddress>' . $endIpAddress . '</EndIpAddress></FirewallRule>'); + + if ($response->isSuccessful()) { + + return new Zend_Service_SqlAzure_Management_FirewallRuleInstance( + $ruleName, + $startIpAddress, + $endIpAddress + ); + } else { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Server Firewall Rules operation retrieves a list of all the firewall rules for a SQL Azure server that belongs to a subscription. + * + * @param string $serverName Server name. + * @return Array of Zend_Service_SqlAzure_Management_FirewallRuleInstance. + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function listFirewallRules($serverName) + { + if ($serverName == '' || is_null($serverName)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.'); + } + + $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES); + + if ($response->isSuccessful()) { + $xml = $this->_parseResponse($response); + $xmlServices = null; + + if (!$xml->FirewallRule) { + return array(); + } + if (count($xml->FirewallRule) > 1) { + $xmlServices = $xml->FirewallRule; + } else { + $xmlServices = array($xml->FirewallRule); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_SqlAzure_Management_FirewallRuleInstance( + (string)$xmlServices[$i]->Name, + (string)$xmlServices[$i]->StartIpAddress, + (string)$xmlServices[$i]->EndIpAddress + ); + } + } + return $services; + } else { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Delete Server Firewall Rule operation deletes a firewall rule from a SQL Azure server that belongs to a subscription. + * + * @param string $serverName Server name. + * @param string $ruleName Rule name. + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function deleteFirewallRule($serverName, $ruleName) + { + if ($serverName == '' || is_null($serverName)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.'); + } + if ($ruleName == '' || is_null($ruleName)) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception('Rule name should be specified.'); + } + + $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES . '/' . $ruleName, '', + Zend_Http_Client::DELETE); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * Creates a firewall rule for Microsoft Services. This is required if access to SQL Azure is required from other services like Windows Azure. + * + * @param string $serverName Server name. + * @param boolean $allowAccess Allow access from other Microsoft Services? + * @throws Zend_Service_SqlAzure_Management_Exception + */ + public function createFirewallRuleForMicrosoftServices($serverName, $allowAccess) + { + if ($allowAccess) { + $this->createFirewallRule($serverName, 'MicrosoftServices', '0.0.0.0', '0.0.0.0'); + } else { + $this->deleteFirewallRule($serverName, 'MicrosoftServices'); + } + } + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SqlAzure/Management/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/SqlAzure/Management/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + + require_once 'Zend/Service/SqlAzure/Exception.php'; + +/** + * @category Zend + * @package Zend_Service_SqlAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_SqlAzure_Management_Exception + extends Zend_Service_SqlAzure_Exception +{ +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,57 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_SqlAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_SqlAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Name The name of the firewall rule. + * @property string $StartIpAddress The start IP address. + * @property string $EndIpAddress The end IP address. + */ +class Zend_Service_SqlAzure_Management_FirewallRuleInstance + extends Zend_Service_SqlAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $name The name of the firewall rule. + * @param string $startIpAddress The start IP address. + * @param string $endIpAddress The end IP address. + */ + public function __construct($name, $startIpAddress, $endIpAddress) + { + $this->_data = array( + 'name' => $name, + 'startipaddress' => $startIpAddress, + 'endipaddress' => $endIpAddress + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SqlAzure/Management/ServerInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/SqlAzure/Management/ServerInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,59 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_SqlAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_SqlAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Name The name of the server. + * @property string $DnsName The DNS name of the server. + * @property string $AdministratorLogin The administrator login. + * @property string $Location The location of the server in Windows Azure. + */ +class Zend_Service_SqlAzure_Management_ServerInstance + extends Zend_Service_SqlAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $name The name of the server. + * @param string $administratorLogin The administrator login. + * @param string $location The location of the server in Windows Azure. + */ + public function __construct($name, $administratorLogin, $location) + { + $this->_data = array( + 'name' => $name, + 'dnsname' => $name . '.database.windows.net', + 'administratorlogin' => $administratorLogin, + 'location' => $location + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,67 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + + +/** + * @category Zend + * @package Zend_Service_SqlAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +abstract class Zend_Service_SqlAzure_Management_ServiceEntityAbstract +{ + /** + * Data + * + * @var array + */ + protected $_data = null; + + /** + * Magic overload for setting properties + * + * @param string $name Name of the property + * @param string $value Value to set + */ + public function __set($name, $value) { + if (array_key_exists(strtolower($name), $this->_data)) { + $this->_data[strtolower($name)] = $value; + return; + } + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception("Unknown property: " . $name); + } + + /** + * Magic overload for getting properties + * + * @param string $name Name of the property + */ + public function __get($name) { + if (array_key_exists(strtolower($name), $this->_data)) { + return $this->_data[strtolower($name)]; + } + require_once 'Zend/Service/SqlAzure/Management/Exception.php'; + throw new Zend_Service_SqlAzure_Management_Exception("Unknown property: " . $name); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/StrikeIron.php --- a/web/lib/Zend/Service/StrikeIron.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/StrikeIron.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StrikeIron.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StrikeIron.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/StrikeIron/Base.php --- a/web/lib/Zend/Service/StrikeIron/Base.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/StrikeIron/Base.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Base @@ -193,10 +193,10 @@ * on what was originally called. * * @see __call() - * @param $result Raw result returned from SOAPClient_>__soapCall() - * @param $method Method name that was passed to SOAPClient->__soapCall() - * @param $params Method parameters that were passed to SOAPClient->__soapCall() - * @return mixed Transformed result + * @param object $result Raw result returned from SOAPClient_>__soapCall() + * @param string $method Method name that was passed to SOAPClient->__soapCall() + * @param array $params Method parameters that were passed to SOAPClient->__soapCall() + * @return mixed Transformed result */ protected function _transformResult($result, $method, $params) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/StrikeIron/Decorator.php --- a/web/lib/Zend/Service/StrikeIron/Decorator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/StrikeIron/Decorator.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decorator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Decorator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Decorator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/StrikeIron/Exception.php --- a/web/lib/Zend/Service/StrikeIron/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/StrikeIron/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/StrikeIron/SalesUseTaxBasic.php --- a/web/lib/Zend/Service/StrikeIron/SalesUseTaxBasic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/StrikeIron/SalesUseTaxBasic.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SalesUseTaxBasic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SalesUseTaxBasic.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Service_StrikeIron_Base */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_SalesUseTaxBasic extends Zend_Service_StrikeIron_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/StrikeIron/USAddressVerification.php --- a/web/lib/Zend/Service/StrikeIron/USAddressVerification.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/StrikeIron/USAddressVerification.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: USAddressVerification.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: USAddressVerification.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Service_StrikeIron_Base */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_USAddressVerification extends Zend_Service_StrikeIron_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/StrikeIron/ZipCodeInfo.php --- a/web/lib/Zend/Service/StrikeIron/ZipCodeInfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/StrikeIron/ZipCodeInfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZipCodeInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ZipCodeInfo.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Service_StrikeIron_Base */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_ZipCodeInfo extends Zend_Service_StrikeIron_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati.php --- a/web/lib/Zend/Service/Technorati.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Technorati.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Technorati.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/Author.php --- a/web/lib/Zend/Service/Technorati/Author.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/Author.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Author.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Author diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/BlogInfoResult.php --- a/web/lib/Zend/Service/Technorati/BlogInfoResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/BlogInfoResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlogInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BlogInfoResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_BlogInfoResult diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/CosmosResult.php --- a/web/lib/Zend/Service/Technorati/CosmosResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/CosmosResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CosmosResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CosmosResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/CosmosResultSet.php --- a/web/lib/Zend/Service/Technorati/CosmosResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/CosmosResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CosmosResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CosmosResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/DailyCountsResult.php --- a/web/lib/Zend/Service/Technorati/DailyCountsResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/DailyCountsResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DailyCountsResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DailyCountsResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_DailyCountsResult extends Zend_Service_Technorati_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/DailyCountsResultSet.php --- a/web/lib/Zend/Service/Technorati/DailyCountsResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/DailyCountsResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DailyCountsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DailyCountsResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technorati_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/Exception.php --- a/web/lib/Zend/Service/Technorati/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/GetInfoResult.php --- a/web/lib/Zend/Service/Technorati/GetInfoResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/GetInfoResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GetInfoResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_GetInfoResult diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/KeyInfoResult.php --- a/web/lib/Zend/Service/Technorati/KeyInfoResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/KeyInfoResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: KeyInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: KeyInfoResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_KeyInfoResult diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/Result.php --- a/web/lib/Zend/Service/Technorati/Result.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/Result.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/ResultSet.php --- a/web/lib/Zend/Service/Technorati/ResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/ResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/SearchResult.php --- a/web/lib/Zend/Service/Technorati/SearchResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/SearchResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/SearchResultSet.php --- a/web/lib/Zend/Service/Technorati/SearchResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/SearchResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_SearchResultSet extends Zend_Service_Technorati_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/TagResult.php --- a/web/lib/Zend/Service/Technorati/TagResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/TagResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/TagResultSet.php --- a/web/lib/Zend/Service/Technorati/TagResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/TagResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagResultSet extends Zend_Service_Technorati_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/TagsResult.php --- a/web/lib/Zend/Service/Technorati/TagsResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/TagsResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagsResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagsResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagsResult extends Zend_Service_Technorati_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/TagsResultSet.php --- a/web/lib/Zend/Service/Technorati/TagsResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/TagsResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagsResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagsResultSet extends Zend_Service_Technorati_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/Utils.php --- a/web/lib/Zend/Service/Technorati/Utils.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/Utils.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utils.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Utils.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Utils diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Technorati/Weblog.php --- a/web/lib/Zend/Service/Technorati/Weblog.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Technorati/Weblog.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weblog.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weblog.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Weblog diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Twitter.php --- a/web/lib/Zend/Service/Twitter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Twitter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,20 +15,20 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Twitter.php 23312 2010-11-08 19:45:00Z matthew $ + * @version $Id: Twitter.php 25288 2013-03-13 13:36:39Z matthew $ */ /** - * @see Zend_Rest_Client + * @see Zend_Http_Client */ -require_once 'Zend/Rest/Client.php'; +require_once 'Zend/Http/Client.php'; /** - * @see Zend_Rest_Client_Result + * @see Zend_Http_CookieJar */ -require_once 'Zend/Rest/Client/Result.php'; +require_once 'Zend/Http/CookieJar.php'; /** * @see Zend_Oauth_Consumer @@ -36,14 +36,33 @@ require_once 'Zend/Oauth/Consumer.php'; /** + * @see Zend_Oauth_Token_Access + */ +require_once 'Zend/Oauth/Token/Access.php'; + +/** + * @see Zend_Service_Twitter_Response + */ +require_once 'Zend/Service/Twitter/Response.php'; + +/** * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Service_Twitter extends Zend_Rest_Client +class Zend_Service_Twitter { + /** + * Base URI for all API calls + */ + const API_BASE_URI = 'https://api.twitter.com/1.1/'; + + /** + * OAuth Endpoint + */ + const OAUTH_BASE_URI = 'https://api.twitter.com/oauth'; /** * 246 is the current limit for a status message, 140 characters are displayed @@ -54,181 +73,165 @@ * This should be reviewed in the future... */ const STATUS_MAX_CHARACTERS = 246; - + /** - * OAuth Endpoint + * @var array */ - const OAUTH_BASE_URI = 'http://twitter.com/oauth'; - - /** - * @var Zend_Http_CookieJar - */ - protected $_cookieJar; - + protected $cookieJar; + /** * Date format for 'since' strings * * @var string */ - protected $_dateFormat = 'D, d M Y H:i:s T'; - + protected $dateFormat = 'D, d M Y H:i:s T'; + /** - * Username - * - * @var string + * @var Zend_Http_Client */ - protected $_username; - + protected $httpClient = null; + /** * Current method type (for method proxying) * * @var string */ - protected $_methodType; - + protected $methodType; + /** - * Zend_Oauth Consumer + * Oauth Consumer * * @var Zend_Oauth_Consumer */ - protected $_oauthConsumer = null; - + protected $oauthConsumer = null; + /** * Types of API methods * * @var array */ - protected $_methodTypes = array( - 'status', - 'user', - 'directMessage', - 'friendship', + protected $methodTypes = array( 'account', - 'favorite', - 'block' + 'application', + 'blocks', + 'directmessages', + 'favorites', + 'friendships', + 'search', + 'statuses', + 'users', ); - + /** * Options passed to constructor * * @var array */ - protected $_options = array(); + protected $options = array(); /** - * Local HTTP Client cloned from statically set client + * Username * - * @var Zend_Http_Client + * @var string */ - protected $_localHttpClient = null; + protected $username; /** * Constructor * - * @param array $options Optional options array - * @return void + * @param null|array|Zend_Config $options + * @param null|Zend_Oauth_Consumer $consumer + * @param null|Zend_Http_Client $httpClient */ - public function __construct($options = null, Zend_Oauth_Consumer $consumer = null) + public function __construct($options = null, Zend_Oauth_Consumer $consumer = null, Zend_Http_Client $httpClient = null) { - $this->setUri('http://api.twitter.com'); - if (!is_array($options)) $options = array(); - $options['siteUrl'] = self::OAUTH_BASE_URI; if ($options instanceof Zend_Config) { $options = $options->toArray(); } - $this->_options = $options; + if (!is_array($options)) { + $options = array(); + } + + $this->options = $options; + if (isset($options['username'])) { $this->setUsername($options['username']); } - if (isset($options['accessToken']) - && $options['accessToken'] instanceof Zend_Oauth_Token_Access) { - $this->setLocalHttpClient($options['accessToken']->getHttpClient($options)); - } else { - $this->setLocalHttpClient(clone self::getHttpClient()); - if ($consumer === null) { - $this->_oauthConsumer = new Zend_Oauth_Consumer($options); - } else { - $this->_oauthConsumer = $consumer; - } + + $accessToken = false; + if (isset($options['accessToken'])) { + $accessToken = $options['accessToken']; + } elseif (isset($options['access_token'])) { + $accessToken = $options['access_token']; } - } + + $oauthOptions = array(); + if (isset($options['oauthOptions'])) { + $oauthOptions = $options['oauthOptions']; + } elseif (isset($options['oauth_options'])) { + $oauthOptions = $options['oauth_options']; + } + $oauthOptions['siteUrl'] = self::OAUTH_BASE_URI; + + $httpClientOptions = array(); + if (isset($options['httpClientOptions'])) { + $httpClientOptions = $options['httpClientOptions']; + } elseif (isset($options['http_client_options'])) { + $httpClientOptions = $options['http_client_options']; + } - /** - * Set local HTTP client as distinct from the static HTTP client - * as inherited from Zend_Rest_Client. - * - * @param Zend_Http_Client $client - * @return self - */ - public function setLocalHttpClient(Zend_Http_Client $client) - { - $this->_localHttpClient = $client; - $this->_localHttpClient->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8'); - return $this; - } - - /** - * Get the local HTTP client as distinct from the static HTTP client - * inherited from Zend_Rest_Client - * - * @return Zend_Http_Client - */ - public function getLocalHttpClient() - { - return $this->_localHttpClient; - } - - /** - * Checks for an authorised state - * - * @return bool - */ - public function isAuthorised() - { - if ($this->getLocalHttpClient() instanceof Zend_Oauth_Client) { - return true; + // If we have an OAuth access token, use the HTTP client it provides + if ($accessToken && is_array($accessToken) + && (isset($accessToken['token']) && isset($accessToken['secret'])) + ) { + $token = new Zend_Oauth_Token_Access(); + $token->setToken($accessToken['token']); + $token->setTokenSecret($accessToken['secret']); + $accessToken = $token; + } + if ($accessToken && $accessToken instanceof Zend_Oauth_Token_Access) { + $oauthOptions['token'] = $accessToken; + $this->setHttpClient($accessToken->getHttpClient($oauthOptions, self::OAUTH_BASE_URI, $httpClientOptions)); + return; } - return false; - } - /** - * Retrieve username - * - * @return string - */ - public function getUsername() - { - return $this->_username; - } + // See if we were passed an http client + if (isset($options['httpClient']) && null === $httpClient) { + $httpClient = $options['httpClient']; + } elseif (isset($options['http_client']) && null === $httpClient) { + $httpClient = $options['http_client']; + } + if ($httpClient instanceof Zend_Http_Client) { + $this->httpClient = $httpClient; + } else { + $this->setHttpClient(new Zend_Http_Client(null, $httpClientOptions)); + } - /** - * Set username - * - * @param string $value - * @return Zend_Service_Twitter - */ - public function setUsername($value) - { - $this->_username = $value; - return $this; + // Set the OAuth consumer + if ($consumer === null) { + $consumer = new Zend_Oauth_Consumer($oauthOptions); + } + $this->oauthConsumer = $consumer; } /** * Proxy service methods * * @param string $type - * @return Zend_Service_Twitter - * @throws Zend_Service_Twitter_Exception If method not in method types list + * @return Twitter + * @throws Exception\DomainException If method not in method types list */ public function __get($type) { - if (!in_array($type, $this->_methodTypes)) { - include_once 'Zend/Service/Twitter/Exception.php'; + $type = strtolower($type); + $type = str_replace('_', '', $type); + if (!in_array($type, $this->methodTypes)) { + require_once 'Zend/Service/Twitter/Exception.php'; throw new Zend_Service_Twitter_Exception( 'Invalid method type "' . $type . '"' ); } - $this->_methodType = $type; + $this->methodType = $type; return $this; } @@ -238,26 +241,28 @@ * @param string $method * @param array $params * @return mixed - * @throws Zend_Service_Twitter_Exception if unable to find method + * @throws Exception\BadMethodCallException if unable to find method */ public function __call($method, $params) { - if (method_exists($this->_oauthConsumer, $method)) { - $return = call_user_func_array(array($this->_oauthConsumer, $method), $params); + if (method_exists($this->oauthConsumer, $method)) { + $return = call_user_func_array(array($this->oauthConsumer, $method), $params); if ($return instanceof Zend_Oauth_Token_Access) { - $this->setLocalHttpClient($return->getHttpClient($this->_options)); + $this->setHttpClient($return->getHttpClient($this->options)); } return $return; } - if (empty($this->_methodType)) { - include_once 'Zend/Service/Twitter/Exception.php'; + if (empty($this->methodType)) { + require_once 'Zend/Service/Twitter/Exception.php'; throw new Zend_Service_Twitter_Exception( 'Invalid method "' . $method . '"' ); } - $test = $this->_methodType . ucfirst($method); + + $test = str_replace('_', '', strtolower($method)); + $test = $this->methodType . $test; if (!method_exists($this, $test)) { - include_once 'Zend/Service/Twitter/Exception.php'; + require_once 'Zend/Service/Twitter/Exception.php'; throw new Zend_Service_Twitter_Exception( 'Invalid method "' . $test . '"' ); @@ -267,251 +272,543 @@ } /** - * Initialize HTTP authentication + * Set HTTP client * - * @return void + * @param Zend_Http_Client $client + * @return self */ - protected function _init() + public function setHttpClient(Zend_Http_Client $client) { - if (!$this->isAuthorised() && $this->getUsername() !== null) { - require_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception( - 'Twitter session is unauthorised. You need to initialize ' - . 'Zend_Service_Twitter with an OAuth Access Token or use ' - . 'its OAuth functionality to obtain an Access Token before ' - . 'attempting any API actions that require authorisation' - ); + $this->httpClient = $client; + $this->httpClient->setHeaders(array('Accept-Charset' => 'ISO-8859-1,utf-8')); + return $this; + } + + /** + * Get the HTTP client + * + * Lazy loads one if none present + * + * @return Zend_Http_Client + */ + public function getHttpClient() + { + if (null === $this->httpClient) { + $this->setHttpClient(new Zend_Http_Client()); } - $client = $this->_localHttpClient; - $client->resetParameters(); - if (null == $this->_cookieJar) { - $client->setCookieJar(); - $this->_cookieJar = $client->getCookieJar(); - } else { - $client->setCookieJar($this->_cookieJar); - } + return $this->httpClient; + } + + /** + * Retrieve username + * + * @return string + */ + public function getUsername() + { + return $this->username; } /** - * Set date header + * Set username * - * @param int|string $value - * @deprecated Not supported by Twitter since April 08, 2009 - * @return void + * @param string $value + * @return self + */ + public function setUsername($value) + { + $this->username = $value; + return $this; + } + + /** + * Checks for an authorised state + * + * @return bool */ - protected function _setDate($value) + public function isAuthorised() + { + if ($this->getHttpClient() instanceof Zend_Oauth_Client) { + return true; + } + return false; + } + + /** + * Verify Account Credentials + * + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function accountVerifyCredentials() { - if (is_int($value)) { - $date = date($this->_dateFormat, $value); - } else { - $date = date($this->_dateFormat, strtotime($value)); - } - $this->_localHttpClient->setHeaders('If-Modified-Since', $date); + $this->init(); + $response = $this->get('account/verify_credentials'); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Returns the number of api requests you have left per hour. + * + * @todo Have a separate payload object to represent rate limits + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function applicationRateLimitStatus() + { + $this->init(); + $response = $this->get('application/rate_limit_status'); + return new Zend_Service_Twitter_Response($response); } /** - * Public Timeline status + * Blocks the user specified in the ID parameter as the authenticating user. + * Destroys a friendship to the blocked user if it exists. * - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @param integer|string $id The ID or screen name of a user to block. + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function blocksCreate($id) + { + $this->init(); + $path = 'blocks/create'; + $params = $this->createUserParameter($id, array()); + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Un-blocks the user specified in the ID parameter for the authenticating user + * + * @param integer|string $id The ID or screen_name of the user to un-block. + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function statusPublicTimeline() + public function blocksDestroy($id) { - $this->_init(); - $path = '/1/statuses/public_timeline.xml'; - $response = $this->_get($path); - return new Zend_Rest_Client_Result($response->getBody()); + $this->init(); + $path = 'blocks/destroy'; + $params = $this->createUserParameter($id, array()); + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Returns an array of user ids that the authenticating user is blocking + * + * @param integer $cursor Optional. Specifies the cursor position at which to begin listing ids; defaults to first "page" of results. + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function blocksIds($cursor = -1) + { + $this->init(); + $path = 'blocks/ids'; + $response = $this->get($path, array('cursor' => $cursor)); + return new Zend_Service_Twitter_Response($response); } /** - * Friend Timeline Status + * Returns an array of user objects that the authenticating user is blocking * - * $params may include one or more of the following keys - * - id: ID of a friend whose timeline you wish to receive - * - count: how many statuses to return - * - since_id: return results only after the specific tweet - * - page: return page X of results + * @param integer $cursor Optional. Specifies the cursor position at which to begin listing ids; defaults to first "page" of results. + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function blocksList($cursor = -1) + { + $this->init(); + $path = 'blocks/list'; + $response = $this->get($path, array('cursor' => $cursor)); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Destroy a direct message * - * @param array $params + * @param int $id ID of message to destroy * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return void + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function statusFriendsTimeline(array $params = array()) + public function directMessagesDestroy($id) { - $this->_init(); - $path = '/1/statuses/friends_timeline'; - $_params = array(); - foreach ($params as $key => $value) { + $this->init(); + $path = 'direct_messages/destroy'; + $params = array('id' => $this->validInteger($id)); + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Retrieve direct messages for the current user + * + * $options may include one or more of the following keys + * - count: return page X of results + * - since_id: return statuses only greater than the one specified + * - max_id: return statuses with an ID less than (older than) or equal to that specified + * - include_entities: setting to false will disable embedded entities + * - skip_status:setting to true, "t", or 1 will omit the status in returned users + * + * @param array $options + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function directMessagesMessages(array $options = array()) + { + $this->init(); + $path = 'direct_messages'; + $params = array(); + foreach ($options as $key => $value) { switch (strtolower($key)) { case 'count': - $count = (int) $value; - if (0 >= $count) { - $count = 1; - } elseif (200 < $count) { - $count = 200; - } - $_params['count'] = (int) $count; + $params['count'] = (int) $value; break; case 'since_id': - $_params['since_id'] = $this->_validInteger($value); + $params['since_id'] = $this->validInteger($value); + break; + case 'max_id': + $params['max_id'] = $this->validInteger($value); break; - case 'page': - $_params['page'] = (int) $value; + case 'include_entities': + $params['include_entities'] = (bool) $value; + break; + case 'skip_status': + $params['skip_status'] = (bool) $value; break; default: break; } } - $path .= '.xml'; - $response = $this->_get($path, $_params); - return new Zend_Rest_Client_Result($response->getBody()); + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Send a direct message to a user + * + * @param int|string $user User to whom to send message + * @param string $text Message to send to user + * @throws Exception\InvalidArgumentException if message is empty + * @throws Exception\OutOfRangeException if message is too long + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function directMessagesNew($user, $text) + { + $this->init(); + $path = 'direct_messages/new'; + + $len = iconv_strlen($text, 'UTF-8'); + if (0 == $len) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Direct message must contain at least one character' + ); + } elseif (140 < $len) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Direct message must contain no more than 140 characters' + ); + } + + $params = $this->createUserParameter($user, array()); + $params['text'] = $text; + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); } /** - * User Timeline status + * Retrieve list of direct messages sent by current user + * + * $options may include one or more of the following keys + * - count: return page X of results + * - page: return starting at page + * - since_id: return statuses only greater than the one specified + * - max_id: return statuses with an ID less than (older than) or equal to that specified + * - include_entities: setting to false will disable embedded entities * - * $params may include one or more of the following keys - * - id: ID of a friend whose timeline you wish to receive - * - since_id: return results only after the tweet id specified - * - page: return page X of results - * - count: how many statuses to return - * - max_id: returns only statuses with an ID less than or equal to the specified ID - * - user_id: specifies the ID of the user for whom to return the user_timeline - * - screen_name: specfies the screen name of the user for whom to return the user_timeline - * - include_rts: whether or not to return retweets - * - trim_user: whether to return just the user ID or a full user object; omit to return full object - * - include_entities: whether or not to return entities nodes with tweet metadata - * + * @param array $options * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function statusUserTimeline(array $params = array()) + public function directMessagesSent(array $options = array()) { - $this->_init(); - $path = '/1/statuses/user_timeline'; - $_params = array(); - foreach ($params as $key => $value) { + $this->init(); + $path = 'direct_messages/sent'; + $params = array(); + foreach ($options as $key => $value) { switch (strtolower($key)) { - case 'id': - $path .= '/' . $value; + case 'count': + $params['count'] = (int) $value; break; case 'page': - $_params['page'] = (int) $value; + $params['page'] = (int) $value; + break; + case 'since_id': + $params['since_id'] = $this->validInteger($value); + break; + case 'max_id': + $params['max_id'] = $this->validInteger($value); + break; + case 'include_entities': + $params['include_entities'] = (bool) $value; + break; + default: + break; + } + } + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Mark a status as a favorite + * + * @param int $id Status ID you want to mark as a favorite + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function favoritesCreate($id) + { + $this->init(); + $path = 'favorites/create'; + $params = array('id' => $this->validInteger($id)); + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Remove a favorite + * + * @param int $id Status ID you want to de-list as a favorite + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function favoritesDestroy($id) + { + $this->init(); + $path = 'favorites/destroy'; + $params = array('id' => $this->validInteger($id)); + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Fetch favorites + * + * $options may contain one or more of the following: + * - user_id: Id of a user for whom to fetch favorites + * - screen_name: Screen name of a user for whom to fetch favorites + * - count: number of tweets to attempt to retrieve, up to 200 + * - since_id: return results only after the specified tweet id + * - max_id: return results with an ID less than (older than) or equal to the specified ID + * - include_entities: when set to false, entities member will be omitted + * + * @param array $params + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function favoritesList(array $options = array()) + { + $this->init(); + $path = 'favorites/list'; + $params = array(); + foreach ($options as $key => $value) { + switch (strtolower($key)) { + case 'user_id': + $params['user_id'] = $this->validInteger($value); + break; + case 'screen_name': + $params['screen_name'] = $value; break; case 'count': - $count = (int) $value; - if (0 >= $count) { - $count = 1; - } elseif (200 < $count) { - $count = 200; - } - $_params['count'] = $count; - break; - case 'user_id': - $_params['user_id'] = $this->_validInteger($value); - break; - case 'screen_name': - $_params['screen_name'] = $this->_validateScreenName($value); + $params['count'] = (int) $value; break; case 'since_id': - $_params['since_id'] = $this->_validInteger($value); + $params['since_id'] = $this->validInteger($value); break; case 'max_id': - $_params['max_id'] = $this->_validInteger($value); + $params['max_id'] = $this->validInteger($value); break; - case 'include_rts': - case 'trim_user': case 'include_entities': - $_params[strtolower($key)] = $value ? '1' : '0'; + $params['include_entities'] = (bool) $value; break; default: break; } } - $path .= '.xml'; - $response = $this->_get($path, $_params); - return new Zend_Rest_Client_Result($response->getBody()); + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); } /** - * Show a single status + * Create friendship * - * @param int $id Id of status to show + * @param int|string $id User ID or name of new friend + * @param array $params Additional parameters to pass * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function statusShow($id) + public function friendshipsCreate($id, array $params = array()) { - $this->_init(); - $path = '/1/statuses/show/' . $this->_validInteger($id) . '.xml'; - $response = $this->_get($path); - return new Zend_Rest_Client_Result($response->getBody()); + $this->init(); + $path = 'friendships/create'; + $params = $this->createUserParameter($id, $params); + $allowed = array( + 'user_id' => null, + 'screen_name' => null, + 'follow' => null, + ); + $params = array_intersect_key($params, $allowed); + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Destroy friendship + * + * @param int|string $id User ID or name of friend to remove + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function friendshipsDestroy($id) + { + $this->init(); + $path = 'friendships/destroy'; + $params = $this->createUserParameter($id, array()); + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); } /** - * Update user's current status + * Search tweets * - * @param string $status - * @param int $in_reply_to_status_id - * @return Zend_Rest_Client_Result + * $options may include any of the following: + * - geocode: a string of the form "latitude, longitude, radius" + * - lang: restrict tweets to the two-letter language code + * - locale: query is in the given two-letter language code + * - result_type: what type of results to receive: mixed, recent, or popular + * - count: number of tweets to return per page; up to 100 + * - until: return tweets generated before the given date + * - since_id: return resutls with an ID greater than (more recent than) the given ID + * - max_id: return results with an ID less than (older than) the given ID + * - include_entities: whether or not to include embedded entities + * + * @param string $query + * @param array $options * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @throws Zend_Service_Twitter_Exception if message is too short or too long + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function statusUpdate($status, $inReplyToStatusId = null) + public function searchTweets($query, array $options = array()) { - $this->_init(); - $path = '/1/statuses/update.xml'; - $len = iconv_strlen(htmlspecialchars($status, ENT_QUOTES, 'UTF-8'), 'UTF-8'); - if ($len > self::STATUS_MAX_CHARACTERS) { - include_once 'Zend/Service/Twitter/Exception.php'; + $this->init(); + $path = 'search/tweets'; + + $len = iconv_strlen($query, 'UTF-8'); + if (0 == $len) { + require_once 'Zend/Service/Twitter/Exception.php'; throw new Zend_Service_Twitter_Exception( - 'Status must be no more than ' - . self::STATUS_MAX_CHARACTERS - . ' characters in length' - ); - } elseif (0 == $len) { - include_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception( - 'Status must contain at least one character' + 'Query must contain at least one character' ); } - $data = array('status' => $status); - if (is_numeric($inReplyToStatusId) && !empty($inReplyToStatusId)) { - $data['in_reply_to_status_id'] = $inReplyToStatusId; - } - $response = $this->_post($path, $data); - return new Zend_Rest_Client_Result($response->getBody()); - } - /** - * Get status replies - * - * $params may include one or more of the following keys - * - since_id: return results only after the specified tweet id - * - page: return page X of results - * - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function statusReplies(array $params = array()) - { - $this->_init(); - $path = '/1/statuses/mentions.xml'; - $_params = array(); - foreach ($params as $key => $value) { + $params = array('q' => $query); + foreach ($options as $key => $value) { switch (strtolower($key)) { - case 'since_id': - $_params['since_id'] = $this->_validInteger($value); + case 'geocode': + if (!substr_count($value, ',') !== 2) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + '"geocode" must be of the format "latitude,longitude,radius"' + ); + } + list($latitude, $longitude, $radius) = explode(',', $value); + $radius = trim($radius); + if (!preg_match('/^\d+(mi|km)$/', $radius)) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Radius segment of "geocode" must be of the format "[unit](mi|km)"' + ); + } + $latitude = (float) $latitude; + $longitude = (float) $longitude; + $params['geocode'] = $latitude . ',' . $longitude . ',' . $radius; + break; + case 'lang': + if (strlen($value) > 2) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Query language must be a 2 character string' + ); + } + $params['lang'] = strtolower($value); + break; + case 'locale': + if (strlen($value) > 2) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Query locale must be a 2 character string' + ); + } + $params['locale'] = strtolower($value); break; - case 'page': - $_params['page'] = (int) $value; + case 'result_type': + $value = strtolower($value); + if (!in_array($value, array('mixed', 'recent', 'popular'))) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'result_type must be one of "mixed", "recent", or "popular"' + ); + } + $params['result_type'] = $value; + break; + case 'count': + $value = (int) $value; + if (1 > $value || 100 < $value) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'count must be between 1 and 100' + ); + } + $params['count'] = $value; + break; + case 'until': + if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $value)) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + '"until" must be a date in the format YYYY-MM-DD' + ); + } + $params['until'] = $value; + break; + case 'since_id': + $params['since_id'] = $this->validInteger($value); + break; + case 'max_id': + $params['max_id'] = $this->validInteger($value); + break; + case 'include_entities': + $params['include_entities'] = (bool) $value; break; default: break; } } - $response = $this->_get($path, $_params); - return new Zend_Rest_Client_Result($response->getBody()); + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); } /** @@ -519,415 +816,376 @@ * * @param int $id ID of status to destroy * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function statusDestroy($id) + public function statusesDestroy($id) { - $this->_init(); - $path = '/1/statuses/destroy/' . $this->_validInteger($id) . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); + $this->init(); + $path = 'statuses/destroy/' . $this->validInteger($id); + $response = $this->post($path); + return new Zend_Service_Twitter_Response($response); } /** - * User friends + * Friend Timeline Status * - * @param int|string $id Id or username of user for whom to fetch friends + * $options may include one or more of the following keys + * - count: number of tweets to attempt to retrieve, up to 200 + * - since_id: return results only after the specified tweet id + * - max_id: return results with an ID less than (older than) or equal to the specified ID + * - trim_user: when set to true, "t", or 1, user object in tweets will include only author's ID. + * - contributor_details: when set to true, includes screen_name of each contributor + * - include_entities: when set to false, entities member will be omitted + * - exclude_replies: when set to true, will strip replies appearing in the timeline + * + * @param array $params * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function userFriends(array $params = array()) + public function statusesHomeTimeline(array $options = array()) { - $this->_init(); - $path = '/1/statuses/friends'; - $_params = array(); - - foreach ($params as $key => $value) { + $this->init(); + $path = 'statuses/home_timeline'; + $params = array(); + foreach ($options as $key => $value) { switch (strtolower($key)) { - case 'id': - $path .= '/' . $value; + case 'count': + $params['count'] = (int) $value; + break; + case 'since_id': + $params['since_id'] = $this->validInteger($value); + break; + case 'max_id': + $params['max_id'] = $this->validInteger($value); + break; + case 'trim_user': + if (in_array($value, array(true, 'true', 't', 1, '1'))) { + $value = true; + } else { + $value = false; + } + $params['trim_user'] = $value; + break; + case 'contributor_details:': + $params['contributor_details:'] = (bool) $value; + break; + case 'include_entities': + $params['include_entities'] = (bool) $value; + break; + case 'exclude_replies': + $params['exclude_replies'] = (bool) $value; + break; + default: break; - case 'page': - $_params['page'] = (int) $value; + } + } + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Get status replies + * + * $options may include one or more of the following keys + * - count: number of tweets to attempt to retrieve, up to 200 + * - since_id: return results only after the specified tweet id + * - max_id: return results with an ID less than (older than) or equal to the specified ID + * - trim_user: when set to true, "t", or 1, user object in tweets will include only author's ID. + * - contributor_details: when set to true, includes screen_name of each contributor + * - include_entities: when set to false, entities member will be omitted + * + * @param array $options + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function statusesMentionsTimeline(array $options = array()) + { + $this->init(); + $path = 'statuses/mentions_timeline'; + $params = array(); + foreach ($options as $key => $value) { + switch (strtolower($key)) { + case 'count': + $params['count'] = (int) $value; + break; + case 'since_id': + $params['since_id'] = $this->validInteger($value); + break; + case 'max_id': + $params['max_id'] = $this->validInteger($value); + break; + case 'trim_user': + if (in_array($value, array(true, 'true', 't', 1, '1'))) { + $value = true; + } else { + $value = false; + } + $params['trim_user'] = $value; + break; + case 'contributor_details:': + $params['contributor_details:'] = (bool) $value; + break; + case 'include_entities': + $params['include_entities'] = (bool) $value; break; default: break; } } - $path .= '.xml'; + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Public Timeline status + * + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function statusesSample() + { + $this->init(); + $path = 'statuses/sample'; + $response = $this->get($path); + return new Zend_Service_Twitter_Response($response); + } + + /** + * Show a single status + * + * @param int $id Id of status to show + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function statusesShow($id) + { + $this->init(); + $path = 'statuses/show/' . $this->validInteger($id); + $response = $this->get($path); + return new Zend_Service_Twitter_Response($response); + } - $response = $this->_get($path, $_params); - return new Zend_Rest_Client_Result($response->getBody()); + /** + * Update user's current status + * + * @todo Support additional parameters supported by statuses/update endpoint + * @param string $status + * @param null|int $inReplyToStatusId + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\OutOfRangeException if message is too long + * @throws Exception\InvalidArgumentException if message is empty + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function statusesUpdate($status, $inReplyToStatusId = null) + { + $this->init(); + $path = 'statuses/update'; + $len = iconv_strlen(htmlspecialchars($status, ENT_QUOTES, 'UTF-8'), 'UTF-8'); + if ($len > self::STATUS_MAX_CHARACTERS) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Status must be no more than ' + . self::STATUS_MAX_CHARACTERS + . ' characters in length' + ); + } elseif (0 == $len) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Status must contain at least one character' + ); + } + + $params = array('status' => $status); + $inReplyToStatusId = $this->validInteger($inReplyToStatusId); + if ($inReplyToStatusId) { + $params['in_reply_to_status_id'] = $inReplyToStatusId; + } + $response = $this->post($path, $params); + return new Zend_Service_Twitter_Response($response); } /** - * User Followers + * User Timeline status * - * @param bool $lite If true, prevents inline inclusion of current status for followers; defaults to false + * $options may include one or more of the following keys + * - user_id: Id of a user for whom to fetch favorites + * - screen_name: Screen name of a user for whom to fetch favorites + * - count: number of tweets to attempt to retrieve, up to 200 + * - since_id: return results only after the specified tweet id + * - max_id: return results with an ID less than (older than) or equal to the specified ID + * - trim_user: when set to true, "t", or 1, user object in tweets will include only author's ID. + * - exclude_replies: when set to true, will strip replies appearing in the timeline + * - contributor_details: when set to true, includes screen_name of each contributor + * - include_rts: when set to false, will strip native retweets + * * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function userFollowers($lite = false) + public function statusesUserTimeline(array $options = array()) { - $this->_init(); - $path = '/1/statuses/followers.xml'; - if ($lite) { - $this->lite = 'true'; + $this->init(); + $path = 'statuses/user_timeline'; + $params = array(); + foreach ($options as $key => $value) { + switch (strtolower($key)) { + case 'user_id': + $params['user_id'] = $this->validInteger($value); + break; + case 'screen_name': + $params['screen_name'] = $this->validateScreenName($value); + break; + case 'count': + $params['count'] = (int) $value; + break; + case 'since_id': + $params['since_id'] = $this->validInteger($value); + break; + case 'max_id': + $params['max_id'] = $this->validInteger($value); + break; + case 'trim_user': + if (in_array($value, array(true, 'true', 't', 1, '1'))) { + $value = true; + } else { + $value = false; + } + $params['trim_user'] = $value; + break; + case 'contributor_details:': + $params['contributor_details:'] = (bool) $value; + break; + case 'exclude_replies': + $params['exclude_replies'] = (bool) $value; + break; + case 'include_rts': + $params['include_rts'] = (bool) $value; + break; + default: + break; + } } - $response = $this->_get($path); - return new Zend_Rest_Client_Result($response->getBody()); + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); } /** + * Search users + * + * $options may include any of the following: + * - page: the page of results to retrieve + * - count: the number of users to retrieve per page; max is 20 + * - include_entities: if set to boolean true, include embedded entities + * + * @param string $query + * @param array $options + * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response + */ + public function usersSearch($query, array $options = array()) + { + $this->init(); + $path = 'users/search'; + + $len = iconv_strlen($query, 'UTF-8'); + if (0 == $len) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Query must contain at least one character' + ); + } + + $params = array('q' => $query); + foreach ($options as $key => $value) { + switch (strtolower($key)) { + case 'count': + $value = (int) $value; + if (1 > $value || 20 < $value) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'count must be between 1 and 20' + ); + } + $params['count'] = $value; + break; + case 'page': + $params['page'] = (int) $value; + break; + case 'include_entities': + $params['include_entities'] = (bool) $value; + break; + default: + break; + } + } + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); + } + + + /** * Show extended information on a user * * @param int|string $id User ID or name * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function userShow($id) - { - $this->_init(); - $path = '/1/users/show.xml'; - $response = $this->_get($path, array('id'=>$id)); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Retrieve direct messages for the current user - * - * $params may include one or more of the following keys - * - since_id: return statuses only greater than the one specified - * - page: return page X of results - * - * @param array $params - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @throws Exception\DomainException if unable to decode JSON payload + * @return Zend_Service_Twitter_Response */ - public function directMessageMessages(array $params = array()) - { - $this->_init(); - $path = '/1/direct_messages.xml'; - $_params = array(); - foreach ($params as $key => $value) { - switch (strtolower($key)) { - case 'since_id': - $_params['since_id'] = $this->_validInteger($value); - break; - case 'page': - $_params['page'] = (int) $value; - break; - default: - break; - } - } - $response = $this->_get($path, $_params); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Retrieve list of direct messages sent by current user - * - * $params may include one or more of the following keys - * - since_id: return statuses only greater than the one specified - * - page: return page X of results - * - * @param array $params - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function directMessageSent(array $params = array()) + public function usersShow($id) { - $this->_init(); - $path = '/1/direct_messages/sent.xml'; - $_params = array(); - foreach ($params as $key => $value) { - switch (strtolower($key)) { - case 'since_id': - $_params['since_id'] = $this->_validInteger($value); - break; - case 'page': - $_params['page'] = (int) $value; - break; - default: - break; - } - } - $response = $this->_get($path, $_params); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Send a direct message to a user - * - * @param int|string $user User to whom to send message - * @param string $text Message to send to user - * @return Zend_Rest_Client_Result - * @throws Zend_Service_Twitter_Exception if message is too short or too long - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - */ - public function directMessageNew($user, $text) - { - $this->_init(); - $path = '/1/direct_messages/new.xml'; - $len = iconv_strlen($text, 'UTF-8'); - if (0 == $len) { - throw new Zend_Service_Twitter_Exception( - 'Direct message must contain at least one character' - ); - } elseif (140 < $len) { - throw new Zend_Service_Twitter_Exception( - 'Direct message must contain no more than 140 characters' - ); - } - $data = array('user' => $user, 'text' => $text); - $response = $this->_post($path, $data); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Destroy a direct message - * - * @param int $id ID of message to destroy - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function directMessageDestroy($id) - { - $this->_init(); - $path = '/1/direct_messages/destroy/' . $this->_validInteger($id) . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Create friendship - * - * @param int|string $id User ID or name of new friend - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function friendshipCreate($id) - { - $this->_init(); - $path = '/1/friendships/create/' . $id . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Destroy friendship - * - * @param int|string $id User ID or name of friend to remove - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function friendshipDestroy($id) - { - $this->_init(); - $path = '/1/friendships/destroy/' . $id . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Friendship exists - * - * @param int|string $id User ID or name of friend to see if they are your friend - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_result - */ - public function friendshipExists($id) - { - $this->_init(); - $path = '/1/friendships/exists.xml'; - $data = array('user_a' => $this->getUsername(), 'user_b' => $id); - $response = $this->_get($path, $data); - return new Zend_Rest_Client_Result($response->getBody()); + $this->init(); + $path = 'users/show'; + $params = $this->createUserParameter($id, array()); + $response = $this->get($path, $params); + return new Zend_Service_Twitter_Response($response); } /** - * Verify Account Credentials - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * - * @return Zend_Rest_Client_Result - */ - public function accountVerifyCredentials() - { - $this->_init(); - $response = $this->_get('/1/account/verify_credentials.xml'); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * End current session + * Initialize HTTP authentication * - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return true - */ - public function accountEndSession() - { - $this->_init(); - $this->_get('/1/account/end_session'); - return true; - } - - /** - * Returns the number of api requests you have left per hour. - * - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result + * @return void + * @throws Exception\DomainException if unauthorised */ - public function accountRateLimitStatus() - { - $this->_init(); - $response = $this->_get('/1/account/rate_limit_status.xml'); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Fetch favorites - * - * $params may contain one or more of the following: - * - 'id': Id of a user for whom to fetch favorites - * - 'page': Retrieve a different page of resuls - * - * @param array $params - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function favoriteFavorites(array $params = array()) - { - $this->_init(); - $path = '/1/favorites'; - $_params = array(); - foreach ($params as $key => $value) { - switch (strtolower($key)) { - case 'id': - $path .= '/' . $this->_validInteger($value); - break; - case 'page': - $_params['page'] = (int) $value; - break; - default: - break; - } - } - $path .= '.xml'; - $response = $this->_get($path, $_params); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Mark a status as a favorite - * - * @param int $id Status ID you want to mark as a favorite - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function favoriteCreate($id) + protected function init() { - $this->_init(); - $path = '/1/favorites/create/' . $this->_validInteger($id) . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Remove a favorite - * - * @param int $id Status ID you want to de-list as a favorite - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function favoriteDestroy($id) - { - $this->_init(); - $path = '/1/favorites/destroy/' . $this->_validInteger($id) . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Blocks the user specified in the ID parameter as the authenticating user. - * Destroys a friendship to the blocked user if it exists. - * - * @param integer|string $id The ID or screen name of a user to block. - * @return Zend_Rest_Client_Result - */ - public function blockCreate($id) - { - $this->_init(); - $path = '/1/blocks/create/' . $id . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Un-blocks the user specified in the ID parameter for the authenticating user - * - * @param integer|string $id The ID or screen_name of the user to un-block. - * @return Zend_Rest_Client_Result - */ - public function blockDestroy($id) - { - $this->_init(); - $path = '/1/blocks/destroy/' . $id . '.xml'; - $response = $this->_post($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - - /** - * Returns if the authenticating user is blocking a target user. - * - * @param string|integer $id The ID or screen_name of the potentially blocked user. - * @param boolean $returnResult Instead of returning a boolean return the rest response from twitter - * @return Boolean|Zend_Rest_Client_Result - */ - public function blockExists($id, $returnResult = false) - { - $this->_init(); - $path = '/1/blocks/exists/' . $id . '.xml'; - $response = $this->_get($path); - - $cr = new Zend_Rest_Client_Result($response->getBody()); - - if ($returnResult === true) - return $cr; - - if (!empty($cr->request)) { - return false; + if (!$this->isAuthorised() && $this->getUsername() !== null) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Twitter session is unauthorised. You need to initialize ' + . __CLASS__ . ' with an OAuth Access Token or use ' + . 'its OAuth functionality to obtain an Access Token before ' + . 'attempting any API actions that require authorisation' + ); } - - return true; - } - - /** - * Returns an array of user objects that the authenticating user is blocking - * - * @param integer $page Optional. Specifies the page number of the results beginning at 1. A single page contains 20 ids. - * @param boolean $returnUserIds Optional. Returns only the userid's instead of the whole user object - * @return Zend_Rest_Client_Result - */ - public function blockBlocking($page = 1, $returnUserIds = false) - { - $this->_init(); - $path = '/1/blocks/blocking'; - if ($returnUserIds === true) { - $path .= '/ids'; + $client = $this->getHttpClient(); + $client->resetParameters(); + if (null === $this->cookieJar) { + $cookieJar = $client->getCookieJar(); + if (null === $cookieJar) { + $cookieJar = new Zend_Http_CookieJar(); + } + $this->cookieJar = $cookieJar; + $this->cookieJar->reset(); + } else { + $client->setCookieJar($this->cookieJar); } - $path .= '.xml'; - $response = $this->_get($path, array('page' => $page)); - return new Zend_Rest_Client_Result($response->getBody()); } /** * Protected function to validate that the integer is valid or return a 0 - * @param $int + * + * @param $int * @throws Zend_Http_Client_Exception if HTTP request fails or times out * @return integer */ - protected function _validInteger($int) + protected function validInteger($int) { if (preg_match("/(\d+)/", $int)) { return $int; @@ -939,12 +1197,12 @@ * Validate a screen name using Twitter rules * * @param string $name - * @throws Zend_Service_Twitter_Exception * @return string + * @throws Exception\InvalidArgumentException */ - protected function _validateScreenName($name) + protected function validateScreenName($name) { - if (!preg_match('/^[a-zA-Z0-9_]{0,15}$/', $name)) { + if (!preg_match('/^[a-zA-Z0-9_]{0,20}$/', $name)) { require_once 'Zend/Service/Twitter/Exception.php'; throw new Zend_Service_Twitter_Exception( 'Screen name, "' . $name @@ -955,36 +1213,21 @@ } /** - * Call a remote REST web service URI and return the Zend_Http_Response object + * Call a remote REST web service URI * - * @param string $path The path to append to the URI - * @throws Zend_Rest_Client_Exception + * @param string $path The path to append to the URI + * @param Zend_Http_Client $client + * @throws Zend_Http_Client_Exception * @return void */ - protected function _prepare($path) + protected function prepare($path, Zend_Http_Client $client) { - // Get the URI object and configure it - if (!$this->_uri instanceof Zend_Uri_Http) { - require_once 'Zend/Rest/Client/Exception.php'; - throw new Zend_Rest_Client_Exception( - 'URI object must be set before performing call' - ); - } - - $uri = $this->_uri->getUri(); - - if ($path[0] != '/' && $uri[strlen($uri) - 1] != '/') { - $path = '/' . $path; - } - - $this->_uri->setPath($path); + $client->setUri(self::API_BASE_URI . $path . '.json'); /** - * Get the HTTP client and configure it for the endpoint URI. - * Do this each time because the Zend_Http_Client instance is shared - * among all Zend_Service_Abstract subclasses. + * Do this each time to ensure oauth calls do not inject new params */ - $this->_localHttpClient->resetParameters()->setUri((string) $this->_uri); + $client->resetParameters(); } /** @@ -995,11 +1238,13 @@ * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - protected function _get($path, array $query = null) + protected function get($path, array $query = array()) { - $this->_prepare($path); - $this->_localHttpClient->setParameterGet($query); - return $this->_localHttpClient->request(Zend_Http_Client::GET); + $client = $this->getHttpClient(); + $this->prepare($path, $client); + $client->setParameterGet($query); + $response = $client->request(Zend_Http_Client::GET); + return $response; } /** @@ -1010,10 +1255,12 @@ * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - protected function _post($path, $data = null) + protected function post($path, $data = null) { - $this->_prepare($path); - return $this->_performPost(Zend_Http_Client::POST, $data); + $client = $this->getHttpClient(); + $this->prepare($path, $client); + $response = $this->performPost(Zend_Http_Client::POST, $data, $client); + return $response; } /** @@ -1027,9 +1274,8 @@ * @param mixed $data * @return Zend_Http_Response */ - protected function _performPost($method, $data = null) + protected function performPost($method, $data, Zend_Http_Client $client) { - $client = $this->_localHttpClient; if (is_string($data)) { $client->setRawData($data); } elseif (is_array($data) || is_object($data)) { @@ -1038,4 +1284,24 @@ return $client->request($method); } + /** + * Create a parameter representing the user + * + * Determines if $id is an integer, and, if so, sets the "user_id" parameter. + * If not, assumes the $id is the "screen_name". + * + * @param int|string $id + * @param array $params + * @return array + */ + protected function createUserParameter($id, array $params) + { + if ($this->validInteger($id)) { + $params['user_id'] = $id; + return $params; + } + + $params['screen_name'] = $this->validateScreenName($id); + return $params; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Twitter/Exception.php --- a/web/lib/Zend/Service/Twitter/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Twitter/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Twitter_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Twitter/Response.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/Twitter/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,179 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service + * @subpackage Twitter + * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Http_Response + */ +require_once 'Zend/Http/Response.php'; + +/** + * @see Zend_Json + */ +require_once 'Zend/Json.php'; + +/** + * Representation of a response from Twitter. + * + * Provides: + * + * - method for testing if we have a successful call + * - method for retrieving errors, if any + * - method for retrieving the raw JSON + * - method for retrieving the decoded response + * - proxying to elements of the decoded response via property overloading + * + * @category Zend + * @package Zend_Service + * @subpackage Twitter + * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_Twitter_Response +{ + /** + * @var Zend_Http_Response + */ + protected $httpResponse; + + /** + * @var array|stdClass + */ + protected $jsonBody; + + /** + * @var string + */ + protected $rawBody; + + /** + * Constructor + * + * Assigns the HTTP response to a property, as well as the body + * representation. It then attempts to decode the body as JSON. + * + * @param Zend_Http_Response $httpResponse + * @throws Zend_Service_Twitter_Exception if unable to decode JSON response + */ + public function __construct(Zend_Http_Response $httpResponse) + { + $this->httpResponse = $httpResponse; + $this->rawBody = $httpResponse->getBody(); + try { + $jsonBody = Zend_Json::decode($this->rawBody, Zend_Json::TYPE_OBJECT); + $this->jsonBody = $jsonBody; + } catch (Zend_Json_Exception $e) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception(sprintf( + 'Unable to decode response from twitter: %s', + $e->getMessage() + ), 0, $e); + } + } + + /** + * Property overloading to JSON elements + * + * If a named property exists within the JSON response returned, + * proxies to it. Otherwise, returns null. + * + * @param string $name + * @return mixed + */ + public function __get($name) + { + if (null === $this->jsonBody) { + return null; + } + if (!isset($this->jsonBody->{$name})) { + return null; + } + return $this->jsonBody->{$name}; + } + + /** + * Was the request successful? + * + * @return bool + */ + public function isSuccess() + { + return $this->httpResponse->isSuccessful(); + } + + /** + * Did an error occur in the request? + * + * @return bool + */ + public function isError() + { + return !$this->httpResponse->isSuccessful(); + } + + /** + * Retrieve the errors. + * + * Twitter _should_ return a standard error object, which contains an + * "errors" property pointing to an array of errors. This method will + * return that array if present, and raise an exception if not detected. + * + * If the response was successful, an empty array is returned. + * + * @return array + * @throws Exception\DomainException if unable to detect structure of error response + */ + public function getErrors() + { + if (!$this->isError()) { + return array(); + } + if (null === $this->jsonBody + || !isset($this->jsonBody->errors) + ) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Either no JSON response received, or JSON error response is malformed; cannot return errors' + ); + } + return $this->jsonBody->errors; + } + + /** + * Retrieve the raw response body + * + * @return string + */ + public function getRawResponse() + { + return $this->rawBody; + } + + /** + * Retun the decoded response body + * + * @return array|stdClass + */ + public function toValue() + { + return $this->jsonBody; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Twitter/Search.php --- a/web/lib/Zend/Service/Twitter/Search.php Sun Apr 21 10:07:03 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ -<?php -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend_Service - * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Search.php 20096 2010-01-06 02:05:09Z bkarwin $ - */ - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Rest/Client.php'; - -/** - * @see Zend_Json - */ -require_once 'Zend/Json.php'; - -/** - * @see Zend_Feed - */ -require_once 'Zend/Feed.php'; - -/** - * @category Zend - * @package Zend_Service - * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ - -class Zend_Service_Twitter_Search extends Zend_Rest_Client -{ - /** - * Return Type - * @var String - */ - protected $_responseType = 'json'; - - /** - * Response Format Types - * @var array - */ - protected $_responseTypes = array( - 'atom', - 'json' - ); - - /** - * Uri Compoent - * - * @var Zend_Uri_Http - */ - protected $_uri; - - /** - * Constructor - * - * @param string $returnType - * @return void - */ - public function __construct($responseType = 'json') - { - $this->setResponseType($responseType); - $this->setUri("http://search.twitter.com"); - - $this->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8'); - } - - /** - * set responseType - * - * @param string $responseType - * @throws Zend_Service_Twitter_Exception - * @return Zend_Service_Twitter_Search - */ - public function setResponseType($responseType = 'json') - { - if(!in_array($responseType, $this->_responseTypes, TRUE)) { - require_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception('Invalid Response Type'); - } - $this->_responseType = $responseType; - return $this; - } - - /** - * Retrieve responseType - * - * @return string - */ - public function getResponseType() - { - return $this->_responseType; - } - - /** - * Get the current twitter trends. Currnetly only supports json as the return. - * - * @throws Zend_Http_Client_Exception - * @return array - */ - public function trends() - { - $response = $this->restGet('/trends.json'); - - return Zend_Json::decode($response->getBody()); - } - - /** - * Performs a Twitter search query. - * - * @throws Zend_Http_Client_Exception - */ - public function search($query, array $params = array()) - { - - $_query = array(); - - $_query['q'] = $query; - - foreach($params as $key=>$param) { - switch($key) { - case 'geocode': - case 'lang': - case 'since_id': - $_query[$key] = $param; - break; - case 'rpp': - $_query[$key] = (intval($param) > 100) ? 100 : intval($param); - break; - case 'page': - $_query[$key] = intval($param); - break; - case 'show_user': - $_query[$key] = 'true'; - } - } - - $response = $this->restGet('/search.' . $this->_responseType, $_query); - - switch($this->_responseType) { - case 'json': - return Zend_Json::decode($response->getBody()); - break; - case 'atom': - return Zend_Feed::importString($response->getBody()); - break; - } - - return ; - } -} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Certificate.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Certificate.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,170 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Console + * @subpackage Exception + * @version $Id$ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + + +/** + * Certificate commands + * + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @command-handler certificate + * @command-handler-description Windows Azure Certificate commands + * @command-handler-header Windows Azure SDK for PHP + * @command-handler-header Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com) + * @command-handler-footer Note: Parameters that are common across all commands can be stored + * @command-handler-footer in two dedicated environment variables. + * @command-handler-footer - SubscriptionId: The Windows Azure Subscription Id to operate on. + * @command-handler-footer - Certificate The Windows Azure .cer Management Certificate. + * @command-handler-footer + * @command-handler-footer All commands support the --ConfigurationFile or -F parameter. + * @command-handler-footer The parameter file is a simple INI file carrying one parameter + * @command-handler-footer value per line. It accepts the same parameters as one can + * @command-handler-footer use from the command line command. + */ +class Zend_Service_WindowsAzure_CommandLine_Certificate + extends Zend_Service_Console_Command +{ + /** + * List certificates for a specified hosted service in a specified subscription. + * + * @command-name List + * @command-description List certificates for a specified hosted service in a specified subscription. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --ServiceName|-sn Required. The name of the hosted service. + * @command-example List certificates for service name "phptest": + * @command-example List -sid:"<your_subscription_id>" -cert:"mycert.pem" -sn:"phptest" + */ + public function listCertificatesCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->listCertificates($serviceName); + + if (count($result) == 0) { + echo 'No data to display.'; + } + foreach ($result as $object) { + $this->_displayObjectInformation($object, array('Thumbprint', 'CertificateUrl', 'ThumbprintAlgorithm')); + } + } + + /** + * Add a certificate for a specified hosted service in a specified subscription. + * + * @command-name Add + * @command-description Add a certificate for a specified hosted service in a specified subscription. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --ServiceName|-sn Required. The name of the hosted service. + * @command-parameter-for $certificateLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --CertificateLocation Required. Path to the .pfx certificate to be added. + * @command-parameter-for $certificatePassword Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --CertificatePassword Required. The password for the certificate that will be added. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Add certificates for service name "phptest": + * @command-example Add -sid:"<your_subscription_id>" -cert:"mycert.pem" -sn:"phptest" --CertificateLocation:"cert.pfx" --CertificatePassword:"certpassword" + */ + public function addCertificateCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $certificateLocation, $certificatePassword, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $client->addCertificate($serviceName, $certificateLocation, $certificatePassword, 'pfx'); + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Gets a certificate from a specified hosted service in a specified subscription. + * + * @command-name Get + * @command-description Gets a certificate from a specified hosted service in a specified subscription. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --ServiceName|-sn Required. The name of the hosted service. + * @command-parameter-for $thumbprint Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --CertificateThumbprint Required. The certificate thumbprint for which to retrieve the certificate. + * @command-parameter-for $algorithm Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --CertificateAlgorithm Required. The certificate's algorithm. + * @command-example Get certificate for service name "phptest": + * @command-example Get -sid:"<your_subscription_id>" -cert:"mycert.pem" -sn:"phptest" --CertificateThumbprint:"<thumbprint>" --CertificateAlgorithm:"sha1" + */ + public function getCertificateCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $thumbprint, $algorithm = "sha1") + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getCertificate($serviceName, $algorithm, $thumbprint); + + $this->_displayObjectInformation($result, array('Thumbprint', 'CertificateUrl', 'ThumbprintAlgorithm')); + } + + /** + * Gets a certificate property from a specified hosted service in a specified subscription. + * + * @command-name GetProperty + * @command-description Gets a certificate property from a specified hosted service in a specified subscription. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --ServiceName|-sn Required. The name of the hosted service. + * @command-parameter-for $thumbprint Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --CertificateThumbprint Required. The certificate thumbprint for which to retrieve the certificate. + * @command-parameter-for $algorithm Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --CertificateAlgorithm Required. The certificate's algorithm. + * @command-parameter-for $property Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Property|-prop Required. The property to retrieve for the certificate. + * @command-example Get certificate for service name "phptest": + * @command-example Get -sid:"<your_subscription_id>" -cert:"mycert.pem" -sn:"phptest" --CertificateThumbprint:"<thumbprint>" --CertificateAlgorithm:"sha1" + */ + public function getCertificatePropertyCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $thumbprint, $algorithm = "sha1", $property) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getCertificate($serviceName, $algorithm, $thumbprint); + + printf("%s\r\n", $result->$property); + } + + /** + * Deletes a certificate from a specified hosted service in a specified subscription. + * + * @command-name Delete + * @command-description Deletes a certificate from a specified hosted service in a specified subscription. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --ServiceName|-sn Required. The name of the hosted service. + * @command-parameter-for $thumbprint Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --CertificateThumbprint Required. The certificate thumbprint for which to retrieve the certificate. + * @command-parameter-for $algorithm Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --CertificateAlgorithm Required. The certificate's algorithm. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Get certificate for service name "phptest": + * @command-example Get -sid:"<your_subscription_id>" -cert:"mycert.pem" -sn:"phptest" --CertificateThumbprint:"<thumbprint>" --CertificateAlgorithm:"sha1" + */ + public function deleteCertificateCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $thumbprint, $algorithm = "sha1", $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $client->deleteCertificate($serviceName, $algorithm, $thumbprint); + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } +} + +Zend_Service_Console_Command::bootstrap($_SERVER['argv']); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Deployment.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Deployment.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,580 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Console + * @subpackage Exception + * @version $Id$ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** + * @see Zend_Service_Console_Command + */ +require_once 'Zend/Service/Console/Command.php'; + +/** + * Deployment commands + * + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @command-handler deployment + * @command-handler-description Windows Azure Deployment commands + * @command-handler-header Windows Azure SDK for PHP + * @command-handler-header Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com) + * @command-handler-footer Note: Parameters that are common across all commands can be stored + * @command-handler-footer in two dedicated environment variables. + * @command-handler-footer - SubscriptionId: The Windows Azure Subscription Id to operate on. + * @command-handler-footer - Certificate The Windows Azure .cer Management Certificate. + * @command-handler-footer + * @command-handler-footer All commands support the --ConfigurationFile or -F parameter. + * @command-handler-footer The parameter file is a simple INI file carrying one parameter + * @command-handler-footer value per line. It accepts the same parameters as one can + * @command-handler-footer use from the command line command. + */ +class Zend_Service_WindowsAzure_CommandLine_Deployment + extends Zend_Service_Console_Command +{ + /** + * Creates a deployment from a remote package file and service configuration. + * + * @command-name CreateFromStorage + * @command-description Creates a deployment from a remote package file and service configuration. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --DeploymentName Required. The name for the deployment. + * @command-parameter-for $label Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Label Required. The label for the deployment. + * @command-parameter-for $staging Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Staging Host the service in the staging slot. + * @command-parameter-for $production Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Production Host the service in the staging slot. + * @command-parameter-for $packageUrl Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --PackageUrl Required. The remote location of the .cspkg file. + * @command-parameter-for $serviceConfigurationLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ServiceConfigLocation Required. The location of the .cspkg file. + * @command-parameter-for $startImmediately Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --StartImmediately Optional. Start the deployment after creation. + * @command-parameter-for $warningsAsErrors Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WarningsAsErrors Optional. Treat warnings as errors. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Create a deployment from a remote .cspkg: + * @command-example CreateFromStorage -sid:"<your_subscription_id>" -cert:"mycert.pem" --Name:"hostedservicename" --DeploymentName:"deploymentname" + * @command-example --Label:"deploymentlabel" --Production + * @command-example --PackageUrl:"http://acct.blob.core.windows.net/pkgs/service.cspkg" + * @command-example --ServiceConfigLocation:".\ServiceConfiguration.cscfg" --StartImmediately --WaitFor + */ + public function createFromStorageCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentName, $label, $staging = false, $production = false, $packageUrl, $serviceConfigurationLocation, $startImmediately = true, $warningsAsErrors = false, $waitForOperation = false) + { + $deploymentSlot = 'staging'; + if (!$staging && !$production) { + require_once 'Zend/Service/Console/Exception.php'; + throw new Zend_Service_Console_Exception('Either --Staging or --Production should be specified.'); + } + if ($production) { + $deploymentSlot = 'production'; + } + + $client->createDeployment($serviceName, $deploymentSlot, $deploymentName, $label, $packageUrl, $serviceConfigurationLocation, $startImmediately, $warningsAsErrors); + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Creates a deployment from a local package file and service configuration. + * + * @command-name CreateFromLocal + * @command-description Creates a deployment from a local package file and service configuration. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --DeploymentName Required. The name for the deployment. + * @command-parameter-for $label Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Label Required. The label for the deployment. + * @command-parameter-for $staging Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Staging Host the service in the staging slot. + * @command-parameter-for $production Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Production Host the service in the staging slot. + * @command-parameter-for $packageLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --PackageLocation Required. The location of the .cspkg file. + * @command-parameter-for $serviceConfigurationLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ServiceConfigLocation Required. The location of the .cspkg file. + * @command-parameter-for $storageAccount Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --StorageAccount Required. Storage account to use when creating the deployment. + * @command-parameter-for $startImmediately Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --StartImmediately Optional. Start the deployment after creation. + * @command-parameter-for $warningsAsErrors Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WarningsAsErrors Optional. Treat warnings as errors. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Create a deployment from a local .cspkg: + * @command-example CreateFromLocal -sid:"<your_subscription_id>" -cert:"mycert.pem" --Name:"hostedservicename" --DeploymentName:"deploymentname" + * @command-example --Label:"deploymentlabel" --Production --PackageLocation:".\service.cspkg" + * @command-example --ServiceConfigLocation:".\ServiceConfiguration.cscfg" --StorageAccount:"mystorage" + * @command-example --StartImmediately --WaitFor + */ + public function createFromLocalCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentName, $label, $staging = false, $production = false, $packageLocation, $serviceConfigurationLocation, $storageAccount, $startImmediately = true, $warningsAsErrors = false, $waitForOperation = false) + { + $deploymentSlot = 'staging'; + if (!$staging && !$production) { + require_once 'Zend/Service/Console/Exception.php'; + throw new Zend_Service_Console_Exception('Either --Staging or --Production should be specified.'); + } + if ($production) { + $deploymentSlot = 'production'; + } + + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $blobClient = $client->createBlobClientForService($storageAccount); + $blobClient->createContainerIfNotExists('phpazuredeployments'); + $blobClient->putBlob('phpazuredeployments', basename($packageLocation), $packageLocation); + $package = $blobClient->getBlobInstance('phpazuredeployments', basename($packageLocation)); + + $client->createDeployment($serviceName, $deploymentSlot, $deploymentName, $label, $package->Url, $serviceConfigurationLocation, $startImmediately, $warningsAsErrors); + + $client->waitForOperation(); + $blobClient->deleteBlob('phpazuredeployments', basename($packageLocation)); + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Get deployment properties. + * + * @command-name GetProperties + * @command-description Get deployment properties. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-example Get deployment properties for service "phptest" (production slot): + * @command-example GetProperties -sid:"<your_subscription_id>" -cert:"mycert.pem" --Name:"servicename" --BySlot:"production" + */ + public function getPropertiesCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + $result = null; + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $result = $client->getDeploymentBySlot($serviceName, $deploymentSlot); + } else { + $result = $client->getDeploymentByDeploymentId($serviceName, $deploymentName); + } + + $this->_displayObjectInformation($result, array('Name', 'DeploymentSlot', 'Label', 'Url', 'Status')); + } + + /** + * Get hosted service account property. + * + * @command-name GetProperty + * @command-description Get deployment property. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $property Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Property|-prop Required. The property to retrieve for the hosted service account. + * @command-example Get deployment property "Name" for service "phptest" (production slot): + * @command-example GetProperties -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"servicename" --BySlot:"production" --Property:"Name" + */ + public function getPropertyCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $property) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + $result = null; + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $result = $client->getDeploymentBySlot($serviceName, $deploymentSlot); + } else { + $result = $client->getDeploymentByDeploymentId($serviceName, $deploymentName); + } + + printf("%s\r\n", $result->$property); + } + + /** + * Swap deployment slots (perform VIP swap). + * + * @command-name Swap + * @command-description Swap deployment slots (perform VIP swap). + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Swap deployment slots: + * @command-example Swap -sid:"<your_subscription_id>" -cert:"mycert.pem" --Name:"servicename" + */ + public function swapCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + $productionDeploymentName = null; + try { $productionDeploymentName = $client->getDeploymentBySlot($serviceName, 'production')->Name; } catch (Exception $ex) {} + + $stagingDeploymentName = null; + try { $stagingDeploymentName = $client->getDeploymentBySlot($serviceName, 'staging')->Name; } catch (Exception $ex) {} + + if (is_null($productionDeploymentName)) { + $productionDeploymentName = $stagingDeploymentName; + } + if (is_null($stagingDeploymentName)) { + require_once 'Zend/Service/Console/Exception.php'; + throw new Zend_Service_Console_Exception('Swapping deployment slots is only possible when both slots have an active deployment or when production slot is empty.'); + } + + $client->swapDeployment($serviceName, $productionDeploymentName, $stagingDeploymentName); + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Deletes a deployment. + * + * @command-name Delete + * @command-description Deletes a deployment. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Delete a deployment: + * @command-example Delete -sid:"<your_subscription_id>" -cert:"mycert.pem" --Name:"hostedservicename" --DeploymentName:"deploymentname" + */ + public function deleteCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->deleteDeploymentBySlot($serviceName, $deploymentSlot); + } else { + $client->deleteDeploymentByDeploymentId($serviceName, $deploymentName); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Updates a deployment's configuration. + * + * @command-name UpdateConfig + * @command-description Updates a deployment's configuration. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $serviceConfigurationLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ServiceConfigLocation Required. The location of the .cspkg file. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Update configuration: + * @command-example UpdateConfig -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"hostedservicename" --ByName:"deploymentname" + * @command-example --ServiceConfigLocation:".\ServiceConfiguration.cscfg" + */ + public function updateConfigurationCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $serviceConfigurationLocation, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->configureDeploymentBySlot($serviceName, $deploymentSlot, $serviceConfigurationLocation); + } else { + $client->configureDeploymentByDeploymentId($serviceName, $deploymentName, $serviceConfigurationLocation); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Updates a deployment's status. + * + * @command-name UpdateStatus + * @command-description Updates a deployment's status. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $newStatus Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Status Required. New status (Suspended|Running) + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Suspend a deployment: + * @command-example UpdateStatus -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"hostedservicename" --ByName:"deploymentname" + * @command-example --Status:"Suspended" + */ + public function updateStatusCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $newStatus, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->updateDeploymentStatusBySlot($serviceName, $deploymentSlot, $newStatus); + } else { + $client->updateDeploymentStatusByDeploymentId($serviceName, $deploymentName, $newStatus); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Updates the number of instances. + * + * @command-name EditInstanceNumber + * @command-description Updates the number of instances. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $roleName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RoleName|-r Required. Role name to update the number of instances for. + * @command-parameter-for $newInstanceNumber Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --NewInstanceNumber|-i Required. New number of instances. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Suspend a deployment: + * @command-example EditInstanceNumber -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"hostedservicename" --ByName:"deploymentname" + * @command-example --NewInstanceNumber:"4" + */ + public function editInstanceNumberCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $roleName, $newInstanceNumber = 1, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->setInstanceCountBySlot($serviceName, $deploymentSlot, $roleName, $newInstanceNumber); + } else { + $client->setInstanceCountByDeploymentId($serviceName, $deploymentName, $roleName, $newInstanceNumber); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Reboots a role instance. + * + * @command-name RebootInstance + * @command-description Reboots a role instance. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $instanceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RoleInstanceName Required. The name of the role instance to work with. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Reboot a role instance: + * @command-example RebootInstance -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"hostedservicename" --ByName:"deploymentname" + * @command-example --RoleInstanceName:"PhpOnAzure.Web_IN_0" + */ + public function rebootInstanceCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $instanceName, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->rebootRoleInstanceBySlot($serviceName, $deploymentSlot, $instanceName); + } else { + $client->rebootRoleInstanceByDeploymentId($serviceName, $deploymentName, $instanceName); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Reimages a role instance. + * + * @command-name ReimageInstance + * @command-description Reimages a role instance. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $instanceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RoleInstanceName Required. The name of the role instance to work with. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Reimage a role instance: + * @command-example ReimageInstance -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"hostedservicename" --ByName:"deploymentname" + * @command-example --RoleInstanceName:"PhpOnAzure.Web_IN_0" + */ + public function reimageInstanceCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $instanceName, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->reimageRoleInstanceBySlot($serviceName, $deploymentSlot, $instanceName); + } else { + $client->reimageRoleInstanceByDeploymentId($serviceName, $deploymentName, $instanceName); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Upgrades a deployment from a remote package file and service configuration. + * + * @command-name UpgradeFromStorage + * @command-description Upgrades a deployment from a remote package file and service configuration. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $label Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Label Required. The label for the deployment. + * @command-parameter-for $packageUrl Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --PackageUrl Required. The remote location of the .cspkg file. + * @command-parameter-for $serviceConfigurationLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ServiceConfigLocation Required. The location of the .cspkg file. + * @command-parameter-for $mode Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Mode Required. Set to auto|manual. + * @command-parameter-for $roleName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RoleName Optional. Role name to upgrade. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + */ + public function upgradeFromStorageCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $label, $packageUrl, $serviceConfigurationLocation, $mode = 'auto', $roleName = null, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->upgradeDeploymentBySlot($serviceName, $deploymentSlot, $label, $packageUrl, $serviceConfigurationLocation, $mode, $roleName); + } else { + $client->upgradeDeploymentByDeploymentId($serviceName, $deploymentName, $label, $packageUrl, $serviceConfigurationLocation, $mode, $roleName); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Upgrades a deployment from a local package file and service configuration. + * + * @command-name UpgradeFromLocal + * @command-description Upgrades a deployment from a local package file and service configuration. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $label Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Label Required. The label for the deployment. + * @command-parameter-for $packageLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --PackageLocation Required. The location of the .cspkg file. + * @command-parameter-for $serviceConfigurationLocation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ServiceConfigLocation Required. The location of the .cspkg file. + * @command-parameter-for $storageAccount Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --StorageAccount Required. Storage account to use when creating the deployment. + * @command-parameter-for $mode Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Mode Required. Set to auto|manual. + * @command-parameter-for $roleName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RoleName Optional. Role name to upgrade. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + */ + public function upgradeFromLocalCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $label, $packageLocation, $serviceConfigurationLocation, $storageAccount, $mode = 'auto', $roleName = null, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + $blobClient = $client->createBlobClientForService($storageAccount); + $blobClient->createContainerIfNotExists('phpazuredeployments'); + $blobClient->putBlob('phpazuredeployments', basename($packageLocation), $packageLocation); + $package = $blobClient->getBlobInstance('phpazuredeployments', basename($packageLocation)); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->upgradeDeploymentBySlot($serviceName, $deploymentSlot, $label, $package->Url, $serviceConfigurationLocation, $mode, $roleName); + } else { + $client->upgradeDeploymentByDeploymentId($serviceName, $deploymentName, $label, $package->Url, $serviceConfigurationLocation, $mode, $roleName); + } + + $client->waitForOperation(); + $blobClient->deleteBlob('phpazuredeployments', basename($packageLocation)); + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Walks upgrade domains. + * + * @command-name WalkUpgradeDomains + * @command-description Walks upgrade domains. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $deploymentSlot Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --BySlot Required if deployment name is omitted. The slot to retrieve property information for. + * @command-parameter-for $deploymentName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --ByName Required if deployment slot is omitted. The deployment name to retrieve property information for. + * @command-parameter-for $upgradeDomain Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --UpgradeDomain Required. The upgrade domain index. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + */ + public function walkUpgradeDomainsCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentSlot, $deploymentName, $upgradeDomain, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + + if (!is_null($deploymentSlot) && $deploymentSlot != '') { + $deploymentSlot = strtolower($deploymentSlot); + + $client->walkUpgradeDomainBySlot($serviceName, $deploymentSlot, $upgradeDomain); + } else { + $client->walkUpgradeDomainByDeploymentId($serviceName, $deploymentName, $upgradeDomain); + } + + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } +} + +Zend_Service_Console_Command::bootstrap($_SERVER['argv']); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/GetAsynchronousOperation.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/GetAsynchronousOperation.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,88 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Console + * @subpackage Exception + * @version $Id$ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** + * Asynchronous Operation commands + * + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @command-handler getasynchronousoperation + * @command-handler-description Windows Azure Asynchronous Operation commands + * @command-handler-header Windows Azure SDK for PHP + * @command-handler-header Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com) + * @command-handler-footer Note: Parameters that are common across all commands can be stored + * @command-handler-footer in two dedicated environment variables. + * @command-handler-footer - SubscriptionId: The Windows Azure Subscription Id to operate on. + * @command-handler-footer - Certificate The Windows Azure .cer Management Certificate. + * @command-handler-footer + * @command-handler-footer All commands support the --ConfigurationFile or -F parameter. + * @command-handler-footer The parameter file is a simple INI file carrying one parameter + * @command-handler-footer value per line. It accepts the same parameters as one can + * @command-handler-footer use from the command line command. + */ +class Zend_Service_WindowsAzure_CommandLine_GetAsynchronousOperation + extends Zend_Service_Console_Command +{ + /** + * Get information for a specific asynchronous request. + * + * @command-name GetInfo + * @command-description Get information for a specific asynchronous request. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $requestId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RequestId|-r Required. The value returned by a call that starts an asynchronous operation to monitor. + * @command-example Get information for a specific asynchronous operation: + * @command-example GetInfo -sid:"<your_subscription_id>" -cert:"mycert.pem" -r:"dab87a4b70e94a36805f5af2d20fc593" + */ + public function getInfoCommand($subscriptionId, $certificate, $certificatePassphrase, $requestId) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getOperationStatus($requestId); + + $this->_displayObjectInformation($result, array('ID', 'Status', 'ErrorMessage')); + } + + /** + * Wait for a specific asynchronous request to complete. + * + * @command-name WaitFor + * @command-description Wait for a specific asynchronous request to complete. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $requestId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RequestId|-r Required. The value returned by a call that starts an asynchronous operation to monitor. + * @command-parameter-for $interval Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Interval|-i Optional. The interval between two status checks (in milliseconds). + * @command-example Wait for a specific asynchronous operation: + * @command-example WaitFor -sid:"<your_subscription_id>" -cert:"mycert.pem" -r:"dab87a4b70e94a36805f5af2d20fc593" + */ + public function waitForCommand($subscriptionId, $certificate, $certificatePassphrase, $requestId, $interval = 250) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $client->waitForOperation($requestId, $interval); + } +} + +Zend_Service_Console_Command::bootstrap($_SERVER['argv']); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Package.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Package.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,198 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Console + * @subpackage Exception + * @version $Id$ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + + +/** + * Package commands + * + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @command-handler package + * @command-handler-description Windows Azure Package commands + * @command-handler-header Windows Azure SDK for PHP + * @command-handler-header Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com) + * @command-handler-footer + * @command-handler-footer All commands support the --ConfigurationFile or -F parameter. + * @command-handler-footer The parameter file is a simple INI file carrying one parameter + * @command-handler-footer value per line. It accepts the same parameters as one can + * @command-handler-footer use from the command line command. + */ +class Zend_Service_WindowsAzure_CommandLine_Package + extends Zend_Service_Console_Command +{ + /** + * Scaffolds a Windows Azure project structure which can be customized before packaging. + * + * @command-name Scaffold + * @command-description Scaffolds a Windows Azure project structure which can be customized before packaging. + * + * @command-parameter-for $path Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Path|-p Required. The path to create the Windows Azure project structure. + * @command-parameter-for $scaffolder Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Scaffolder|-s Optional. The path to the scaffolder to use. Defaults to Scaffolders/DefaultScaffolder.phar + */ + public function scaffoldCommand($path, $scaffolder, $argv) + { + // Default parameter value + if ($scaffolder == '') { + $scaffolder = dirname(__FILE__) . '/Scaffolders/DefaultScaffolder.phar'; + } + $scaffolder = realpath($scaffolder); + + // Verify scaffolder + if (!is_file($scaffolder)) { + require_once 'Zend/Service/Console/Exception.php'; + throw new Zend_Service_Console_Exception('Could not locate the given scaffolder: ' . $scaffolder); + } + + // Include scaffolder + $archive = new Phar($scaffolder); + include $scaffolder; + if (!class_exists('Scaffolder')) { + require_once 'Zend/Service/Console/Exception.php'; + throw new Zend_Service_Console_Exception('Could not locate a class named Scaffolder in the given scaffolder: ' . $scaffolder . '. Make sure the scaffolder package contains a file named index.php and contains a class named Scaffolder.'); + } + + // Cleanup $argv + $options = array(); + foreach ($argv as $arg) { + list($key, $value) = explode(':', $arg, 2); + while (substr($key, 0, 1) == '-') { + $key = substr($key, 1); + } + $options[$key] = $value; + } + + // Run scaffolder + $scaffolderInstance = new Scaffolder(); + $scaffolderInstance->invoke($archive, $path, $options); + } + + + /** + * Packages a Windows Azure project structure. + * + * @command-name Create + * @command-description Packages a Windows Azure project structure. + * + * @command-parameter-for $path Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Path|-p Required. The path to package. + * @command-parameter-for $runDevFabric Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --RunDevFabric|-dev Required. Switch. Run and deploy to the Windows Azure development fabric. + * @command-parameter-for $outputPath Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --OutputPath|-out Optional. The output path for the resulting package. + */ + public function createPackageCommand($path, $runDevFabric, $outputPath) + { + // Create output paths + if ($outputPath == '') { + $outputPath = realpath($path . '/../'); + } + $packageOut = $outputPath . '/' . basename($path) . '.cspkg'; + + // Find Windows Azure SDK bin folder + $windowsAzureSdkFolderCandidates = array_merge( + isset($_SERVER['ProgramFiles']) ? glob($_SERVER['ProgramFiles'] . '\Windows Azure SDK\*\bin', GLOB_NOSORT) : array(), + isset($_SERVER['ProgramFiles']) ? glob($_SERVER['ProgramFiles(x86)'] . '\Windows Azure SDK\*\bin', GLOB_NOSORT) : array(), + isset($_SERVER['ProgramFiles']) ? glob($_SERVER['ProgramW6432'] . '\Windows Azure SDK\*\bin', GLOB_NOSORT) : array() + ); + if (count($windowsAzureSdkFolderCandidates) == 0) { + throw new Zend_Service_Console_Exception('Could not locate Windows Azure SDK for PHP.'); + } + $cspack = '"' . $windowsAzureSdkFolderCandidates[0] . '\cspack.exe' . '"'; + $csrun = '"' . $windowsAzureSdkFolderCandidates[0] . '\csrun.exe' . '"'; + + // Open the ServiceDefinition.csdef file and check for role paths + $serviceDefinitionFile = $path . '/ServiceDefinition.csdef'; + if (!file_exists($serviceDefinitionFile)) { + require_once 'Zend/Service/Console/Exception.php'; + throw new Zend_Service_Console_Exception('Could not locate ServiceDefinition.csdef at ' . $serviceDefinitionFile . '.'); + } + $serviceDefinition = simplexml_load_file($serviceDefinitionFile); + $xmlRoles = array(); + if ($serviceDefinition->WebRole) { + if (count($serviceDefinition->WebRole) > 1) { + $xmlRoles = array_merge($xmlRoles, $serviceDefinition->WebRole); + } else { + $xmlRoles = array_merge($xmlRoles, array($serviceDefinition->WebRole)); + } + } + if ($serviceDefinition->WorkerRole) { + if (count($serviceDefinition->WorkerRole) > 1) { + $xmlRoles = array_merge($xmlRoles, $serviceDefinition->WorkerRole); + } else { + $xmlRoles = array_merge($xmlRoles, array($serviceDefinition->WorkerRole)); + } + } + + // Build '/role:' command parameter + $roleArgs = array(); + foreach ($xmlRoles as $xmlRole) { + if ($xmlRole["name"]) { + $roleArgs[] = '/role:' . $xmlRole["name"] . ';' . realpath($path . '/' . $xmlRole["name"]); + } + } + + // Build command + $command = $cspack; + $args = array( + $path . '\ServiceDefinition.csdef', + implode(' ', $roleArgs), + '/out:' . $packageOut + ); + if ($runDevFabric) { + $args[] = '/copyOnly'; + } + passthru($command . ' ' . implode(' ', $args)); + + // Can we copy a configuration file? + $serviceConfigurationFile = $path . '/ServiceConfiguration.cscfg'; + $serviceConfigurationFileOut = $outputPath . '/ServiceConfiguration.cscfg'; + if (file_exists($serviceConfigurationFile) && !file_exists($serviceConfigurationFileOut)) { + copy($serviceConfigurationFile, $serviceConfigurationFileOut); + } + + // Do we have to start the development fabric? + if ($runDevFabric) { + passthru($csrun . ' /devstore:start /devfabric:start'); + passthru($csrun . ' /removeAll'); + passthru($csrun . ' /run:"' . $packageOut . ';' . $serviceConfigurationFileOut . '" /launchBrowser'); + } + } + + /** + * Creates a scaffolder from a given path. + * + * @command-name CreateScaffolder + * @command-description Creates a scaffolder from a given path. + * + * @command-parameter-for $rootPath Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Path|-p Required. The path to package into a scaffolder. + * @command-parameter-for $scaffolderFile Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --OutFile|-out Required. The filename of the scaffolder. + */ + public function createScaffolderCommand($rootPath, $scaffolderFile) + { + $archive = new Phar($scaffolderFile); + $archive->buildFromIterator( + new RecursiveIteratorIterator( + new RecursiveDirectoryIterator(realpath($rootPath))), + realpath($rootPath)); + } +} +Zend_Service_Console_Command::bootstrap($_SERVER['argv']); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,249 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +abstract class Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageScaffolderAbstract +{ + /** + * Invokes the scaffolder. + * + * @param Phar $phar Phar archive containing the current scaffolder. + * @param string $root Path Root path. + * @param array $options Options array (key/value). + */ + abstract public function invoke(Phar $phar, $rootPath, $options = array()); + + /** + * Writes output to STDERR, followed by a newline (optional) + * + * @param string $message + * @param string $newLine + */ + protected function log($message, $newLine = true) + { + if (error_reporting() === 0) { + return; + } + file_put_contents('php://stderr', $message . ($newLine ? "\r\n" : '')); + } + + /** + * Extract resources to a file system path + * + * @param Phar $phar Phar archive. + * @param string $path Output path root. + */ + protected function extractResources(Phar $phar, $path) + { + $this->deleteDirectory($path); + $phar->extractTo($path); + @unlink($path . '/index.php'); + @unlink($path . '/build.bat'); + $this->copyDirectory($path . '/resources', $path, false); + $this->deleteDirectory($path . '/resources'); + } + + /** + * Apply file transforms. + * + * @param string $rootPath Root path. + * @param array $values Key/value array. + */ + protected function applyTransforms($rootPath, $values) + { + if (is_null($rootPath) || !is_string($rootPath) || empty($rootPath)) { + throw new InvalidArgumentException("Undefined \"rootPath\""); + } + + if (is_dir($rootPath)) { + $d = dir($rootPath); + while ( false !== ( $entry = $d->read() ) ) { + if ( $entry == '.' || $entry == '..' ) { + continue; + } + $entry = $rootPath . '/' . $entry; + + $this->applyTransforms($entry, $values); + } + $d->close(); + } else { + $contents = file_get_contents($rootPath); + foreach ($values as $key => $value) { + $contents = str_replace('$' . $key . '$', $value, $contents); + } + file_put_contents($rootPath, $contents); + } + + return true; + } + + /** + * Create directory + * + * @param string $path Path of directory to create. + * @param boolean $abortIfExists Abort if directory exists. + * @param boolean $recursive Create parent directories if not exist. + * + * @return boolean + */ + protected function createDirectory($path, $abortIfExists = true, $recursive = true) { + if (is_null($path) || !is_string($path) || empty($path)) { + throw new InvalidArgumentException ("Undefined \"path\"" ); + } + + if (is_dir($path) && $abortIfExists) { + return false; + } + + if (is_dir($path) ) { + @chmod($path, '0777'); + if (!self::deleteDirectory($path) ) { + throw new RuntimeException("Failed to delete \"{$path}\"."); + } + } + + if (!mkdir($path, '0777', $recursive) || !is_dir($path)) { + throw new RuntimeException( "Failed to create directory \"{$path}\"." ); + } + + return true; + } + + /** + * Fully copy a source directory to a target directory. + * + * @param string $sourcePath Source directory + * @param string $destinationPath Target directory + * @param boolean $abortIfExists Query re-creating target directory if exists + * @param octal $mode Changes access mode + * + * @return boolean + */ + protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists = true, $mode = '0777') { + if (is_null($sourcePath) || !is_string($sourcePath) || empty($sourcePath)) { + throw new InvalidArgumentException("Undefined \"sourcePath\""); + } + + if (is_null($destinationPath) || !is_string($destinationPath) || empty($destinationPath)) { + throw new InvalidArgumentException("Undefined \"destinationPath\""); + } + + if (is_dir($destinationPath) && $abortIfExists) { + return false; + } + + if (is_dir($sourcePath)) { + if (!is_dir($destinationPath) && !mkdir($destinationPath, $mode)) { + throw new RuntimeException("Failed to create target directory \"{$destinationPath}\"" ); + } + $d = dir($sourcePath); + while ( false !== ( $entry = $d->read() ) ) { + if ( $entry == '.' || $entry == '..' ) { + continue; + } + $strSourceEntry = $sourcePath . '/' . $entry; + $strTargetEntry = $destinationPath . '/' . $entry; + if (is_dir($strSourceEntry) ) { + $this->copyDirectory( + $strSourceEntry, + $strTargetEntry, + false, + $mode + ); + continue; + } + if (!copy($strSourceEntry, $strTargetEntry) ) { + throw new RuntimeException ( + "Failed to copy" + . " file \"{$strSourceEntry}\"" + . " to \"{$strTargetEntry}\"" + ); + } + } + $d->close(); + } else { + if (!copy($sourcePath, $destinationPath)) { + throw new RuntimeException ( + "Failed to copy" + . " file \"{$sourcePath}\"" + . " to \"{$destinationPath}\"" + + ); + } + } + + return true; + } + + /** + * Delete directory and all of its contents; + * + * @param string $path Directory path + * @return boolean + */ + protected function deleteDirectory($path) + { + if (is_null($path) || !is_string($path) || empty($path)) { + throw new InvalidArgumentException( "Undefined \"path\"" ); + } + + $handleDir = false; + if (is_dir($path) ) { + $handleDir = @opendir($path); + } + if (!$handleDir) { + return false; + } + @chmod($path, 0777); + while ($file = readdir($handleDir)) { + if ($file == '.' || $file == '..') { + continue; + } + + $fsEntity = $path . "/" . $file; + + if (is_dir($fsEntity)) { + $this->deleteDirectory($fsEntity); + continue; + } + + if (is_file($fsEntity)) { + @unlink($fsEntity); + continue; + } + + throw new LogicException ( + "Unexpected file type: \"{$fsEntity}\"" + ); + } + + @chmod($path, 0777); + closedir($handleDir); + @rmdir($path); + + return true; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder.phar Binary file web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder.phar has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/build.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/build.bat Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,1 @@ +php ..\..\Package.php CreateScaffolder -p:"./" -out:"..\DefaultScaffolder.phar" \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,63 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + + +/** + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Scaffolder + extends Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageScaffolderAbstract +{ + /** + * Invokes the scaffolder. + * + * @param Phar $phar Phar archive containing the current scaffolder. + * @param string $root Path Root path. + * @param array $options Options array (key/value). + */ + public function invoke(Phar $phar, $rootPath, $options = array()) + { + // Check required parameters + if (empty($options['DiagnosticsConnectionString'])) { + require_once 'Zend/Service/Console/Exception.php'; + throw new Zend_Service_Console_Exception('Missing argument for scaffolder: DiagnosticsConnectionString'); + } + + // Extract to disk + $this->log('Extracting resources...'); + $this->createDirectory($rootPath); + $this->extractResources($phar, $rootPath); + $this->log('Extracted resources.'); + + // Apply transforms + $this->log('Applying transforms...'); + $this->applyTransforms($rootPath, $options); + $this->log('Applied transforms.'); + + // Show "to do" message + $contentRoot = realpath($rootPath . '/PhpOnAzure.Web'); + echo "\r\n"; + echo "Note: before packaging your application, please copy your application code to $contentRoot"; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/Web.config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/Web.config Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<configuration> + <system.diagnostics> + <trace> + <listeners> + <add type="zend.service.windowsazure.Diagnostics.DiagnosticMonitorTraceListener, zend.service.windowsazure.Diagnostics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics"> + <filter type="" /> + </add> + </listeners> + </trace> + </system.diagnostics> + <system.webServer> + <defaultDocument> + <files> + <clear /> + <add value="index.php" /> + </files> + </defaultDocument> + </system.webServer> +</configuration> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/add-environment-variables.cmd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/add-environment-variables.cmd Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,7 @@ +@echo off +ECHO "Adding extra environment variables..." >> ..\startup-tasks-log.txt + +powershell.exe Set-ExecutionPolicy Unrestricted +powershell.exe .\add-environment-variables.ps1 >> ..\startup-tasks-log.txt 2>>..\startup-tasks-error-log.txt + +ECHO "Added extra environment variables." >> ..\startup-tasks-log.txt \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/add-environment-variables.ps1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/add-environment-variables.ps1 Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,15 @@ +[Reflection.Assembly]::LoadWithPartialName("zend.service.windowsazure.ServiceRuntime") + +$rdRoleId = [Environment]::GetEnvironmentVariable("RdRoleId", "Machine") + +[Environment]::SetEnvironmentVariable("RdRoleId", [zend.service.windowsazure.ServiceRuntime.RoleEnvironment]::CurrentRoleInstance.Id, "Machine") +[Environment]::SetEnvironmentVariable("RoleName", [zend.service.windowsazure.ServiceRuntime.RoleEnvironment]::CurrentRoleInstance.Role.Name, "Machine") +[Environment]::SetEnvironmentVariable("RoleInstanceID", [zend.service.windowsazure.ServiceRuntime.RoleEnvironment]::CurrentRoleInstance.Id, "Machine") +[Environment]::SetEnvironmentVariable("RoleDeploymentID", [zend.service.windowsazure.ServiceRuntime.RoleEnvironment]::DeploymentId, "Machine") + + +if ($rdRoleId -ne [zend.service.windowsazure.ServiceRuntime.RoleEnvironment]::CurrentRoleInstance.Id) { + Restart-Computer +} + +[Environment]::SetEnvironmentVariable('Path', $env:RoleRoot + '\base\x86;' + [Environment]::GetEnvironmentVariable('Path', 'Machine'), 'Machine') \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/install-php.cmd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/bin/install-php.cmd Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,12 @@ +@echo off +ECHO "Starting PHP installation..." >> ..\startup-tasks-log.txt + +md "%~dp0appdata" +cd "%~dp0appdata" +cd .. + +reg add "hku\.default\software\microsoft\windows\currentversion\explorer\user shell folders" /v "Local AppData" /t REG_EXPAND_SZ /d "%~dp0appdata" /f +"..\resources\WebPICmdLine\webpicmdline" /Products:PHP53,SQLDriverPHP53IIS /AcceptEula >> ..\startup-tasks-log.txt 2>>..\startup-tasks-error-log.txt +reg add "hku\.default\software\microsoft\windows\currentversion\explorer\user shell folders" /v "Local AppData" /t REG_EXPAND_SZ /d %%USERPROFILE%%\AppData\Local /f + +ECHO "Completed PHP installation." >> ..\startup-tasks-log.txt \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/diagnostics.wadcfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/diagnostics.wadcfg Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<DiagnosticMonitorConfiguration xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration" configurationChangePollInterval="PT1M" overallQuotaInMB="4096"> + <DiagnosticInfrastructureLogs bufferQuotaInMB="10" + scheduledTransferLogLevelFilter="Error" + scheduledTransferPeriod="PT1M" /> + + <Logs bufferQuotaInMB="0" + scheduledTransferLogLevelFilter="Verbose" + scheduledTransferPeriod="PT1M" /> + + <Directories bufferQuotaInMB="0" + scheduledTransferPeriod="PT5M"> + +  + <CrashDumps container="wad-crash-dumps" directoryQuotaInMB="256" /> + <FailedRequestLogs container="wad-frq" directoryQuotaInMB="256" /> + <IISLogs container="wad-iis" directoryQuotaInMB="256" /> + </Directories> + + <PerformanceCounters bufferQuotaInMB="0" scheduledTransferPeriod="PT1M"> +  + <PerformanceCounterConfiguration + counterSpecifier="\Processor(_Total)\% Processor Time" sampleRate="PT5M" /> + <PerformanceCounterConfiguration + counterSpecifier="\Memory\Available Mbytes" sampleRate="PT5M" /> + </PerformanceCounters> + <WindowsEventLog bufferQuotaInMB="0" + scheduledTransferLogLevelFilter="Verbose" + scheduledTransferPeriod="PT5M"> +  + <DataSource name="System!*" /> + </WindowsEventLog> +</DiagnosticMonitorConfiguration> diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.Deployment.dll Binary file web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.Deployment.dll has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.PlatformInstaller.UI.dll Binary file web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.PlatformInstaller.UI.dll has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.PlatformInstaller.dll Binary file web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/Microsoft.Web.PlatformInstaller.dll has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/WebpiCmdLine.exe Binary file web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/WebpiCmdLine.exe has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/license.rtf Binary file web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web/resources/WebPICmdLine/license.rtf has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/ServiceConfiguration.cscfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/ServiceConfiguration.cscfg Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<ServiceConfiguration serviceName="PhpOnAzure" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="2" osVersion="*"> + <Role name="PhpOnAzure.Web"> + <Instances count="1" /> + <ConfigurationSettings> + <Setting name="zend.service.windowsazure.Plugins.Diagnostics.ConnectionString" value="$DiagnosticsConnectionString$"/> + </ConfigurationSettings> + </Role> +</ServiceConfiguration> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/ServiceDefinition.csdef --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/ServiceDefinition.csdef Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<ServiceDefinition name="PhpOnAzure" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition"> + <WebRole name="PhpOnAzure.Web" enableNativeCodeExecution="true"> + <Sites> + <Site name="Web" physicalDirectory="./PhpOnAzure.Web"> + <Bindings> + <Binding name="Endpoint1" endpointName="HttpEndpoint" /> + </Bindings> + </Site> + </Sites> + <Startup> + <Task commandLine="add-environment-variables.cmd" executionContext="elevated" taskType="simple" /> + <Task commandLine="install-php.cmd" executionContext="elevated" taskType="simple" /> + </Startup> + <Endpoints> + <InputEndpoint name="HttpEndpoint" protocol="http" port="80" /> + </Endpoints> + <Imports> + <Import moduleName="Diagnostics"/> + </Imports> + <ConfigurationSettings> + </ConfigurationSettings> + </WebRole> +</ServiceDefinition> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Service.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Service.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,192 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Console + * @subpackage Exception + * @version $Id$ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + + +/** + * Service commands + * + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @command-handler service + * @command-handler-description Windows Azure Service commands + * @command-handler-header Windows Azure SDK for PHP + * @command-handler-header Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com) + * @command-handler-footer Note: Parameters that are common across all commands can be stored + * @command-handler-footer in two dedicated environment variables. + * @command-handler-footer - SubscriptionId: The Windows Azure Subscription Id to operate on. + * @command-handler-footer - Certificate The Windows Azure .cer Management Certificate. + * @command-handler-footer + * @command-handler-footer All commands support the --ConfigurationFile or -F parameter. + * @command-handler-footer The parameter file is a simple INI file carrying one parameter + * @command-handler-footer value per line. It accepts the same parameters as one can + * @command-handler-footer use from the command line command. + */ +class Zend_Service_WindowsAzure_CommandLine_Service + extends Zend_Service_Console_Command +{ + /** + * List hosted service accounts for a specified subscription. + * + * @command-name List + * @command-description List hosted service accounts for a specified subscription. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-example List hosted service accounts for subscription: + * @command-example List -sid:"<your_subscription_id>" -cert:"mycert.pem" + */ + public function listCommand($subscriptionId, $certificate, $certificatePassphrase) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->listHostedServices(); + + if (count($result) == 0) { + echo 'No data to display.'; + } + foreach ($result as $object) { + $this->_displayObjectInformation($object, array('ServiceName', 'Url')); + } + } + + /** + * Get hosted service account properties. + * + * @command-name GetProperties + * @command-description Get hosted service account properties. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-example Get hosted service account properties for service "phptest": + * @command-example GetProperties -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"phptest" + */ + public function getPropertiesCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getHostedServiceProperties($serviceName); + + $this->_displayObjectInformation($result, array('ServiceName', 'Label', 'AffinityGroup', 'Location')); + } + + /** + * Get hosted service account property. + * + * @command-name GetProperty + * @command-description Get storage account property. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Name Required. The hosted service account name to operate on. + * @command-parameter-for $property Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Property|-prop Required. The property to retrieve for the hosted service account. + * @command-example Get hosted service account property "Url" for service "phptest": + * @command-example GetProperty -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --Name:"phptest" --Property:Url + */ + public function getPropertyCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $property) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getHostedServiceProperties($serviceName); + + printf("%s\r\n", $result->$property); + } + + /** + * Create hosted service account. + * + * @command-name Create + * @command-description Create hosted service account. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Name Required. The hosted service account name. + * @command-parameter-for $label Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Label Required. A label for the hosted service. + * @command-parameter-for $description Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Description Optional. A description for the hosted service. + * @command-parameter-for $location Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Location Required if AffinityGroup is not specified. The location where the hosted service will be created. + * @command-parameter-for $affinityGroup Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --AffinityGroup Required if Location is not specified. The name of an existing affinity group associated with this subscription. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Create hosted service account in West Europe + * @command-example Create -p:"phpazure" --Name:"phptestsdk2" --Label:"phptestsdk2" --Location:"West Europe" + */ + public function createCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $label, $description, $location, $affinityGroup, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $client->createHostedService($serviceName, $label, $description, $location, $affinityGroup); + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Update hosted service account. + * + * @command-name Update + * @command-description Update hosted service account. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Name Required. The hosted service account name. + * @command-parameter-for $label Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Label Required. A label for the hosted service. + * @command-parameter-for $description Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Description Optional. A description for the hosted service. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Update hosted service + * @command-example Update -p:"phpazure" --Name:"phptestsdk2" --Label:"New label" --Description:"Some description" + */ + public function updateCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $label, $description, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $client->updateHostedService($serviceName, $label, $description); + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } + + /** + * Delete hosted service account. + * + * @command-name Delete + * @command-description Delete hosted service account. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $serviceName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Name Required. The hosted service account name. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Delete hosted service + * @command-example Delete -p:"phpazure" --Name:"phptestsdk2" + */ + public function deleteCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $client->deleteHostedService($serviceName); + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } +} + +Zend_Service_Console_Command::bootstrap($_SERVER['argv']); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/CommandLine/Storage.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/CommandLine/Storage.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,189 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_Console + * @subpackage Exception + * @version $Id$ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + + +/** + * Storage commands + * + * @category Zend + * @package Zend_Service_WindowsAzure_CommandLine + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @command-handler storage + * @command-handler-description Windows Azure Storage commands + * @command-handler-header Windows Azure SDK for PHP + * @command-handler-header Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com) + * @command-handler-footer Note: Parameters that are common across all commands can be stored + * @command-handler-footer in two dedicated environment variables. + * @command-handler-footer - SubscriptionId: The Windows Azure Subscription Id to operate on. + * @command-handler-footer - Certificate The Windows Azure .cer Management Certificate. + * @command-handler-footer + * @command-handler-footer All commands support the --ConfigurationFile or -F parameter. + * @command-handler-footer The parameter file is a simple INI file carrying one parameter + * @command-handler-footer value per line. It accepts the same parameters as one can + * @command-handler-footer use from the command line command. + */ +class Zend_Service_WindowsAzure_CommandLine_Storage + extends Zend_Service_Console_Command +{ + /** + * List storage accounts for a specified subscription. + * + * @command-name ListAccounts + * @command-description List storage accounts for a specified subscription. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-example List storage accounts for subscription: + * @command-example ListAccounts -sid:"<your_subscription_id>" -cert:"mycert.pem" + */ + public function listAccountsCommand($subscriptionId, $certificate, $certificatePassphrase) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->listStorageAccounts(); + + if (count($result) == 0) { + echo 'No data to display.'; + } + foreach ($result as $object) { + $this->_displayObjectInformation($object, array('ServiceName', 'Url')); + } + } + + /** + * Get storage account properties. + * + * @command-name GetProperties + * @command-description Get storage account properties. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $accountName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --AccountName Required. The storage account name to operate on. + * @command-example Get storage account properties for account "phptest": + * @command-example GetProperties -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --AccountName:"phptest" + */ + public function getPropertiesCommand($subscriptionId, $certificate, $certificatePassphrase, $accountName) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getStorageAccountProperties($accountName); + + $this->_displayObjectInformation($result, array('ServiceName', 'Label', 'AffinityGroup', 'Location')); + } + + /** + * Get storage account property. + * + * @command-name GetProperty + * @command-description Get storage account property. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $accountName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --AccountName Required. The storage account name to operate on. + * @command-parameter-for $property Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Property|-prop Required. The property to retrieve for the storage account. + * @command-example Get storage account property "Url" for account "phptest": + * @command-example GetProperty -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --AccountName:"phptest" --Property:Url + */ + public function getPropertyCommand($subscriptionId, $certificate, $certificatePassphrase, $accountName, $property) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getStorageAccountProperties($accountName); + + printf("%s\r\n", $result->$property); + } + + /** + * Get storage account keys. + * + * @command-name GetKeys + * @command-description Get storage account keys. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $accountName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --AccountName Required. The storage account name to operate on. + * @command-example Get storage account keys for account "phptest": + * @command-example GetKeys -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --AccountName:"phptest" + */ + public function getKeysCommand($subscriptionId, $certificate, $certificatePassphrase, $accountName) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getStorageAccountKeys($accountName); + + $this->_displayObjectInformation((object)array('Key' => 'primary', 'Value' => $result[0]), array('Key', 'Value')); + $this->_displayObjectInformation((object)array('Key' => 'secondary', 'Value' => $result[1]), array('Key', 'Value')); + } + + /** + * Get storage account key. + * + * @command-name GetKey + * @command-description Get storage account key. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $accountName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --AccountName Required. The storage account name to operate on. + * @command-parameter-for $key Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Key|-k Optional. Specifies the key to regenerate (primary|secondary). If omitted, primary key is used as the default. + * @command-example Get primary storage account key for account "phptest": + * @command-example GetKey -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --AccountName:"phptest" -Key:primary + */ + public function getKeyCommand($subscriptionId, $certificate, $certificatePassphrase, $accountName, $key = 'primary') + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $result = $client->getStorageAccountKeys($accountName); + + if (strtolower($key) == 'secondary') { + printf("%s\r\n", $result[1]); + } + printf("%s\r\n", $result[0]); + } + + /** + * Regenerate storage account keys. + * + * @command-name RegenerateKeys + * @command-description Regenerate storage account keys. + * @command-parameter-for $subscriptionId Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --SubscriptionId|-sid Required. This is the Windows Azure Subscription Id to operate on. + * @command-parameter-for $certificate Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --Certificate|-cert Required. This is the .pem certificate that user has uploaded to Windows Azure subscription as Management Certificate. + * @command-parameter-for $certificatePassphrase Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Prompt --Passphrase|-p Required. The certificate passphrase. If not specified, a prompt will be displayed. + * @command-parameter-for $accountName Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile|Zend_Service_Console_Command_ParameterSource_Env --AccountName Required. The storage account name to operate on. + * @command-parameter-for $key Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --Key|-k Optional. Specifies the key to regenerate (primary|secondary). If omitted, primary key is used as the default. + * @command-parameter-for $waitForOperation Zend_Service_Console_Command_ParameterSource_Argv|Zend_Service_Console_Command_ParameterSource_ConfigFile --WaitFor|-w Optional. Wait for the operation to complete? + * @command-example Regenerate secondary key for account "phptest": + * @command-example RegenerateKeys -sid:"<your_subscription_id>" -cert:"mycert.pem" + * @command-example --AccountName:"phptest" -Key:secondary + */ + public function regenerateKeysCommand($subscriptionId, $certificate, $certificatePassphrase, $accountName, $key = 'primary', $waitForOperation = false) + { + $client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase); + $client->regenerateStorageAccountKey($accountName, $key); + if ($waitForOperation) { + $client->waitForOperation(); + } + echo $client->getLastRequestId(); + } +} + +Zend_Service_Console_Command::bootstrap($_SERVER['argv']); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php --- a/web/lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,25 +14,16 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CredentialsAbstract.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: CredentialsAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Service_WindowsAzure_Credentials_Exception - */ -require_once 'Zend/Service/WindowsAzure/Credentials/Exception.php'; /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_WindowsAzure_Credentials_CredentialsAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Credentials/Exception.php --- a/web/lib/Zend/Service/WindowsAzure/Credentials/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Credentials/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,7 +16,7 @@ * @package Zend_Service_WindowsAzure * @subpackage Exception * @version $Id$ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Credentials_Exception extends Zend_Service_WindowsAzure_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php --- a/web/lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SharedAccessSignature.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: SharedAccessSignature.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,19 +25,9 @@ require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php'; /** - * @see Zend_Service_WindowsAzure_Storage - */ -require_once 'Zend/Service/WindowsAzure/Storage.php'; - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Credentials_SharedAccessSignature @@ -93,6 +83,7 @@ { foreach ($value as $url) { if (strpos($url, $this->_accountName) === false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('The permission set can only contain URLs for the account name specified in the Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance.'); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php --- a/web/lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SharedKey.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: SharedKey.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,24 +25,9 @@ require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php'; /** - * @see Zend_Service_WindowsAzure_Storage - */ -require_once 'Zend/Service/WindowsAzure/Storage.php'; - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Service_WindowsAzure_Credentials_Exception - */ -require_once 'Zend/Service/WindowsAzure/Credentials/Exception.php'; - -/** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Credentials_SharedKey @@ -91,6 +76,7 @@ // Table storage? if ($forTableStorage) { + require_once 'Zend/Service/WindowsAzure/Credentials/Exception.php'; throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKey authentication on table storage. Use SharedKeyLite authentication instead.'); } @@ -115,7 +101,7 @@ } // Build canonicalized headers - if ($headers !== null) { + if (!is_null($headers)) { foreach ($headers as $header => $value) { if (is_bool($value)) { $value = $value === true ? 'True' : 'False'; @@ -138,7 +124,7 @@ if ($queryString !== '') { $queryStringItems = $this->_makeArrayOfQueryString($queryString); foreach ($queryStringItems as $key => $value) { - $canonicalizedResource .= "\n" . strtolower($key) . ':' . $value; + $canonicalizedResource .= "\n" . strtolower($key) . ':' . urldecode($value); } } @@ -149,7 +135,7 @@ && strtoupper($httpVerb) != Zend_Http_Client::HEAD) { $contentLength = 0; - if ($rawData !== null) { + if (!is_null($rawData)) { $contentLength = strlen($rawData); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php --- a/web/lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SharedKeyLite.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: SharedKeyLite.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,24 +25,9 @@ require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php'; /** - * @see Zend_Service_WindowsAzure_Storage - */ -require_once 'Zend/Service/WindowsAzure/Storage.php'; - -/** - * @see Zend_Service_WindowsAzure_Credentials_SharedKey - */ -require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php'; - -/** - * @see Zend_Service_WindowsAzure_Credentials_Exception - */ -require_once 'Zend/Service/WindowsAzure/Credentials/Exception.php'; - -/** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Credentials_SharedKeyLite @@ -89,6 +74,7 @@ ) { // Table storage? if (!$forTableStorage) { + require_once 'Zend/Service/WindowsAzure/Credentials/Exception.php'; throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKeyLite authentication on blob or queue storage. Use SharedKey authentication instead.'); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,22 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** - * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php'; @@ -59,7 +49,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property int OverallQuotaInMB Overall quota in MB diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,31 +15,17 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** - * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; - -/** - * @see Zend_Service_WindowsAzure_Diagnostics_LogLevel - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/LogLevel.php'; /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property int BufferQuotaInMB Buffer quota in MB diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; @@ -39,7 +34,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property int BufferQuotaInMB Buffer quota in MB diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; @@ -39,7 +34,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources DataSources Data sources @@ -116,9 +111,10 @@ // Assign Directories settings $this->DataSources->Directories->BufferQuotaInMB = (int)$configurationXml->DataSources->Directories->BufferQuotaInMB; $this->DataSources->Directories->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->Directories->ScheduledTransferPeriodInMinutes; + if ($configurationXml->DataSources->Directories->Subscriptions && $configurationXml->DataSources->Directories->Subscriptions->DirectoryConfiguration) { - $subscriptions = $configurationXml->DataSources->WindowsEventLog->Subscriptions; + $subscriptions = $configurationXml->DataSources->Directories->Subscriptions; if (count($subscriptions->DirectoryConfiguration) > 1) { $subscriptions = $subscriptions->DirectoryConfiguration; } else { @@ -212,6 +208,7 @@ $returnValue[] = ' </Directories>'; $returnValue[] = ' </DataSources>'; + $returnValue[] = ' <IsDefault>false</IsDefault>'; $returnValue[] = '</ConfigRequest>'; // Return diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; @@ -39,7 +34,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property int BufferQuotaInMB Buffer quota in MB diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,21 +15,16 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract @@ -52,7 +47,7 @@ $this->_data[strtolower($name)] = $value; return; } - + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception("Unknown property: " . $name); } @@ -65,7 +60,7 @@ if (array_key_exists(strtolower($name), $this->_data)) { return $this->_data[strtolower($name)]; } - + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception("Unknown property: " . $name); } } \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; @@ -39,7 +34,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property int BufferQuotaInMB Buffer quota in MB @@ -72,6 +67,7 @@ */ public function addSubscription($counterSpecifier, $sampleRateInSeconds = 1) { + $this->_data['subscriptions'][$counterSpecifier] = new Zend_Service_WindowsAzure_Diagnostics_PerformanceCounterSubscription($counterSpecifier, $sampleRateInSeconds); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,31 +15,16 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** - * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; - -/** - * @see Zend_Service_WindowsAzure_Diagnostics_LogLevel - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/LogLevel.php'; - -/** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property int BufferQuotaInMB Buffer quota in MB diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,26 +15,17 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** - * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string Path Path diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/Exception.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,21 +15,18 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_WindowsAzure_Exception - */ require_once 'Zend/Service/WindowsAzure/Exception.php'; /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Diagnostics_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Diagnostics_LogLevel diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,22 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Storage_Blob - */ -require_once 'Zend/Service/WindowsAzure/Storage/Blob.php'; - -/** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php'; @@ -39,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Diagnostics_Manager @@ -101,7 +91,8 @@ */ public function configurationForRoleInstanceExists($roleInstance = null) { - if ($roleInstance === null) { + if (is_null($roleInstance)) { + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Role instance should be specified. Try reading $_SERVER[\'RdRoleId\'] for this information if the application is hosted on Windows Azure Fabric or Development Fabric.'); } @@ -117,10 +108,11 @@ public function configurationForCurrentRoleInstanceExists() { if (!isset($_SERVER['RdRoleId'])) { + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Server variable \'RdRoleId\' is unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.'); } - return $this->_blobStorageClient->blobExists($this->_controlContainer, $_SERVER['RdRoleId']); + return $this->_blobStorageClient->blobExists($this->_controlContainer, $this->_getCurrentRoleInstanceId()); } /** @@ -132,9 +124,41 @@ public function getConfigurationForCurrentRoleInstance() { if (!isset($_SERVER['RdRoleId'])) { + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; + throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Server variable \'RdRoleId\' is unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.'); + } + return $this->getConfigurationForRoleInstance($this->_getCurrentRoleInstanceId()); + } + + /** + * Get the current role instance ID. Only works on Development Fabric or Windows Azure Fabric. + * + * @return string + * @throws Zend_Service_WindowsAzure_Diagnostics_Exception + */ + protected function _getCurrentRoleInstanceId() + { + if (!isset($_SERVER['RdRoleId'])) { + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Server variable \'RdRoleId\' is unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.'); } - return $this->getConfigurationForRoleInstance($_SERVER['RdRoleId']); + + if (strpos($_SERVER['RdRoleId'], 'deployment(') === false) { + return $_SERVER['RdRoleId']; + } else { + $roleIdParts = explode('.', $_SERVER['RdRoleId']); + return $roleIdParts[0] . '/' . $roleIdParts[2] . '/' . $_SERVER['RdRoleId']; + } + + if (!isset($_SERVER['RoleDeploymentID']) && !isset($_SERVER['RoleInstanceID']) && !isset($_SERVER['RoleName'])) { + throw new Exception('Server variables \'RoleDeploymentID\', \'RoleInstanceID\' and \'RoleName\' are unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.'); + } + + if (strpos($_SERVER['RdRoleId'], 'deployment(') === false) { + return $_SERVER['RdRoleId']; + } else { + return $_SERVER['RoleDeploymentID'] . '/' . $_SERVER['RoleInstanceID'] . '/' . $_SERVER['RoleName']; + } } /** @@ -146,9 +170,11 @@ public function setConfigurationForCurrentRoleInstance(Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration) { if (!isset($_SERVER['RdRoleId'])) { + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Server variable \'RdRoleId\' is unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.'); } - $this->setConfigurationForRoleInstance($_SERVER['RdRoleId'], $configuration); + + $this->setConfigurationForRoleInstance($this->_getCurrentRoleInstanceId(), $configuration); } /** @@ -160,10 +186,13 @@ */ public function getConfigurationForRoleInstance($roleInstance = null) { - if ($roleInstance === null) { + if (is_null($roleInstance)) { + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Role instance should be specified. Try reading $_SERVER[\'RdRoleId\'] for this information if the application is hosted on Windows Azure Fabric or Development Fabric.'); } + + if ($this->_blobStorageClient->blobExists($this->_controlContainer, $roleInstance)) { $configurationInstance = new Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance(); $configurationInstance->loadXml( $this->_blobStorageClient->getBlobData($this->_controlContainer, $roleInstance) ); @@ -182,7 +211,8 @@ */ public function setConfigurationForRoleInstance($roleInstance = null, Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration) { - if ($roleInstance === null) { + if (is_null($roleInstance)) { + require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Role instance should be specified. Try reading $_SERVER[\'RdRoleId\'] for this information if the application is hosted on Windows Azure Fabric or Development Fabric.'); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; @@ -34,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string CounterSpecifier Counter specifier diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Exception.php --- a/web/lib/Zend/Service/WindowsAzure/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Exception - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Exception extends Zend_Service_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Log/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Log/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,38 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Exception + * @version $Id: Exception.php 25285 2013-03-09 10:30:20Z frosch $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** + * @see Zend_Service_WindowsAzure_Exception + */ +require_once 'Zend/Service/WindowsAzure/Exception.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Log + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_WindowsAzure_Log_Exception + extends Zend_Service_WindowsAzure_Exception +{ +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Log/Formatter/WindowsAzure.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Log/Formatter/WindowsAzure.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,73 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Storage + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Log_Formatter_Interface + */ +require_once 'Zend/Log/Formatter/Interface.php'; + +/** + * @see Zend_Service_WindowsAzure_Storage_DynamicTableEntity + */ +require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Log + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_WindowsAzure_Log_Formatter_WindowsAzure + implements Zend_Log_Formatter_Interface +{ + /** + * Write a message to the table storage + * + * @param array $event + * + * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity + */ + public function format($event) + { + // partition key is the current date, represented as YYYYMMDD + // row key will always be the current timestamp. These values MUST be hardcoded. + $logEntity = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity( + date('Ymd'), microtime(true) + ); + // Windows Azure automatically adds the timestamp, but the timezone is most of the time + // different compared to the origin server's timezone, so add this timestamp aswell. + $event['server_timestamp'] = $event['timestamp']; + unset($event['timestamp']); + + foreach ($event as $key => $value) { + if ((is_object($value) && !method_exists($value, '__toString')) + || is_array($value) + ) { + $value = gettype($value); + } + $logEntity->{$key} = $value; + } + + return $logEntity; + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Log/Writer/WindowsAzure.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Log/Writer/WindowsAzure.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,196 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Storage + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Log_Writer_Abstract + */ +require_once 'Zend/Log/Writer/Abstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Log + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_WindowsAzure_Log_Writer_WindowsAzure + extends Zend_Log_Writer_Abstract +{ + /** + * @var Zend_Service_Log_Formatter_Interface + */ + protected $_formatter; + + /** + * Connection to a windows Azure + * + * @var Zend_Service_Service_WindowsAzure_Storage_Table + */ + protected $_tableStorageConnection = null; + + /** + * Name of the table to use for logging purposes + * + * @var string + */ + protected $_tableName = null; + + /** + * Whether to keep all messages to be logged in an external buffer until the script ends and + * only then to send the messages in batch to the logging component. + * + * @var bool + */ + protected $_bufferMessages = false; + + /** + * If message buffering is activated, it will store all the messages in this buffer and only + * write them to table storage (in a batch transaction) when the script ends. + * + * @var array + */ + protected $_messageBuffer = array(); + + /** + * @param Zend_Service_Service_WindowsAzure_Storage_Table|Zend_Service_WindowsAzure_Storage_Table $tableStorageConnection + * @param string $tableName + * @param bool $createTable create the Windows Azure table for logging if it does not exist + * @param bool $bufferMessages + * @throws Zend_Service_Log_Exception + */ + public function __construct( + Zend_Service_WindowsAzure_Storage_Table $tableStorageConnection, + $tableName, $createTable = true, $bufferMessages = true + ) + { + if ($tableStorageConnection == null) { + require_once 'Zend/Service/Log/Exception.php'; + throw new Zend_Service_Log_Exception( + 'No connection to the Windows Azure tables provided.' + ); + } + + if (!is_string($tableName)) { + require_once 'Zend/Service/Log/Exception.php'; + throw new Zend_Service_Log_Exception( + 'Provided Windows Azure table name must be a string.' + ); + } + + $this->_tableStorageConnection = $tableStorageConnection; + $this->_tableName = $tableName; + + // create the logging table if it does not exist. It will add some overhead, so it's optional + if ($createTable) { + $this->_tableStorageConnection->createTableIfNotExists( + $this->_tableName + ); + } + + // keep messages to be logged in an internal buffer and only send them over the wire when + // the script execution ends + if ($bufferMessages) { + $this->_bufferMessages = $bufferMessages; + } + + $this->_formatter = + new Zend_Service_WindowsAzure_Log_Formatter_WindowsAzure(); + } + + /** + * If the log messages have been stored in the internal buffer, just send them + * to table storage. + */ + public function shutdown() + { + parent::shutdown(); + if ($this->_bufferMessages) { + $this->_tableStorageConnection->startBatch(); + foreach ($this->_messageBuffer as $logEntity) { + $this->_tableStorageConnection->insertEntity( + $this->_tableName, $logEntity + ); + } + $this->_tableStorageConnection->commit(); + } + } + + /** + * Create a new instance of Zend_Service_Log_Writer_WindowsAzure + * + * @param array $config + * @return Zend_Service_Log_Writer_WindowsAzure + * @throws Zend_Service_Log_Exception + */ + static public function factory($config) + { + $config = self::_parseConfig($config); + $config = array_merge( + array( + 'connection' => null, + 'tableName' => null, + 'createTable' => true, + ), $config + ); + + return new self( + $config['connection'], + $config['tableName'], + $config['createTable'] + ); + } + + /** + * The only formatter accepted is already loaded in the constructor + * + * @todo enable custom formatters using the WindowsAzure_Storage_DynamicTableEntity class + */ + public function setFormatter( + Zend_Service_Log_Formatter_Interface $formatter + ) + { + require_once 'Zend/Service/Log/Exception.php'; + throw new Zend_Service_Log_Exception( + get_class($this) . ' does not support formatting'); + } + + /** + * Write a message to the table storage. If buffering is activated, then messages will just be + * added to an internal buffer. + * + * @param array $event + * @return void + * @todo format the event using a formatted, not in this method + */ + protected function _write($event) + { + $logEntity = $this->_formatter->format($event); + + if ($this->_bufferMessages) { + $this->_messageBuffer[] = $logEntity; + } else { + $this->_tableStorageConnection->insertEntity( + $this->_tableName, $logEntity + ); + } + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,66 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Name The affinity group name. + * @property string $Label A label for the affinity group. + * @property string $Description A description for the affinity group. + * @property string $Location The location of the affinity group. + * @property array $HostedServices A list of hosted services in this affinity gtoup. + * @property array $StorageServices A list of storage services in this affinity gtoup. + */ +class Zend_Service_WindowsAzure_Management_AffinityGroupInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @property string $name The affinity group name. + * @property string $label A label for the affinity group. + * @property string $description A description for the affinity group. + * @property string $location The location of the affinity group. + * @property array $hostedServices A list of hosted services in this affinity gtoup. + * @property array $storageServices A list of storage services in this affinity gtoup. + */ + public function __construct($name, $label, $description, $location, $hostedServices = array(), $storageServices = array()) + { + $this->_data = array( + 'name' => $name, + 'label' => base64_decode($label), + 'description' => $description, + 'location' => $location, + 'hostedservices' => $hostedServices, + 'storageservices' => $storageServices + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/CertificateInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/CertificateInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,60 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $CertificateUrl Certificate thumbprint address. + * @property string $Thumbprint Certificate thumbprint. + * @property string $ThumbprintAlgorithm Certificate thumbprint algorithm. + * @property string $Data Certificate data. + */ +class Zend_Service_WindowsAzure_Management_CertificateInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $certificateUrl Certificate thumbprint address. + * @param string $thumbprint Certificate thumbprint. + * @param string $thumbprintAlgorithm Certificate thumbprint algorithm. + * @param string $data Certificate data. + */ + public function __construct($certificateUrl, $thumbprint, $thumbprintAlgorithm, $data) + { + $this->_data = array( + 'certificateurl' => $certificateUrl, + 'thumbprint' => $thumbprint, + 'thumbprintalgorithm' => $thumbprintAlgorithm, + 'data' => base64_decode($data) + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/Client.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,2423 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_OperationStatusInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/OperationStatusInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_SubscriptionOperationInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_DeploymentInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/DeploymentInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Storage_Blob + */ +require_once 'Zend/Service/WindowsAzure/Storage/Blob.php'; + +/** + * @see Zend_Service_WindowsAzure_Storage_Table + */ +require_once 'Zend/Service/WindowsAzure/Storage/Table.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_HostedServiceInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/HostedServiceInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_CertificateInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/CertificateInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_AffinityGroupInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_LocationInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/LocationInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_OperatingSystemInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php'; + +/** + * @see Zend_Service_WindowsAzure_Management_OperatingSystemFamilyInstance + */ +require_once 'Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_WindowsAzure_Management_Client +{ + /** + * Management service URL + */ + const URL_MANAGEMENT = "https://management.core.windows.net"; + + /** + * Operations + */ + const OP_OPERATIONS = "operations"; + const OP_STORAGE_ACCOUNTS = "services/storageservices"; + const OP_HOSTED_SERVICES = "services/hostedservices"; + const OP_AFFINITYGROUPS = "affinitygroups"; + const OP_LOCATIONS = "locations"; + const OP_OPERATINGSYSTEMS = "operatingsystems"; + const OP_OPERATINGSYSTEMFAMILIES = "operatingsystemfamilies"; + + /** + * Current API version + * + * @var string + */ + protected $_apiVersion = '2011-02-25'; + + /** + * Subscription ID + * + * @var string + */ + protected $_subscriptionId = ''; + + /** + * Management certificate path (.PEM) + * + * @var string + */ + protected $_certificatePath = ''; + + /** + * Management certificate passphrase + * + * @var string + */ + protected $_certificatePassphrase = ''; + + /** + * Zend_Http_Client channel used for communication with REST services + * + * @var Zend_Http_Client + */ + protected $_httpClientChannel = null; + + /** + * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance + * + * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract + */ + protected $_retryPolicy = null; + + /** + * Returns the last request ID + * + * @var string + */ + protected $_lastRequestId = null; + + /** + * Creates a new Zend_Service_WindowsAzure_Management instance + * + * @param string $subscriptionId Subscription ID + * @param string $certificatePath Management certificate path (.PEM) + * @param string $certificatePassphrase Management certificate passphrase + * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests + */ + public function __construct( + $subscriptionId, + $certificatePath, + $certificatePassphrase, + Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null + ) { + $this->_subscriptionId = $subscriptionId; + $this->_certificatePath = $certificatePath; + $this->_certificatePassphrase = $certificatePassphrase; + + $this->_retryPolicy = $retryPolicy; + if (is_null($this->_retryPolicy)) { + $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry(); + } + + // Setup default Zend_Http_Client channel + $options = array( + 'adapter' => 'Zend_Http_Client_Adapter_Socket', + 'ssltransport' => 'ssl', + 'sslcert' => $this->_certificatePath, + 'sslpassphrase' => $this->_certificatePassphrase, + 'sslusecontext' => true, + ); + if (function_exists('curl_init')) { + // Set cURL options if cURL is used afterwards + $options['curloptions'] = array( + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_TIMEOUT => 120, + ); + } + $this->_httpClientChannel = new Zend_Http_Client(null, $options); + } + + /** + * Set the HTTP client channel to use + * + * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name. + */ + public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Socket') + { + $this->_httpClientChannel->setAdapter($adapterInstance); + } + + /** + * Retrieve HTTP client channel + * + * @return Zend_Http_Client_Adapter_Interface + */ + public function getHttpClientChannel() + { + return $this->_httpClientChannel; + } + + /** + * Returns the Windows Azure subscription ID + * + * @return string + */ + public function getSubscriptionId() + { + return $this->_subscriptionId; + } + + /** + * Returns the last request ID. + * + * @return string + */ + public function getLastRequestId() + { + return $this->_lastRequestId; + } + + /** + * Get base URL for creating requests + * + * @return string + */ + public function getBaseUrl() + { + return self::URL_MANAGEMENT . '/' . $this->_subscriptionId; + } + + /** + * Perform request using Zend_Http_Client channel + * + * @param string $path Path + * @param string $queryString Query string + * @param string $httpVerb HTTP verb the request will use + * @param array $headers x-ms headers to add + * @param mixed $rawData Optional RAW HTTP data to be sent over the wire + * @return Zend_Http_Response + */ + protected function _performRequest( + $path = '/', + $queryString = '', + $httpVerb = Zend_Http_Client::GET, + $headers = array(), + $rawData = null + ) { + // Clean path + if (strpos($path, '/') !== 0) { + $path = '/' . $path; + } + + // Clean headers + if (is_null($headers)) { + $headers = array(); + } + + // Ensure cUrl will also work correctly: + // - disable Content-Type if required + // - disable Expect: 100 Continue + if (!isset($headers["Content-Type"])) { + $headers["Content-Type"] = ''; + } + //$headers["Expect"] = ''; + + // Add version header + $headers['x-ms-version'] = $this->_apiVersion; + + // URL encoding + $path = self::urlencode($path); + $queryString = self::urlencode($queryString); + + // Generate URL and sign request + $requestUrl = $this->getBaseUrl() . $path . $queryString; + $requestHeaders = $headers; + + // Prepare request + $this->_httpClientChannel->resetParameters(true); + $this->_httpClientChannel->setUri($requestUrl); + $this->_httpClientChannel->setHeaders($requestHeaders); + $this->_httpClientChannel->setRawData($rawData); + + // Execute request + $response = $this->_retryPolicy->execute( + array($this->_httpClientChannel, 'request'), + array($httpVerb) + ); + + // Store request id + $this->_lastRequestId = $response->getHeader('x-ms-request-id'); + + return $response; + } + + /** + * Parse result from Zend_Http_Response + * + * @param Zend_Http_Response $response Response from HTTP call + * @return object + * @throws Zend_Service_WindowsAzure_Exception + */ + protected function _parseResponse(Zend_Http_Response $response = null) + { + if (is_null($response)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception('Response should not be null.'); + } + + $xml = @simplexml_load_string($response->getBody()); + + if ($xml !== false) { + // Fetch all namespaces + $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); + + // Register all namespace prefixes + foreach ($namespaces as $prefix => $ns) { + if ($prefix != '') { + $xml->registerXPathNamespace($prefix, $ns); + } + } + } + + return $xml; + } + + /** + * URL encode function + * + * @param string $value Value to encode + * @return string Encoded value + */ + public static function urlencode($value) + { + return str_replace(' ', '%20', $value); + } + + /** + * Builds a query string from an array of elements + * + * @param array Array of elements + * @return string Assembled query string + */ + public static function createQueryStringFromArray($queryString) + { + return count($queryString) > 0 ? '?' . implode('&', $queryString) : ''; + } + + /** + * Get error message from Zend_Http_Response + * + * @param Zend_Http_Response $response Repsonse + * @param string $alternativeError Alternative error message + * @return string + */ + protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.') + { + $response = $this->_parseResponse($response); + if ($response && $response->Message) { + return (string)$response->Message; + } else { + return $alternativeError; + } + } + + /** + * The Get Operation Status operation returns the status of the specified operation. + * After calling an asynchronous operation, you can call Get Operation Status to + * determine whether the operation has succeed, failed, or is still in progress. + * + * @param string $requestId The request ID. If omitted, the last request ID will be used. + * @return Zend_Service_WindowsAzure_Management_OperationStatusInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getOperationStatus($requestId = '') + { + if ($requestId == '') { + $requestId = $this->getLastRequestId(); + } + + $response = $this->_performRequest(self::OP_OPERATIONS . '/' . $requestId); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!is_null($result)) { + return new Zend_Service_WindowsAzure_Management_OperationStatusInstance( + (string)$result->ID, + (string)$result->Status, + ($result->Error ? (string)$result->Error->Code : ''), + ($result->Error ? (string)$result->Error->Message : '') + ); + } + return null; + } else { + require_once 'Zend/Service/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + + + /** + * The List Subscription Operations operation returns a list of create, update, + * and delete operations that were performed on a subscription during the specified timeframe. + * Documentation on the parameters can be found at http://msdn.microsoft.com/en-us/library/gg715318.aspx. + * + * @param string $startTime The start of the timeframe to begin listing subscription operations in UTC format. This parameter and the $endTime parameter indicate the timeframe to retrieve subscription operations. This parameter cannot indicate a start date of more than 90 days in the past. + * @param string $endTime The end of the timeframe to begin listing subscription operations in UTC format. This parameter and the $startTime parameter indicate the timeframe to retrieve subscription operations. + * @param string $objectIdFilter Returns subscription operations only for the specified object type and object ID. + * @param string $operationResultFilter Returns subscription operations only for the specified result status, either Succeeded, Failed, or InProgress. + * @param string $continuationToken Internal usage. + * @return array Array of Zend_Service_WindowsAzure_Management_SubscriptionOperationInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function listSubscriptionOperations($startTime, $endTime, $objectIdFilter = null, $operationResultFilter = null, $continuationToken = null) + { + if ($startTime == '' || is_null($startTime)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Start time should be specified.'); + } + if ($endTime == '' || is_null($endTime)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('End time should be specified.'); + } + if ($operationResultFilter != '' && !is_null($operationResultFilter)) { + $operationResultFilter = strtolower($operationResultFilter); + if ($operationResultFilter != 'succeeded' && $operationResultFilter != 'failed' && $operationResultFilter != 'inprogress') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('OperationResultFilter should be succeeded|failed|inprogress.'); + } + } + + $parameters = array(); + $parameters[] = 'StartTime=' . $startTime; + $parameters[] = 'EndTime=' . $endTime; + if ($objectIdFilter != '' && !is_null($objectIdFilter)) { + $parameters[] = 'ObjectIdFilter=' . $objectIdFilter; + } + if ($operationResultFilter != '' && !is_null($operationResultFilter)) { + $parameters[] = 'OperationResultFilter=' . ucfirst($operationResultFilter); + } + if ($continuationToken != '' && !is_null($continuationToken)) { + $parameters[] = 'ContinuationToken=' . $continuationToken; + } + + $response = $this->_performRequest(self::OP_OPERATIONS, '?' . implode('&', $parameters)); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + $namespaces = $result->getDocNamespaces(); + $result->registerXPathNamespace('__empty_ns', $namespaces['']); + + $xmlOperations = $result->xpath('//__empty_ns:SubscriptionOperation'); + + // Create return value + $returnValue = array(); + foreach ($xmlOperations as $xmlOperation) { + // Create operation instance + $operation = new Zend_Service_WindowsAzure_Management_SubscriptionOperationInstance( + $xmlOperation->OperationId, + $xmlOperation->OperationObjectId, + $xmlOperation->OperationName, + array(), + (array)$xmlOperation->OperationCaller, + (array)$xmlOperation->OperationStatus + ); + + // Parse parameters + $xmlOperation->registerXPathNamespace('__empty_ns', $namespaces['']); + $xmlParameters = $xmlOperation->xpath('.//__empty_ns:OperationParameter'); + foreach ($xmlParameters as $xmlParameter) { + $xmlParameterDetails = $xmlParameter->children('http://schemas.datacontract.org/2004/07/Microsoft.Samples.WindowsAzure.ServiceManagement'); + $operation->addOperationParameter((string)$xmlParameterDetails->Name, (string)$xmlParameterDetails->Value); + } + + // Add to result + $returnValue[] = $operation; + } + + // More data? + if (!is_null($result->ContinuationToken) && $result->ContinuationToken != '') { + $returnValue = array_merge($returnValue, $this->listSubscriptionOperations($startTime, $endTime, $objectIdFilter, $operationResultFilter, (string)$result->ContinuationToken)); + } + + // Return + return $returnValue; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * Wait for an operation to complete + * + * @param string $requestId The request ID. If omitted, the last request ID will be used. + * @param int $sleepInterval Sleep interval in milliseconds. + * @return Zend_Service_WindowsAzure_Management_OperationStatusInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function waitForOperation($requestId = '', $sleepInterval = 250) + { + if ($requestId == '') { + $requestId = $this->getLastRequestId(); + } + if ($requestId == '' || is_null($requestId)) { + return null; + } + + $status = $this->getOperationStatus($requestId); + while ($status->Status == 'InProgress') { + $status = $this->getOperationStatus($requestId); + usleep($sleepInterval); + } + + return $status; + } + + /** + * Creates a new Zend_Service_WindowsAzure_Storage_Blob instance for the current account + * + * @param string $serviceName the service name to create a storage client for. + * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests + * @return Zend_Service_WindowsAzure_Storage_Blob + */ + public function createBlobClientForService($serviceName, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null) + { + if ($serviceName == '' || is_null($serviceName)) { + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $storageKeys = $this->getStorageAccountKeys($serviceName); + + + + return new Zend_Service_WindowsAzure_Storage_Blob( + Zend_Service_WindowsAzure_Storage::URL_CLOUD_BLOB, + $serviceName, + $storageKeys[0], + false, + $retryPolicy + ); + } + + /** + * Creates a new Zend_Service_WindowsAzure_Storage_Table instance for the current account + * + * @param string $serviceName the service name to create a storage client for. + * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests + * @return Zend_Service_WindowsAzure_Storage_Table + */ + public function createTableClientForService($serviceName, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $storageKeys = $this->getStorageAccountKeys($serviceName); + + return new Zend_Service_WindowsAzure_Storage_Table( + Zend_Service_WindowsAzure_Storage::URL_CLOUD_TABLE, + $serviceName, + $storageKeys[0], + false, + $retryPolicy + ); + } + + /** + * Creates a new Zend_Service_WindowsAzure_Storage_Queue instance for the current account + * + * @param string $serviceName the service name to create a storage client for. + * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests + * @return Zend_Service_WindowsAzure_Storage_Queue + */ + public function createQueueClientForService($serviceName, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $storageKeys = $this->getStorageAccountKeys($serviceName); + + require_once 'Zend/Service/WindowsAzure/Storage/Queue.php'; + + return new Zend_Service_WindowsAzure_Storage_Queue( + Zend_Service_WindowsAzure_Storage::URL_CLOUD_QUEUE, + $serviceName, + $storageKeys[0], + false, + $retryPolicy + ); + } + + /** + * The List Storage Accounts operation lists the storage accounts available under + * the current subscription. + * + * @return array An array of Zend_Service_WindowsAzure_Management_StorageServiceInstance + */ + public function listStorageAccounts() + { + $response = $this->_performRequest(self::OP_STORAGE_ACCOUNTS); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!$result->StorageService) { + return array(); + } + if (count($result->StorageService) > 1) { + $xmlServices = $result->StorageService; + } else { + $xmlServices = array($result->StorageService); + } + + $services = array(); + if (!is_null($xmlServices)) { + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_WindowsAzure_Management_StorageServiceInstance( + (string)$xmlServices[$i]->Url, + (string)$xmlServices[$i]->ServiceName + ); + } + } + return $services; + } else { + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Storage Account Properties operation returns the system properties for the + * specified storage account. These properties include: the address, description, and + * label of the storage account; and the name of the affinity group to which the service + * belongs, or its geo-location if it is not part of an affinity group. + * + * @param string $serviceName The name of your service. + * @return Zend_Service_WindowsAzure_Management_StorageServiceInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getStorageAccountProperties($serviceName) + { + if ($serviceName == '' || is_null($serviceName)) { + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $response = $this->_performRequest(self::OP_STORAGE_ACCOUNTS . '/' . $serviceName); + + if ($response->isSuccessful()) { + $xmlService = $this->_parseResponse($response); + + if (!is_null($xmlService)) { + require_once 'Zend/Service/WindowsAzure/Management/StorageServiceInstance.php'; + + return new Zend_Service_WindowsAzure_Management_StorageServiceInstance( + (string)$xmlService->Url, + (string)$xmlService->ServiceName, + (string)$xmlService->StorageServiceProperties->Description, + (string)$xmlService->StorageServiceProperties->AffinityGroup, + (string)$xmlService->StorageServiceProperties->Location, + (string)$xmlService->StorageServiceProperties->Label + ); + } + return null; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Storage Keys operation returns the primary + * and secondary access keys for the specified storage account. + * + * @param string $serviceName The name of your service. + * @return array An array of strings + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getStorageAccountKeys($serviceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $response = $this->_performRequest(self::OP_STORAGE_ACCOUNTS . '/' . $serviceName . '/keys'); + + if ($response->isSuccessful()) { + $xmlService = $this->_parseResponse($response); + + if (!is_null($xmlService)) { + return array( + (string)$xmlService->StorageServiceKeys->Primary, + (string)$xmlService->StorageServiceKeys->Secondary + ); + } + return array(); + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Regenerate Keys operation regenerates the primary + * or secondary access key for the specified storage account. + * + * @param string $serviceName The name of your service. + * @param string $key The key to regenerate (primary or secondary) + * @return array An array of strings + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function regenerateStorageAccountKey($serviceName, $key = 'primary') + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $key = strtolower($key); + if ($key != 'primary' && $key != 'secondary') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Key identifier should be primary|secondary.'); + } + + $response = $this->_performRequest( + self::OP_STORAGE_ACCOUNTS . '/' . $serviceName . '/keys', '?action=regenerate', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml'), + '<?xml version="1.0" encoding="utf-8"?> + <RegenerateKeys xmlns="http://schemas.microsoft.com/windowsazure"> + <KeyType>' . ucfirst($key) . '</KeyType> + </RegenerateKeys>'); + + if ($response->isSuccessful()) { + $xmlService = $this->_parseResponse($response); + + if (!is_null($xmlService)) { + return array( + (string)$xmlService->StorageServiceKeys->Primary, + (string)$xmlService->StorageServiceKeys->Secondary + ); + } + return array(); + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The List Hosted Services operation lists the hosted services available + * under the current subscription. + * + * @return array An array of Zend_Service_WindowsAzure_Management_HostedServiceInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function listHostedServices() + { + $response = $this->_performRequest(self::OP_HOSTED_SERVICES); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!$result->HostedService) { + return array(); + } + if (count($result->HostedService) > 1) { + $xmlServices = $result->HostedService; + } else { + $xmlServices = array($result->HostedService); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_WindowsAzure_Management_HostedServiceInstance( + (string)$xmlServices[$i]->Url, + (string)$xmlServices[$i]->ServiceName + ); + } + } + return $services; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Create Hosted Service operation creates a new hosted service in Windows Azure. + * + * @param string $serviceName A name for the hosted service that is unique to the subscription. + * @param string $label A label for the hosted service. The label may be up to 100 characters in length. + * @param string $description A description for the hosted service. The description may be up to 1024 characters in length. + * @param string $location Required if AffinityGroup is not specified. The location where the hosted service will be created. + * @param string $affinityGroup Required if Location is not specified. The name of an existing affinity group associated with this subscription. + */ + public function createHostedService($serviceName, $label, $description = '', $location = null, $affinityGroup = null) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($label == '' || is_null($label)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label should be specified.'); + } + if (strlen($label) > 100) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.'); + } + if (strlen($description) > 1024) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Description is too long. The maximum length is 1024 characters.'); + } + if ( (is_null($location) && is_null($affinityGroup)) || (!is_null($location) && !is_null($affinityGroup)) ) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Please specify a location -or- an affinity group for the service.'); + } + + $locationOrAffinityGroup = is_null($location) + ? '<AffinityGroup>' . $affinityGroup . '</AffinityGroup>' + : '<Location>' . $location . '</Location>'; + + $response = $this->_performRequest(self::OP_HOSTED_SERVICES, '', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<CreateHostedService xmlns="http://schemas.microsoft.com/windowsazure"><ServiceName>' . $serviceName . '</ServiceName><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description>' . $locationOrAffinityGroup . '</CreateHostedService>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Update Hosted Service operation updates the label and/or the description for a hosted service in Windows Azure. + * + * @param string $serviceName A name for the hosted service that is unique to the subscription. + * @param string $label A label for the hosted service. The label may be up to 100 characters in length. + * @param string $description A description for the hosted service. The description may be up to 1024 characters in length. + */ + public function updateHostedService($serviceName, $label, $description = '') + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($label == '' || is_null($label)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label should be specified.'); + } + if (strlen($label) > 100) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.'); + } + + $response = $this->_performRequest(self::OP_HOSTED_SERVICES . '/' . $serviceName, '', + Zend_Http_Client::PUT, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<UpdateHostedService xmlns="http://schemas.microsoft.com/windowsazure"><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description></UpdateHostedService>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Delete Hosted Service operation deletes the specified hosted service in Windows Azure. + * + * @param string $serviceName A name for the hosted service that is unique to the subscription. + */ + public function deleteHostedService($serviceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $response = $this->_performRequest(self::OP_HOSTED_SERVICES . '/' . $serviceName, '', Zend_Http_Client::DELETE); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Hosted Service Properties operation retrieves system properties + * for the specified hosted service. These properties include the service + * name and service type; the name of the affinity group to which the service + * belongs, or its location if it is not part of an affinity group; and + * optionally, information on the service's deployments. + * + * @param string $serviceName The name of your service. + * @return Zend_Service_WindowsAzure_Management_HostedServiceInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getHostedServiceProperties($serviceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $response = $this->_performRequest(self::OP_HOSTED_SERVICES . '/' . $serviceName, '?embed-detail=true'); + + if ($response->isSuccessful()) { + $xmlService = $this->_parseResponse($response); + + if (!is_null($xmlService)) { + + $returnValue = new Zend_Service_WindowsAzure_Management_HostedServiceInstance( + (string)$xmlService->Url, + (string)$xmlService->ServiceName, + (string)$xmlService->HostedServiceProperties->Description, + (string)$xmlService->HostedServiceProperties->AffinityGroup, + (string)$xmlService->HostedServiceProperties->Location, + (string)$xmlService->HostedServiceProperties->Label + ); + + // Deployments + if (count($xmlService->Deployments->Deployment) > 1) { + $xmlServices = $xmlService->Deployments->Deployment; + } else { + $xmlServices = array($xmlService->Deployments->Deployment); + } + + $deployments = array(); + foreach ($xmlServices as $xmlDeployment) { + $deployments[] = $this->_convertXmlElementToDeploymentInstance($xmlDeployment); + } + $returnValue->Deployments = $deployments; + + return $returnValue; + } + return null; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Create Deployment operation uploads a new service package + * and creates a new deployment on staging or production. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string $name The name for the deployment. The deployment ID as listed on the Windows Azure management portal must be unique among other deployments for the hosted service. + * @param string $label A URL that refers to the location of the service package in the Blob service. The service package must be located in a storage account beneath the same subscription. + * @param string $packageUrl The service configuration file for the deployment. + * @param string $configuration A label for this deployment, up to 100 characters in length. + * @param boolean $startDeployment Indicates whether to start the deployment immediately after it is created. + * @param boolean $treatWarningsAsErrors Indicates whether to treat package validation warnings as errors. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function createDeployment($serviceName, $deploymentSlot, $name, $label, $packageUrl, $configuration, $startDeployment = false, $treatWarningsAsErrors = false) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + if ($name == '' || is_null($name)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Name should be specified.'); + } + if ($label == '' || is_null($label)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label should be specified.'); + } + if (strlen($label) > 100) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.'); + } + if ($packageUrl == '' || is_null($packageUrl)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Package URL should be specified.'); + } + if ($configuration == '' || is_null($configuration)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Configuration should be specified.'); + } + + if (@file_exists($configuration)) { + $configuration = utf8_decode(file_get_contents($configuration)); + } + + // Clean up the configuration + $conformingConfiguration = $this->_cleanConfiguration($configuration); + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot; + $response = $this->_performRequest($operationUrl, '', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<CreateDeployment xmlns="http://schemas.microsoft.com/windowsazure"><Name>' . $name . '</Name><PackageUrl>' . $packageUrl . '</PackageUrl><Label>' . base64_encode($label) . '</Label><Configuration>' . base64_encode($conformingConfiguration) . '</Configuration><StartDeployment>' . ($startDeployment ? 'true' : 'false') . '</StartDeployment><TreatWarningsAsError>' . ($treatWarningsAsErrors ? 'true' : 'false') . '</TreatWarningsAsError></CreateDeployment>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Deployment operation returns configuration information, status, + * and system properties for the specified deployment. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @return Zend_Service_WindowsAzure_Management_DeploymentInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getDeploymentBySlot($serviceName, $deploymentSlot) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot; + return $this->_getDeployment($operationUrl); + } + + /** + * The Get Deployment operation returns configuration information, status, + * and system properties for the specified deployment. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @return Zend_Service_WindowsAzure_Management_DeploymentInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getDeploymentByDeploymentId($serviceName, $deploymentId) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId; + return $this->_getDeployment($operationUrl); + } + + /** + * The Get Deployment operation returns configuration information, status, + * and system properties for the specified deployment. + * + * @param string $operationUrl The operation url + * @return Zend_Service_WindowsAzure_Management_DeploymentInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _getDeployment($operationUrl) + { + $response = $this->_performRequest($operationUrl); + + if ($response->isSuccessful()) { + $xmlService = $this->_parseResponse($response); + + return $this->_convertXmlElementToDeploymentInstance($xmlService); + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Swap Deployment operation initiates a virtual IP swap between + * the staging and production deployment environments for a service. + * If the service is currently running in the staging environment, + * it will be swapped to the production environment. If it is running + * in the production environment, it will be swapped to staging. + * + * @param string $serviceName The service name. + * @param string $productionDeploymentName The name of the production deployment. + * @param string $sourceDeploymentName The name of the source deployment. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function swapDeployment($serviceName, $productionDeploymentName, $sourceDeploymentName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($productionDeploymentName == '' || is_null($productionDeploymentName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Production Deployment ID should be specified.'); + } + if ($sourceDeploymentName == '' || is_null($sourceDeploymentName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Source Deployment ID should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName; + $response = $this->_performRequest($operationUrl, '', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<Swap xmlns="http://schemas.microsoft.com/windowsazure"><Production>' . $productionDeploymentName . '</Production><SourceDeployment>' . $sourceDeploymentName . '</SourceDeployment></Swap>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Delete Deployment operation deletes the specified deployment. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function deleteDeploymentBySlot($serviceName, $deploymentSlot) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot; + return $this->_deleteDeployment($operationUrl); + } + + /** + * The Delete Deployment operation deletes the specified deployment. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function deleteDeploymentByDeploymentId($serviceName, $deploymentId) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId; + return $this->_deleteDeployment($operationUrl); + } + + /** + * The Delete Deployment operation deletes the specified deployment. + * + * @param string $operationUrl The operation url + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _deleteDeployment($operationUrl) + { + $response = $this->_performRequest($operationUrl, '', Zend_Http_Client::DELETE); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Update Deployment Status operation initiates a change in deployment status. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string $status The deployment status (running|suspended) + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function updateDeploymentStatusBySlot($serviceName, $deploymentSlot, $status = 'running') + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + $status = strtolower($status); + if ($status != 'running' && $status != 'suspended') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Status should be running|suspended.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot; + return $this->_updateDeploymentStatus($operationUrl, $status); + } + + /** + * The Update Deployment Status operation initiates a change in deployment status. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @param string $status The deployment status (running|suspended) + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function updateDeploymentStatusByDeploymentId($serviceName, $deploymentId, $status = 'running') + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + $status = strtolower($status); + if ($status != 'running' && $status != 'suspended') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Status should be running|suspended.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId; + return $this->_updateDeploymentStatus($operationUrl, $status); + } + + /** + * The Update Deployment Status operation initiates a change in deployment status. + * + * @param string $operationUrl The operation url + * @param string $status The deployment status (running|suspended) + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _updateDeploymentStatus($operationUrl, $status = 'running') + { + $response = $this->_performRequest($operationUrl . '/', '?comp=status', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<UpdateDeploymentStatus xmlns="http://schemas.microsoft.com/windowsazure"><Status>' . ucfirst($status) . '</Status></UpdateDeploymentStatus>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * Converts an XmlElement into a Zend_Service_WindowsAzure_Management_DeploymentInstance + * + * @param object $xmlService The XML Element + * @return Zend_Service_WindowsAzure_Management_DeploymentInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _convertXmlElementToDeploymentInstance($xmlService) + { + if (!is_null($xmlService)) { + + $returnValue = new Zend_Service_WindowsAzure_Management_DeploymentInstance( + (string)$xmlService->Name, + (string)$xmlService->DeploymentSlot, + (string)$xmlService->PrivateID, + (string)$xmlService->Label, + (string)$xmlService->Url, + (string)$xmlService->Configuration, + (string)$xmlService->Status, + (string)$xmlService->UpgradeStatus, + (string)$xmlService->UpgradeType, + (string)$xmlService->CurrentUpgradeDomainState, + (string)$xmlService->CurrentUpgradeDomain, + (string)$xmlService->UpgradeDomainCount + ); + + // Append role instances + if ($xmlService->RoleInstanceList && $xmlService->RoleInstanceList->RoleInstance) { + $xmlRoleInstances = $xmlService->RoleInstanceList->RoleInstance; + if (count($xmlService->RoleInstanceList->RoleInstance) == 1) { + $xmlRoleInstances = array($xmlService->RoleInstanceList->RoleInstance); + } + + $roleInstances = array(); + if (!is_null($xmlRoleInstances)) { + for ($i = 0; $i < count($xmlRoleInstances); $i++) { + $roleInstances[] = array( + 'rolename' => (string)$xmlRoleInstances[$i]->RoleName, + 'instancename' => (string)$xmlRoleInstances[$i]->InstanceName, + 'instancestatus' => (string)$xmlRoleInstances[$i]->InstanceStatus + ); + } + } + + $returnValue->RoleInstanceList = $roleInstances; + } + + // Append roles + if ($xmlService->RoleList && $xmlService->RoleList->Role) { + $xmlRoles = $xmlService->RoleList->Role; + if (count($xmlService->RoleList->Role) == 1) { + $xmlRoles = array($xmlService->RoleList->Role); + } + + $roles = array(); + if (!is_null($xmlRoles)) { + for ($i = 0; $i < count($xmlRoles); $i++) { + $roles[] = array( + 'rolename' => (string)$xmlRoles[$i]->RoleName, + 'osversion' => (!is_null($xmlRoles[$i]->OsVersion) ? (string)$xmlRoles[$i]->OsVersion : (string)$xmlRoles[$i]->OperatingSystemVersion) + ); + } + } + $returnValue->RoleList = $roles; + } + + return $returnValue; + } + return null; + } + + /** + * Updates a deployment's role instance count. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string|array $roleName The role name + * @param string|array $instanceCount The instance count + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function setInstanceCountBySlot($serviceName, $deploymentSlot, $roleName, $instanceCount) { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + if ($roleName == '' || is_null($roleName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Role name name should be specified.'); + } + + // Get configuration + $deployment = $this->getDeploymentBySlot($serviceName, $deploymentSlot); + $configuration = $deployment->Configuration; + $configuration = $this->_updateInstanceCountInConfiguration($roleName, $instanceCount, $configuration); + + // Update configuration + $this->configureDeploymentBySlot($serviceName, $deploymentSlot, $configuration); + } + + /** + * Updates a deployment's role instance count. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string|array $roleName The role name + * @param string|array $instanceCount The instance count + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function setInstanceCountByDeploymentId($serviceName, $deploymentId, $roleName, $instanceCount) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + if ($roleName == '' || is_null($roleName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Role name name should be specified.'); + } + + // Get configuration + $deployment = $this->getDeploymentByDeploymentId($serviceName, $deploymentId); + $configuration = $deployment->Configuration; + $configuration = $this->_updateInstanceCountInConfiguration($roleName, $instanceCount, $configuration); + + // Update configuration + $this->configureDeploymentByDeploymentId($serviceName, $deploymentId, $configuration); + } + + /** + * Updates instance count in configuration XML. + * + * @param string|array $roleName The role name + * @param string|array $instanceCount The instance count + * @param string $configuration XML configuration represented as a string + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _updateInstanceCountInConfiguration($roleName, $instanceCount, $configuration) { + // Change variables + if (!is_array($roleName)) { + $roleName = array($roleName); + } + if (!is_array($instanceCount)) { + $instanceCount = array($instanceCount); + } + + $configuration = preg_replace('/(<\?xml[^?]+?)utf-16/i', '$1utf-8', $configuration); + //$configuration = '<?xml version="1.0">' . substr($configuration, strpos($configuration, '>') + 2); + + $xml = simplexml_load_string($configuration); + + // http://www.php.net/manual/en/simplexmlelement.xpath.php#97818 + $namespaces = $xml->getDocNamespaces(); + $xml->registerXPathNamespace('__empty_ns', $namespaces['']); + + for ($i = 0; $i < count($roleName); $i++) { + $elements = $xml->xpath('//__empty_ns:Role[@name="' . $roleName[$i] . '"]/__empty_ns:Instances'); + + if (count($elements) == 1) { + $element = $elements[0]; + $element['count'] = $instanceCount[$i]; + } + } + + $configuration = $xml->asXML(); + //$configuration = preg_replace('/(<\?xml[^?]+?)utf-8/i', '$1utf-16', $configuration); + + return $configuration; + } + + /** + * The Change Deployment Configuration request may be specified as follows. + * Note that you can change a deployment's configuration either by specifying the deployment + * environment (staging or production), or by specifying the deployment's unique name. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string $configuration XML configuration represented as a string + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function configureDeploymentBySlot($serviceName, $deploymentSlot, $configuration) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + if ($configuration == '' || is_null($configuration)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Configuration name should be specified.'); + } + + if (@file_exists($configuration)) { + $configuration = utf8_decode(file_get_contents($configuration)); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot; + return $this->_configureDeployment($operationUrl, $configuration); + } + + /** + * The Change Deployment Configuration request may be specified as follows. + * Note that you can change a deployment's configuration either by specifying the deployment + * environment (staging or production), or by specifying the deployment's unique name. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @param string $configuration XML configuration represented as a string + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function configureDeploymentByDeploymentId($serviceName, $deploymentId, $configuration) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + if ($configuration == '' || is_null($configuration)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Configuration name should be specified.'); + } + + if (@file_exists($configuration)) { + $configuration = utf8_decode(file_get_contents($configuration)); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId; + return $this->_configureDeployment($operationUrl, $configuration); + } + + /** + * The Change Deployment Configuration request may be specified as follows. + * Note that you can change a deployment's configuration either by specifying the deployment + * environment (staging or production), or by specifying the deployment's unique name. + * + * @param string $operationUrl The operation url + * @param string $configuration XML configuration represented as a string + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _configureDeployment($operationUrl, $configuration) + { + // Clean up the configuration + $conformingConfiguration = $this->_cleanConfiguration($configuration); + + $response = $this->_performRequest($operationUrl . '/', '?comp=config', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<ChangeConfiguration xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><Configuration>' . base64_encode($conformingConfiguration) . '</Configuration></ChangeConfiguration>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Upgrade Deployment operation initiates an upgrade. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string $label A URL that refers to the location of the service package in the Blob service. The service package must be located in a storage account beneath the same subscription. + * @param string $packageUrl The service configuration file for the deployment. + * @param string $configuration A label for this deployment, up to 100 characters in length. + * @param string $mode The type of upgrade to initiate. Possible values are Auto or Manual. + * @param string $roleToUpgrade The name of the specific role to upgrade. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function upgradeDeploymentBySlot($serviceName, $deploymentSlot, $label, $packageUrl, $configuration, $mode = 'auto', $roleToUpgrade = null) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + if ($label == '' || is_null($label)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label should be specified.'); + } + if (strlen($label) > 100) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.'); + } + if ($packageUrl == '' || is_null($packageUrl)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Package URL should be specified.'); + } + if ($configuration == '' || is_null($configuration)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Configuration should be specified.'); + } + $mode = strtolower($mode); + if ($mode != 'auto' && $mode != 'manual') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Mode should be auto|manual.'); + } + + if (@file_exists($configuration)) { + $configuration = utf8_decode(file_get_contents($configuration)); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot; + return $this->_upgradeDeployment($operationUrl, $label, $packageUrl, $configuration, $mode, $roleToUpgrade); + } + + /** + * The Upgrade Deployment operation initiates an upgrade. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @param string $label A URL that refers to the location of the service package in the Blob service. The service package must be located in a storage account beneath the same subscription. + * @param string $packageUrl The service configuration file for the deployment. + * @param string $configuration A label for this deployment, up to 100 characters in length. + * @param string $mode The type of upgrade to initiate. Possible values are Auto or Manual. + * @param string $roleToUpgrade The name of the specific role to upgrade. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function upgradeDeploymentByDeploymentId($serviceName, $deploymentId, $label, $packageUrl, $configuration, $mode = 'auto', $roleToUpgrade = null) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + if ($label == '' || is_null($label)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label should be specified.'); + } + if (strlen($label) > 100) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.'); + } + if ($packageUrl == '' || is_null($packageUrl)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Package URL should be specified.'); + } + if ($configuration == '' || is_null($configuration)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Configuration should be specified.'); + } + $mode = strtolower($mode); + if ($mode != 'auto' && $mode != 'manual') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Mode should be auto|manual.'); + } + + if (@file_exists($configuration)) { + $configuration = utf8_decode(file_get_contents($configuration)); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId; + return $this->_upgradeDeployment($operationUrl, $label, $packageUrl, $configuration, $mode, $roleToUpgrade); + } + + + /** + * The Upgrade Deployment operation initiates an upgrade. + * + * @param string $operationUrl The operation url + * @param string $label A URL that refers to the location of the service package in the Blob service. The service package must be located in a storage account beneath the same subscription. + * @param string $packageUrl The service configuration file for the deployment. + * @param string $configuration A label for this deployment, up to 100 characters in length. + * @param string $mode The type of upgrade to initiate. Possible values are Auto or Manual. + * @param string $roleToUpgrade The name of the specific role to upgrade. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _upgradeDeployment($operationUrl, $label, $packageUrl, $configuration, $mode, $roleToUpgrade) + { + // Clean up the configuration + $conformingConfiguration = $this->_cleanConfiguration($configuration); + + $response = $this->_performRequest($operationUrl . '/', '?comp=upgrade', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<UpgradeDeployment xmlns="http://schemas.microsoft.com/windowsazure"><Mode>' . ucfirst($mode) . '</Mode><PackageUrl>' . $packageUrl . '</PackageUrl><Configuration>' . base64_encode($conformingConfiguration) . '</Configuration><Label>' . base64_encode($label) . '</Label>' . (!is_null($roleToUpgrade) ? '<RoleToUpgrade>' . $roleToUpgrade . '</RoleToUpgrade>' : '') . '</UpgradeDeployment>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Walk Upgrade Domain operation specifies the next upgrade domain to be walked during an in-place upgrade. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param int $upgradeDomain An integer value that identifies the upgrade domain to walk. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function walkUpgradeDomainBySlot($serviceName, $deploymentSlot, $upgradeDomain = 0) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot; + return $this->_walkUpgradeDomain($operationUrl, $upgradeDomain); + } + + /** + * The Walk Upgrade Domain operation specifies the next upgrade domain to be walked during an in-place upgrade. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @param int $upgradeDomain An integer value that identifies the upgrade domain to walk. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function walkUpgradeDomainByDeploymentId($serviceName, $deploymentId, $upgradeDomain = 0) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId; + return $this->_walkUpgradeDomain($operationUrl, $upgradeDomain); + } + + + /** + * The Walk Upgrade Domain operation specifies the next upgrade domain to be walked during an in-place upgrade. + * + * @param string $operationUrl The operation url + * @param int $upgradeDomain An integer value that identifies the upgrade domain to walk. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _walkUpgradeDomain($operationUrl, $upgradeDomain = 0) + { + $response = $this->_performRequest($operationUrl . '/', '?comp=walkupgradedomain', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<WalkUpgradeDomain xmlns="http://schemas.microsoft.com/windowsazure"><UpgradeDomain>' . $upgradeDomain . '</UpgradeDomain></WalkUpgradeDomain>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Reboot Role Instance operation requests a reboot of a role instance + * that is running in a deployment. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string $roleInstanceName The role instance name + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function rebootRoleInstanceBySlot($serviceName, $deploymentSlot, $roleInstanceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + if ($roleInstanceName == '' || is_null($roleInstanceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot . '/roleinstances/' . $roleInstanceName; + return $this->_rebootOrReimageRoleInstance($operationUrl, 'reboot'); + } + + /** + * The Reboot Role Instance operation requests a reboot of a role instance + * that is running in a deployment. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @param string $roleInstanceName The role instance name + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function rebootRoleInstanceByDeploymentId($serviceName, $deploymentId, $roleInstanceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + if ($roleInstanceName == '' || is_null($roleInstanceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId . '/roleinstances/' . $roleInstanceName; + return $this->_rebootOrReimageRoleInstance($operationUrl, 'reboot'); + } + + /** + * The Reimage Role Instance operation requests a reimage of a role instance + * that is running in a deployment. + * + * @param string $serviceName The service name + * @param string $deploymentSlot The deployment slot (production or staging) + * @param string $roleInstanceName The role instance name + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function reimageRoleInstanceBySlot($serviceName, $deploymentSlot, $roleInstanceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + $deploymentSlot = strtolower($deploymentSlot); + if ($deploymentSlot != 'production' && $deploymentSlot != 'staging') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.'); + } + if ($roleInstanceName == '' || is_null($roleInstanceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot . '/roleinstances/' . $roleInstanceName; + return $this->_rebootOrReimageRoleInstance($operationUrl, 'reimage'); + } + + /** + * The Reimage Role Instance operation requests a reimage of a role instance + * that is running in a deployment. + * + * @param string $serviceName The service name + * @param string $deploymentId The deployment ID as listed on the Windows Azure management portal + * @param string $roleInstanceName The role instance name + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function reimageRoleInstanceByDeploymentId($serviceName, $deploymentId, $roleInstanceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($deploymentId == '' || is_null($deploymentId)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.'); + } + if ($roleInstanceName == '' || is_null($roleInstanceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId . '/roleinstances/' . $roleInstanceName; + return $this->_rebootOrReimageRoleInstance($operationUrl, 'reimage'); + } + + /** + * Reboots or reimages a role instance. + * + * @param string $operationUrl The operation url + * @param string $operation The operation (reboot|reimage) + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + protected function _rebootOrReimageRoleInstance($operationUrl, $operation = 'reboot') + { + $response = $this->_performRequest($operationUrl, '?comp=' . $operation, Zend_Http_Client::POST); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The List Certificates operation lists all certificates associated with + * the specified hosted service. + * + * @param string $serviceName The service name + * @return array Array of Zend_Service_WindowsAzure_Management_CertificateInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function listCertificates($serviceName) + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates'; + $response = $this->_performRequest($operationUrl); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!$result->Certificate) { + return array(); + } + if (count($result->Certificate) > 1) { + $xmlServices = $result->Certificate; + } else { + $xmlServices = array($result->Certificate); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_WindowsAzure_Management_CertificateInstance( + (string)$xmlServices[$i]->CertificateUrl, + (string)$xmlServices[$i]->Thumbprint, + (string)$xmlServices[$i]->ThumbprintAlgorithm, + (string)$xmlServices[$i]->Data + ); + } + } + return $services; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Certificate operation returns the public data for the specified certificate. + * + * @param string $serviceName|$certificateUrl The service name -or- the certificate URL + * @param string $algorithm Algorithm + * @param string $thumbprint Thumbprint + * @return Zend_Service_WindowsAzure_Management_CertificateInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getCertificate($serviceName, $algorithm = '', $thumbprint = '') + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name or certificate URL should be specified.'); + } + if (strpos($serviceName, 'https') === false && ($algorithm == '' || is_null($algorithm)) && ($thumbprint == '' || is_null($thumbprint))) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Algorithm and thumbprint should be specified.'); + } + + $operationUrl = str_replace($this->getBaseUrl(), '', $serviceName); + if (strpos($serviceName, 'https') === false) { + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates/' . $algorithm . '-' . strtoupper($thumbprint); + } + + $response = $this->_performRequest($operationUrl); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + return new Zend_Service_WindowsAzure_Management_CertificateInstance( + $this->getBaseUrl() . $operationUrl, + $algorithm, + $thumbprint, + (string)$result->Data + ); + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Add Certificate operation adds a certificate to the subscription. + * + * @param string $serviceName The service name + * @param string $certificateData Certificate data + * @param string $certificatePassword The certificate password + * @param string $certificateFormat The certificate format. Currently, only 'pfx' is supported. + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function addCertificate($serviceName, $certificateData, $certificatePassword, $certificateFormat = 'pfx') + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.'); + } + if ($certificateData == '' || is_null($certificateData)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Certificate data should be specified.'); + } + if ($certificatePassword == '' || is_null($certificatePassword)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Certificate password should be specified.'); + } + if ($certificateFormat != 'pfx') { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Certificate format should be "pfx".'); + } + + if (@file_exists($certificateData)) { + $certificateData = file_get_contents($certificateData); + } + + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates'; + $response = $this->_performRequest($operationUrl, '', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<CertificateFile xmlns="http://schemas.microsoft.com/windowsazure"><Data>' . base64_encode($certificateData) . '</Data><CertificateFormat>' . $certificateFormat . '</CertificateFormat><Password>' . $certificatePassword . '</Password></CertificateFile>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Delete Certificate operation deletes a certificate from the subscription's certificate store. + * + * @param string $serviceName|$certificateUrl The service name -or- the certificate URL + * @param string $algorithm Algorithm + * @param string $thumbprint Thumbprint + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function deleteCertificate($serviceName, $algorithm = '', $thumbprint = '') + { + if ($serviceName == '' || is_null($serviceName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Service name or certificate URL should be specified.'); + } + if (strpos($serviceName, 'https') === false && ($algorithm == '' || is_null($algorithm)) && ($thumbprint == '' || is_null($thumbprint))) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Algorithm and thumbprint should be specified.'); + } + + $operationUrl = str_replace($this->getBaseUrl(), '', $serviceName); + if (strpos($serviceName, 'https') === false) { + $operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates/' . $algorithm . '-' . strtoupper($thumbprint); + } + + $response = $this->_performRequest($operationUrl, '', Zend_Http_Client::DELETE); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The List Affinity Groups operation lists the affinity groups associated with + * the specified subscription. + * + * @return array Array of Zend_Service_WindowsAzure_Management_AffinityGroupInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function listAffinityGroups() + { + $response = $this->_performRequest(self::OP_AFFINITYGROUPS); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!$result->AffinityGroup) { + return array(); + } + if (count($result->AffinityGroup) > 1) { + $xmlServices = $result->AffinityGroup; + } else { + $xmlServices = array($result->AffinityGroup); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_WindowsAzure_Management_AffinityGroupInstance( + (string)$xmlServices[$i]->Name, + (string)$xmlServices[$i]->Label, + (string)$xmlServices[$i]->Description, + (string)$xmlServices[$i]->Location + ); + } + } + return $services; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Create Affinity Group operation creates a new affinity group for the specified subscription. + * + * @param string $name A name for the affinity group that is unique to the subscription. + * @param string $label A label for the affinity group. The label may be up to 100 characters in length. + * @param string $description A description for the affinity group. The description may be up to 1024 characters in length. + * @param string $location The location where the affinity group will be created. To list available locations, use the List Locations operation. + */ + public function createAffinityGroup($name, $label, $description = '', $location = '') + { + if ($name == '' || is_null($name)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Affinity group name should be specified.'); + } + if ($label == '' || is_null($label)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label should be specified.'); + } + if (strlen($label) > 100) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.'); + } + if (strlen($description) > 1024) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Description is too long. The maximum length is 1024 characters.'); + } + if ($location == '' || is_null($location)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Location should be specified.'); + } + + $response = $this->_performRequest(self::OP_AFFINITYGROUPS, '', + Zend_Http_Client::POST, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<CreateAffinityGroup xmlns="http://schemas.microsoft.com/windowsazure"><Name>' . $name . '</Name><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description><Location>' . $location . '</Location></CreateAffinityGroup>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Update Affinity Group operation updates the label and/or the description for an affinity group for the specified subscription. + * + * @param string $name The name for the affinity group that should be updated. + * @param string $label A label for the affinity group. The label may be up to 100 characters in length. + * @param string $description A description for the affinity group. The description may be up to 1024 characters in length. + */ + public function updateAffinityGroup($name, $label, $description = '') + { + if ($name == '' || is_null($name)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Affinity group name should be specified.'); + } + if ($label == '' || is_null($label)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label should be specified.'); + } + if (strlen($label) > 100) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.'); + } + if (strlen($description) > 1024) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Description is too long. The maximum length is 1024 characters.'); + } + + $response = $this->_performRequest(self::OP_AFFINITYGROUPS . '/' . $name, '', + Zend_Http_Client::PUT, + array('Content-Type' => 'application/xml; charset=utf-8'), + '<UpdateAffinityGroup xmlns="http://schemas.microsoft.com/windowsazure"><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description></UpdateAffinityGroup>'); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Delete Affinity Group operation deletes an affinity group in the specified subscription. + * + * @param string $name The name for the affinity group that should be deleted. + */ + public function deleteAffinityGroup($name) + { + if ($name == '' || is_null($name)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Affinity group name should be specified.'); + } + + $response = $this->_performRequest(self::OP_AFFINITYGROUPS . '/' . $name, '', + Zend_Http_Client::DELETE); + + if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The Get Affinity Group Properties operation returns the + * system properties associated with the specified affinity group. + * + * @param string $affinityGroupName The affinity group name. + * @return Zend_Service_WindowsAzure_Management_AffinityGroupInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function getAffinityGroupProperties($affinityGroupName) + { + if ($affinityGroupName == '' || is_null($affinityGroupName)) { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception('Affinity group name should be specified.'); + } + + $response = $this->_performRequest(self::OP_AFFINITYGROUPS . '/' . $affinityGroupName); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + $affinityGroup = new Zend_Service_WindowsAzure_Management_AffinityGroupInstance( + $affinityGroupName, + (string)$result->Label, + (string)$result->Description, + (string)$result->Location + ); + + // Hosted services + if (count($result->HostedServices->HostedService) > 1) { + $xmlService = $result->HostedServices->HostedService; + } else { + $xmlService = array($result->HostedServices->HostedService); + } + + $services = array(); + if (!is_null($xmlService)) { + for ($i = 0; $i < count($xmlService); $i++) { + $services[] = array( + 'url' => (string)$xmlService[$i]->Url, + 'name' => (string)$xmlService[$i]->ServiceName + ); + } + } + $affinityGroup->HostedServices = $services; + + // Storage services + if (count($result->StorageServices->StorageService) > 1) { + $xmlService = $result->StorageServices->StorageService; + } else { + $xmlService = array($result->StorageServices->StorageService); + } + + $services = array(); + if (!is_null($xmlService)) { + for ($i = 0; $i < count($xmlService); $i++) { + $services[] = array( + 'url' => (string)$xmlService[$i]->Url, + 'name' => (string)$xmlService[$i]->ServiceName + ); + } + } + $affinityGroup->StorageServices = $services; + + return $affinityGroup; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The List Locations operation lists all of the data center locations + * that are valid for your subscription. + * + * @return array Array of Zend_Service_WindowsAzure_Management_LocationInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function listLocations() + { + $response = $this->_performRequest(self::OP_LOCATIONS); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!$result->Location) { + return array(); + } + if (count($result->Location) > 1) { + $xmlServices = $result->Location; + } else { + $xmlServices = array($result->Location); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_WindowsAzure_Management_LocationInstance( + (string)$xmlServices[$i]->Name + ); + } + } + return $services; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The List Operating Systems operation lists the versions of the guest operating system + * that are currently available in Windows Azure. The 2010-10-28 version of List Operating + * Systems also indicates what family an operating system version belongs to. + * Currently Windows Azure supports two operating system families: the Windows Azure guest + * operating system that is substantially compatible with Windows Server 2008 SP2, + * and the Windows Azure guest operating system that is substantially compatible with + * Windows Server 2008 R2. + * + * @return array Array of Zend_Service_WindowsAzure_Management_OperatingSystemInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function listOperatingSystems() + { + $response = $this->_performRequest(self::OP_OPERATINGSYSTEMS); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!$result->OperatingSystem) { + return array(); + } + if (count($result->OperatingSystem) > 1) { + $xmlServices = $result->OperatingSystem; + } else { + $xmlServices = array($result->OperatingSystem); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_WindowsAzure_Management_OperatingSystemInstance( + (string)$xmlServices[$i]->Version, + (string)$xmlServices[$i]->Label, + ((string)$xmlServices[$i]->IsDefault == 'true'), + ((string)$xmlServices[$i]->IsActive == 'true'), + (string)$xmlServices[$i]->Family, + (string)$xmlServices[$i]->FamilyLabel + ); + } + } + return $services; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * The List OS Families operation lists the guest operating system families + * available in Windows Azure, and also lists the operating system versions + * available for each family. Currently Windows Azure supports two operating + * system families: the Windows Azure guest operating system that is + * substantially compatible with Windows Server 2008 SP2, and the Windows + * Azure guest operating system that is substantially compatible with + * Windows Server 2008 R2. + * + * @return array Array of Zend_Service_WindowsAzure_Management_OperatingSystemFamilyInstance + * @throws Zend_Service_WindowsAzure_Management_Exception + */ + public function listOperatingSystemFamilies() + { + $response = $this->_performRequest(self::OP_OPERATINGSYSTEMFAMILIES); + + if ($response->isSuccessful()) { + $result = $this->_parseResponse($response); + + if (!$result->OperatingSystemFamily) { + return array(); + } + if (count($result->OperatingSystemFamily) > 1) { + $xmlServices = $result->OperatingSystemFamily; + } else { + $xmlServices = array($result->OperatingSystemFamily); + } + + $services = array(); + if (!is_null($xmlServices)) { + + for ($i = 0; $i < count($xmlServices); $i++) { + $services[] = new Zend_Service_WindowsAzure_Management_OperatingSystemFamilyInstance( + (string)$xmlServices[$i]->Name, + (string)$xmlServices[$i]->Label + ); + + if (count($xmlServices[$i]->OperatingSystems->OperatingSystem) > 1) { + $xmlOperatingSystems = $xmlServices[$i]->OperatingSystems->OperatingSystem; + } else { + $xmlOperatingSystems = array($xmlServices[$i]->OperatingSystems->OperatingSystem); + } + + $operatingSystems = array(); + if (!is_null($xmlOperatingSystems)) { + require_once 'Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php'; + for ($i = 0; $i < count($xmlOperatingSystems); $i++) { + $operatingSystems[] = new Zend_Service_WindowsAzure_Management_OperatingSystemInstance( + (string)$xmlOperatingSystems[$i]->Version, + (string)$xmlOperatingSystems[$i]->Label, + ((string)$xmlOperatingSystems[$i]->IsDefault == 'true'), + ((string)$xmlOperatingSystems[$i]->IsActive == 'true'), + (string)$xmlServices[$i]->Name, + (string)$xmlServices[$i]->Label + ); + } + } + $services[ count($services) - 1 ]->OperatingSystems = $operatingSystems; + } + } + return $services; + } else { + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * Clean configuration + * + * @param string $configuration Configuration to clean. + * @return string + */ + public function _cleanConfiguration($configuration) { + $configuration = str_replace('?<?', '<?', $configuration); + $configuration = str_replace("\r", "", $configuration); + $configuration = str_replace("\n", "", $configuration); + + return $configuration; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/DeploymentInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/DeploymentInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,90 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Name The name for the deployment. This name must be unique among other deployments for the specified hosted service. + * @property string $DeploymentSlot The environment to which the hosted service is deployed, either staging or production. + * @property string $PrivateID The unique identifier for this deployment. + * @property string $Label The label for the deployment. + * @property string $Url The URL for the deployment. + * @property string $Configuration The configuration file (XML, represented as string). + * @property string $Status The status of the deployment. Running, Suspended, RunningTransitioning, SuspendedTransitioning, Starting, Suspending, Deploying, Deleting. + * @property string $UpgradeStatus Parent node for elements describing an upgrade that is currently underway. + * @property string $UpgradeType The upgrade type designated for this deployment. Possible values are Auto and Manual. + * @property string $CurrentUpgradeDomainState The state of the current upgrade domain. Possible values are Before and During. + * @property string $CurrentUpgradeDomain An integer value that identifies the current upgrade domain. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on. + * @property string $UpgradeDomainCount An integer value that indicates the number of upgrade domains in the deployment. + * @property array $RoleInstanceList The list of role instances. + * @property array $RoleList The list of roles. + */ +class Zend_Service_WindowsAzure_Management_DeploymentInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $name The name for the deployment. This name must be unique among other deployments for the specified hosted service. + * @param string $deploymentSlot The environment to which the hosted service is deployed, either staging or production. + * @param string $privateID The unique identifier for this deployment. + * @param string $label The label for the deployment. + * @param string $url The URL for the deployment. + * @param string $configuration The configuration file (XML, represented as string). + * @param string $status The status of the deployment. Running, Suspended, RunningTransitioning, SuspendedTransitioning, Starting, Suspending, Deploying, Deleting. + * @param string $upgradeStatus Parent node for elements describing an upgrade that is currently underway. + * @param string $upgradeType The upgrade type designated for this deployment. Possible values are Auto and Manual. + * @param string $currentUpgradeDomainState The state of the current upgrade domain. Possible values are Before and During. + * @param string $currentUpgradeDomain An integer value that identifies the current upgrade domain. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on. + * @param string $upgradeDomainCount An integer value that indicates the number of upgrade domains in the deployment. + * @param array $roleInstanceList The list of role instances. + * @param array $roleList The list of roles. + */ + public function __construct($name, $deploymentSlot, $privateID, $label, $url, $configuration, $status, $upgradeStatus, $upgradeType, $currentUpgradeDomainState, $currentUpgradeDomain, $upgradeDomainCount, $roleInstanceList = array(), $roleList = array()) + { + $this->_data = array( + 'name' => $name, + 'deploymentslot' => $deploymentSlot, + 'privateid' => $privateID, + 'label' => base64_decode($label), + 'url' => $url, + 'configuration' => base64_decode($configuration), + 'status' => $status, + 'upgradestatus' => $upgradeStatus, + 'upgradetype' => $upgradeType, + 'currentupgradedomainstate' => $currentUpgradeDomainState, + 'currentupgradedomain' => $currentUpgradeDomain, + 'upgradedomaincount' => $upgradeDomainCount, + 'roleinstancelist' => $roleInstanceList, + 'rolelist' => $roleList + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,38 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Exception + */ +require_once 'Zend/Service/WindowsAzure/Exception.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Service_WindowsAzure_Management_Exception + extends Zend_Service_WindowsAzure_Exception +{ +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/HostedServiceInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/HostedServiceInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,69 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Url The address of the hosted service. + * @property string $ServiceName The name of the hosted service. + * @property string $Description A description of the hosted service. + * @property string $AffinityGroup The affinity group with which this hosted service is associated. + * @property string $Location The geo-location of the hosted service in Windows Azure, if your hosted service is not associated with an affinity group. + * @property string $Label The label for the hosted service. + * @property array $Deployments Deployments for the hosted service. + */ +class Zend_Service_WindowsAzure_Management_HostedServiceInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $url The address of the hosted service. + * @param string $serviceName The name of the hosted service. + * @param string $description A description of the storage account. + * @param string $affinityGroup The affinity group with which this hosted service is associated. + * @param string $location The geo-location of the hosted service in Windows Azure, if your hosted service is not associated with an affinity group. + * @param string $label The label for the hosted service. + * @param array $deployments Deployments for the hosted service. + */ + public function __construct($url, $serviceName, $description = '', $affinityGroup = '', $location = '', $label = '', $deployments = array()) + { + $this->_data = array( + 'url' => $url, + 'servicename' => $serviceName, + 'description' => $description, + 'affinitygroup' => $affinityGroup, + 'location' => $location, + 'label' => base64_decode($label), + 'deployments' => $deployments + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/LocationInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/LocationInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,51 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Name The location name. + */ +class Zend_Service_WindowsAzure_Management_LocationInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $name The location name. + */ + public function __construct($name) + { + $this->_data = array( + 'name' => $name + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,57 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Name Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2. + * @property string $Label A label for the operating system version. + * @property array $OperatingSystems A list of operating systems available under this operating system family. + */ +class Zend_Service_WindowsAzure_Management_OperatingSystemFamilyInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $name Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2. + * @param string $label A label for the operating system version. + * @param array $operatingSystems A list of operating systems available under this operating system family. + */ + public function __construct($name, $label, $operatingSystems = array()) + { + $this->_data = array( + 'name' => $name, + 'label' => base64_decode($label), + 'operatingsystems' => $operatingSystems + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,66 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Version The operating system version. This value corresponds to the configuration value for specifying that your service is to run on a particular version of the Windows Azure guest operating system. + * @property string $Label A label for the operating system version. + * @property string $IsDefault Indicates whether this operating system version is the default version for a service that has not otherwise specified a particular version. The default operating system version is applied to services that are configured for auto-upgrade. An operating system family has exactly one default operating system version at any given time, for which the IsDefault element is set to true; for all other versions, IsDefault is set to false. + * @property string $IsActive Indicates whether this operating system version is currently active for running a service. If an operating system version is active, you can manually configure your service to run on that version. + * @property string $Family Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2. + * @property string $FamilyLabel A label for the operating system family. + */ +class Zend_Service_WindowsAzure_Management_OperatingSystemInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $version The operating system version. This value corresponds to the configuration value for specifying that your service is to run on a particular version of the Windows Azure guest operating system. + * @param string $label A label for the operating system version. + * @param string $isDefault Indicates whether this operating system version is the default version for a service that has not otherwise specified a particular version. The default operating system version is applied to services that are configured for auto-upgrade. An operating system family has exactly one default operating system version at any given time, for which the IsDefault element is set to true; for all other versions, IsDefault is set to false. + * @param string $isActive Indicates whether this operating system version is currently active for running a service. If an operating system version is active, you can manually configure your service to run on that version. + * @param string $family Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2. + * @param string $familyLabel A label for the operating system family. + */ + public function __construct($version, $label, $isDefault, $isActive, $family, $familyLabel) + { + $this->_data = array( + 'version' => $version, + 'label' => base64_decode($label), + 'isdefault' => $isDefault, + 'isactive' => $isActive, + 'family' => $family, + 'familylabel' => base64_decode($familyLabel) + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/OperationStatusInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/OperationStatusInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,60 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Id The request ID of the asynchronous request. + * @property string $Status The status of the asynchronous request. Possible values include InProgress, Succeeded, or Failed. + * @property string $ErrorCode The management service error code returned if the asynchronous request failed. + * @property string $ErrorMessage The management service error message returned if the asynchronous request failed. + */ +class Zend_Service_WindowsAzure_Management_OperationStatusInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $id The request ID of the asynchronous request. + * @param string $status The status of the asynchronous request. Possible values include InProgress, Succeeded, or Failed. + * @param string $errorCode The management service error code returned if the asynchronous request failed. + * @param string $errorMessage The management service error message returned if the asynchronous request failed. + */ + public function __construct($id, $status, $errorCode, $errorMessage) + { + $this->_data = array( + 'id' => $id, + 'status' => $status, + 'errorcode' => $errorCode, + 'errormessage' => $errorMessage + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,67 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +abstract class Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Data + * + * @var array + */ + protected $_data = null; + + /** + * Magic overload for setting properties + * + * @param string $name Name of the property + * @param string $value Value to set + */ + public function __set($name, $value) { + if (array_key_exists(strtolower($name), $this->_data)) { + $this->_data[strtolower($name)] = $value; + return; + } + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception("Unknown property: " . $name); + } + + /** + * Magic overload for getting properties + * + * @param string $name Name of the property + */ + public function __get($name) { + if (array_key_exists(strtolower($name), $this->_data)) { + return $this->_data[strtolower($name)]; + } + require_once 'Zend/Service/WindowsAzure/Management/Exception.php'; + throw new Zend_Service_WindowsAzure_Management_Exception("Unknown property: " . $name); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/StorageServiceInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/StorageServiceInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,66 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $Url The address of the storage account. + * @property string $ServiceName The name of the storage account. + * @property string $Description A description of the storage account. + * @property string $AffinityGroup The affinity group with which this storage account is associated. + * @property string $Location The geo-location of the storage account in Windows Azure, if your storage account is not associated with an affinity group. + * @property string $Label The label for the storage account. + */ +class Zend_Service_WindowsAzure_Management_StorageServiceInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $url The address of the storage account. + * @param string $serviceName The name of the storage account. + * @param string $description A description of the storage account. + * @param string $affinityGroup The affinity group with which this storage account is associated. + * @param string $location The geo-location of the storage account in Windows Azure, if your storage account is not associated with an affinity group. + * @param string $label The label for the storage account. + */ + public function __construct($url, $serviceName, $description = '', $affinityGroup = '', $location = '', $label = '') + { + $this->_data = array( + 'url' => $url, + 'servicename' => $serviceName, + 'description' => $description, + 'affinitygroup' => $affinityGroup, + 'location' => $location, + 'label' => base64_decode($label) + ); + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,77 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id$ + */ + +/** + * @see Zend_Service_WindowsAzure_Management_ServiceEntityAbstract + */ +require_once 'Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php'; + +/** + * @category Zend + * @package Zend_Service_WindowsAzure + * @subpackage Management + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property string $operationId The globally unique identifier (GUID) of the operation. + * @property string $operationObjectId The target object for the operation. + * @property string $operationName The name of the performed operation. + * @property array $operationParameters The collection of parameters for the performed operation. + * @property array $operationCaller A collection of attributes that identifies the source of the operation. + * @property array $operationStatus The current status of the operation. + */ +class Zend_Service_WindowsAzure_Management_SubscriptionOperationInstance + extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract +{ + /** + * Constructor + * + * @param string $operationId The globally unique identifier (GUID) of the operation. + * @param string $operationObjectId The target object for the operation. + * @param string $operationName The name of the performed operation. + * @param array $operationParameters The collection of parameters for the performed operation. + * @param array $operationCaller A collection of attributes that identifies the source of the operation. + * @param array $operationStatus The current status of the operation. + */ + public function __construct($operationId, $operationObjectId, $operationName, $operationParameters = array(), $operationCaller = array(), $operationStatus = array()) + { + $this->_data = array( + 'operationid' => $operationId, + 'operationobjectid' => $operationObjectId, + 'operationname' => $operationName, + 'operationparameters' => $operationParameters, + 'operationcaller' => $operationCaller, + 'operationstatus' => $operationStatus + ); + } + + /** + * Add operation parameter + * + * @param string $name Name + * @param string $value Value + */ + public function addOperationParameter($name, $value) + { + $this->_data['operationparameters'][$name] = $value; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/RetryPolicy/Exception.php --- a/web/lib/Zend/Service/WindowsAzure/RetryPolicy/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/RetryPolicy/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Exception - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_RetryPolicy_Exception extends Zend_Service_WindowsAzure_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php --- a/web/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @version $Id: NoRetry.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: NoRetry.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_RetryPolicy_NoRetry extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php --- a/web/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @version $Id: RetryN.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: RetryN.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,15 +26,10 @@ require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php'; /** - * @see Zend_Service_WindowsAzure_RetryPolicy_Exception - */ -require_once 'Zend/Service/WindowsAzure/RetryPolicy/Exception.php'; - -/** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_RetryPolicy_RetryN extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract @@ -82,6 +77,7 @@ return $returnValue; } catch (Exception $ex) { if ($retriesLeft == 1) { + require_once 'Zend/Service/WindowsAzure/RetryPolicy/Exception.php'; throw new Zend_Service_WindowsAzure_RetryPolicy_Exception("Exceeded retry count of " . $this->_retryCount . ". " . $ex->getMessage()); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php --- a/web/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @version $Id: RetryPolicyAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: RetryPolicyAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_RetryPolicy_NoRetry */ require_once 'Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php'; @@ -39,7 +34,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract @@ -72,6 +67,6 @@ */ public static function retryN($count = 1, $intervalBetweenRetries = 0) { - return new Zend_Service_WindowsAzure_RetryPolicy_RetryN($count, $intervalBetweenRetries); + return new Zend_Service_WindowsAzure_RetryPolicy_RetryN($count, $intervalBetweenRetries); } } \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/SessionHandler.php --- a/web/lib/Zend/Service/WindowsAzure/SessionHandler.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/SessionHandler.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,62 +15,92 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SessionHandler.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: SessionHandler.php 24593 2012-01-05 20:35:02Z matthew $ */ -/** Zend_Service_WindowsAzure_Storage_Table */ -require_once 'Zend/Service/WindowsAzure/Storage/Table.php'; - -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_SessionHandler { + /** + * Maximal property size in table storage. + * + * @var int + * @see http://msdn.microsoft.com/en-us/library/dd179338.aspx + */ + const MAX_TS_PROPERTY_SIZE = 65536; + + /** Storage backend type */ + const STORAGE_TYPE_TABLE = 'table'; + const STORAGE_TYPE_BLOB = 'blob'; + /** - * Table storage + * Storage back-end * - * @var Zend_Service_WindowsAzure_Storage_Table + * @var Zend_Service_WindowsAzure_Storage_Table|Zend_Service_WindowsAzure_Storage_Blob */ - protected $_tableStorage; + protected $_storage; /** - * Session table name + * Storage backend type * * @var string */ - protected $_sessionTable; + protected $_storageType; /** - * Session table partition + * Session container name * * @var string */ - protected $_sessionTablePartition; + protected $_sessionContainer; + + /** + * Session container partition + * + * @var string + */ + protected $_sessionContainerPartition; /** * Creates a new Zend_Service_WindowsAzure_SessionHandler instance * - * @param Zend_Service_WindowsAzure_Storage_Table $tableStorage Table storage - * @param string $sessionTable Session table name - * @param string $sessionTablePartition Session table partition + * @param Zend_Service_WindowsAzure_Storage_Table|Zend_Service_WindowsAzure_Storage_Blob $storage Storage back-end, can be table storage and blob storage + * @param string $sessionContainer Session container name + * @param string $sessionContainerPartition Session container partition */ - public function __construct(Zend_Service_WindowsAzure_Storage_Table $tableStorage, $sessionTable = 'phpsessions', $sessionTablePartition = 'sessions') + public function __construct(Zend_Service_WindowsAzure_Storage $storage, $sessionContainer = 'phpsessions', $sessionContainerPartition = 'sessions') { + // Validate $storage + if (!($storage instanceof Zend_Service_WindowsAzure_Storage_Table || $storage instanceof Zend_Service_WindowsAzure_Storage_Blob)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception('Invalid storage back-end given. Storage back-end should be of type Zend_Service_WindowsAzure_Storage_Table or Zend_Service_WindowsAzure_Storage_Blob.'); + } + + // Validate other parameters + if ($sessionContainer == '' || $sessionContainerPartition == '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception('Session container and session partition should be specified.'); + } + + // Determine storage type + $storageType = self::STORAGE_TYPE_TABLE; + if ($storage instanceof Zend_Service_WindowsAzure_Storage_Blob) { + $storageType = self::STORAGE_TYPE_BLOB; + } + // Set properties - $this->_tableStorage = $tableStorage; - $this->_sessionTable = $sessionTable; - $this->_sessionTablePartition = $sessionTablePartition; + $this->_storage = $storage; + $this->_storageType = $storageType; + $this->_sessionContainer = $sessionContainer; + $this->_sessionContainerPartition = $sessionContainerPartition; } /** @@ -96,12 +126,13 @@ */ public function open() { - // Make sure table exists - $tableExists = $this->_tableStorage->tableExists($this->_sessionTable); - if (!$tableExists) { - $this->_tableStorage->createTable($this->_sessionTable); - } - + // Make sure storage container exists + if ($this->_storageType == self::STORAGE_TYPE_TABLE) { + $this->_storage->createTableIfNotExists($this->_sessionContainer); + } else if ($this->_storageType == self::STORAGE_TYPE_BLOB) { + $this->_storage->createContainerIfNotExists($this->_sessionContainer); + } + // Ok! return true; } @@ -124,19 +155,37 @@ */ public function read($id) { - try - { - $sessionRecord = $this->_tableStorage->retrieveEntityById( - $this->_sessionTable, - $this->_sessionTablePartition, - $id - ); - return base64_decode($sessionRecord->serializedData); - } - catch (Zend_Service_WindowsAzure_Exception $ex) - { - return ''; - } + // Read data + if ($this->_storageType == self::STORAGE_TYPE_TABLE) { + // In table storage + try + { + $sessionRecord = $this->_storage->retrieveEntityById( + $this->_sessionContainer, + $this->_sessionContainerPartition, + $id + ); + return unserialize(base64_decode($sessionRecord->serializedData)); + } + catch (Zend_Service_WindowsAzure_Exception $ex) + { + return ''; + } + } else if ($this->_storageType == self::STORAGE_TYPE_BLOB) { + // In blob storage + try + { + $data = $this->_storage->getBlobData( + $this->_sessionContainer, + $this->_sessionContainerPartition . '/' . $id + ); + return unserialize(base64_decode($data)); + } + catch (Zend_Service_WindowsAzure_Exception $ex) + { + return false; + } + } } /** @@ -144,23 +193,42 @@ * * @param int $id Session Id * @param string $serializedData Serialized PHP object + * @throws Exception */ public function write($id, $serializedData) { - $sessionRecord = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($this->_sessionTablePartition, $id); - $sessionRecord->sessionExpires = time(); - $sessionRecord->serializedData = base64_encode($serializedData); - - $sessionRecord->setAzurePropertyType('sessionExpires', 'Edm.Int32'); - - try - { - $this->_tableStorage->updateEntity($this->_sessionTable, $sessionRecord); - } - catch (Zend_Service_WindowsAzure_Exception $unknownRecord) - { - $this->_tableStorage->insertEntity($this->_sessionTable, $sessionRecord); - } + // Encode data + $serializedData = base64_encode(serialize($serializedData)); + if (strlen($serializedData) >= self::MAX_TS_PROPERTY_SIZE && $this->_storageType == self::STORAGE_TYPE_TABLE) { + throw new Zend_Service_WindowsAzure_Exception('Session data exceeds the maximum allowed size of ' . self::MAX_TS_PROPERTY_SIZE . ' bytes that can be stored using table storage. Consider switching to a blob storage back-end or try reducing session data size.'); + } + + // Store data + if ($this->_storageType == self::STORAGE_TYPE_TABLE) { + // In table storage + $sessionRecord = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($this->_sessionContainerPartition, $id); + $sessionRecord->sessionExpires = time(); + $sessionRecord->serializedData = $serializedData; + + $sessionRecord->setAzurePropertyType('sessionExpires', 'Edm.Int32'); + + try + { + $this->_storage->updateEntity($this->_sessionContainer, $sessionRecord); + } + catch (Zend_Service_WindowsAzure_Exception $unknownRecord) + { + $this->_storage->insertEntity($this->_sessionContainer, $sessionRecord); + } + } else if ($this->_storageType == self::STORAGE_TYPE_BLOB) { + // In blob storage + $this->_storage->putBlobData( + $this->_sessionContainer, + $this->_sessionContainerPartition . '/' . $id, + $serializedData, + array('sessionexpires' => time()) + ); + } } /** @@ -171,21 +239,40 @@ */ public function destroy($id) { - try - { - $sessionRecord = $this->_tableStorage->retrieveEntityById( - $this->_sessionTable, - $this->_sessionTablePartition, - $id - ); - $this->_tableStorage->deleteEntity($this->_sessionTable, $sessionRecord); - - return true; - } - catch (Zend_Service_WindowsAzure_Exception $ex) - { - return false; - } + // Destroy data + if ($this->_storageType == self::STORAGE_TYPE_TABLE) { + // In table storage + try + { + $sessionRecord = $this->_storage->retrieveEntityById( + $this->_sessionContainer, + $this->_sessionContainerPartition, + $id + ); + $this->_storage->deleteEntity($this->_sessionContainer, $sessionRecord); + + return true; + } + catch (Zend_Service_WindowsAzure_Exception $ex) + { + return false; + } + } else if ($this->_storageType == self::STORAGE_TYPE_BLOB) { + // In blob storage + try + { + $this->_storage->deleteBlob( + $this->_sessionContainer, + $this->_sessionContainerPartition . '/' . $id + ); + + return true; + } + catch (Zend_Service_WindowsAzure_Exception $ex) + { + return false; + } + } } /** @@ -200,18 +287,38 @@ */ public function gc($lifeTime) { - try - { - $result = $this->_tableStorage->retrieveEntities($this->_sessionTable, 'PartitionKey eq \'' . $this->_sessionTablePartition . '\' and sessionExpires lt ' . (time() - $lifeTime)); - foreach ($result as $sessionRecord) - { - $this->_tableStorage->deleteEntity($this->_sessionTable, $sessionRecord); - } - return true; - } - catch (Zend_Service_WindowsAzure_exception $ex) - { - return false; - } + if ($this->_storageType == self::STORAGE_TYPE_TABLE) { + // In table storage + try + { + $result = $this->_storage->retrieveEntities($this->_sessionContainer, 'PartitionKey eq \'' . $this->_sessionContainerPartition . '\' and sessionExpires lt ' . (time() - $lifeTime)); + foreach ($result as $sessionRecord) + { + $this->_storage->deleteEntity($this->_sessionContainer, $sessionRecord); + } + return true; + } + catch (Zend_Service_WindowsAzure_exception $ex) + { + return false; + } + } else if ($this->_storageType == self::STORAGE_TYPE_BLOB) { + // In blob storage + try + { + $result = $this->_storage->listBlobs($this->_sessionContainer, $this->_sessionContainerPartition, '', null, null, 'metadata'); + foreach ($result as $sessionRecord) + { + if ($sessionRecord->Metadata['sessionexpires'] < (time() - $lifeTime)) { + $this->_storage->deleteBlob($this->_sessionContainer, $sessionRecord->Name); + } + } + return true; + } + catch (Zend_Service_WindowsAzure_exception $ex) + { + return false; + } + } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage.php --- a/web/lib/Zend/Service/WindowsAzure/Storage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Storage.php 24697 2012-03-23 13:11:04Z ezimuel $ */ /** - * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract + * @see Zend_Http_Client */ -require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php'; +require_once 'Zend/Http/Client.php'; /** * @see Zend_Service_WindowsAzure_Credentials_SharedKey @@ -34,27 +34,11 @@ * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract */ require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php'; - -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Http_Response - */ -require_once 'Zend/Http/Response.php'; - /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage @@ -205,13 +189,13 @@ $this->_usePathStyleUri = true; } - if ($this->_credentials === null) { + if (is_null($this->_credentials)) { $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKey( $this->_accountName, $this->_accountKey, $this->_usePathStyleUri); } $this->_retryPolicy = $retryPolicy; - if ($this->_retryPolicy === null) { + if (is_null($this->_retryPolicy)) { $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry(); } @@ -238,7 +222,7 @@ { $this->_httpClientChannel->setAdapter($adapterInstance); } - + /** * Retrieve HTTP client channel * @@ -257,7 +241,7 @@ public function setRetryPolicy(Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null) { $this->_retryPolicy = $retryPolicy; - if ($this->_retryPolicy === null) { + if (is_null($this->_retryPolicy)) { $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry(); } } @@ -372,7 +356,7 @@ } // Clean headers - if ($headers === null) { + if (is_null($headers)) { $headers = array(); } @@ -397,7 +381,7 @@ $requestHeaders = $this->_credentials ->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission, $rawData); - // Prepare request + // Prepare request $this->_httpClientChannel->resetParameters(true); $this->_httpClientChannel->setUri($requestUrl); $this->_httpClientChannel->setHeaders($requestHeaders); @@ -421,7 +405,8 @@ */ protected function _parseResponse(Zend_Http_Response $response = null) { - if ($response === null) { + if (is_null($response)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Response should not be null.'); } @@ -459,11 +444,13 @@ $headers = array(); foreach ($metadata as $key => $value) { if (strpos($value, "\r") !== false || strpos($value, "\n") !== false) { - throw new Zend_Service_WindowsAzure_Exception('Metadata cannot contain newline characters.'); + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception('Metadata cannot contain newline characters.'); } if (!self::isValidMetadataName($key)) { - throw new Zend_Service_WindowsAzure_Exception('Metadata name does not adhere to metadata naming conventions. See http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx for more information.'); + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception('Metadata name does not adhere to metadata naming conventions. See http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx for more information.'); } $headers["x-ms-meta-" . strtolower($key)] = $value; @@ -503,7 +490,7 @@ protected function _parseMetadataElement($element = null) { // Metadata present? - if ($element !== null && isset($element->Metadata) && $element->Metadata !== null) { + if (!is_null($element) && isset($element->Metadata) && !is_null($element->Metadata)) { return get_object_vars($element->Metadata); } @@ -521,7 +508,7 @@ $tz = @date_default_timezone_get(); @date_default_timezone_set('UTC'); - if ($timestamp === null) { + if (is_null($timestamp)) { $timestamp = time(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/Batch.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/Batch.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/Batch.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,26 +15,17 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Batch.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Batch.php 24593 2012-01-05 20:35:02Z matthew $ */ -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** - * @see Zend_Service_WindowsAzure_Storage_BatchStorageAbstract - */ -require_once 'Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php'; /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Batch @@ -138,6 +129,7 @@ // Set _isSingleSelect if ($httpVerb == Zend_Http_Client::GET) { if (count($this->_operations) > 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception("Select operations can only be performed in an empty batch transaction."); } $this->_isSingleSelect = true; @@ -149,7 +141,7 @@ } // Clean headers - if ($headers === null) { + if (is_null($headers)) { $headers = array(); } @@ -161,7 +153,7 @@ $requestUrl = $this->getBaseUrl() . $path . $queryString; // Generate $rawData - if ($rawData === null) { + if (is_null($rawData)) { $rawData = ''; } @@ -197,7 +189,7 @@ * @throws Zend_Service_WindowsAzure_Exception */ public function commit() - { + { // Perform batch $response = $this->_storageClient->performBatch($this->_operations, $this->_forTableStorage, $this->_isSingleSelect); @@ -210,6 +202,7 @@ // Error? if (count($errors[2]) > 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('An error has occured while committing a batch: ' . $errors[2][0]); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BatchStorageAbstract.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: BatchStorageAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,35 +26,10 @@ require_once 'Zend/Service/WindowsAzure/Storage.php'; /** - * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract - */ -require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php'; - -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** - * @see Zend_Service_WindowsAzure_Storage_Batch - */ -require_once 'Zend/Service/WindowsAzure/Storage/Batch.php'; - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Http_Response - */ -require_once 'Zend/Http/Response.php'; - -/** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_WindowsAzure_Storage_BatchStorageAbstract @@ -75,7 +50,8 @@ */ public function setCurrentBatch(Zend_Service_WindowsAzure_Storage_Batch $batch = null) { - if ($batch !== null && $this->isInBatch()) { + if (!is_null($batch) && $this->isInBatch()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Only one batch can be active at a time.'); } $this->_currentBatch = $batch; @@ -98,7 +74,7 @@ */ public function isInBatch() { - return $this->_currentBatch !== null; + return !is_null($this->_currentBatch); } /** @@ -109,6 +85,7 @@ */ public function startBatch() { + require_once 'Zend/Service/WindowsAzure/Storage/Batch.php'; return new Zend_Service_WindowsAzure_Storage_Batch($this, $this->getBaseUrl()); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/Blob.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/Blob.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/Blob.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,35 +15,10 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://todo name_todo - * @version $Id: Blob.php 23167 2010-10-19 17:53:31Z mabe $ - */ - -/** - * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract_SharedKey - */ -require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php'; - -/** - * @see Zend_Service_WindowsAzure_Credentials_SharedAccessSignature + * @version $Id: Blob.php 24697 2012-03-23 13:11:04Z ezimuel $ */ -require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php'; - -/** - * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract - */ -require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php'; - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Http_Response - */ -require_once 'Zend/Http/Response.php'; /** * @see Zend_Service_WindowsAzure_Storage @@ -51,16 +26,16 @@ require_once 'Zend/Service/WindowsAzure/Storage.php'; /** + * @see Zend_Service_WindowsAzure_Storage_BlobInstance + */ +require_once 'Zend/Service/WindowsAzure/Storage/BlobInstance.php'; + +/** * @see Zend_Service_WindowsAzure_Storage_BlobContainer */ require_once 'Zend/Service/WindowsAzure/Storage/BlobContainer.php'; /** - * @see Zend_Service_WindowsAzure_Storage_BlobInstance - */ -require_once 'Zend/Service/WindowsAzure/Storage/BlobInstance.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_PageRegionInstance */ require_once 'Zend/Service/WindowsAzure/Storage/PageRegionInstance.php'; @@ -71,21 +46,19 @@ require_once 'Zend/Service/WindowsAzure/Storage/LeaseInstance.php'; /** - * @see Zend_Service_WindowsAzure_Storage_SignedIdentifier + * @see Zend_Service_WindowsAzure_Storage_Blob_Stream */ -require_once 'Zend/Service/WindowsAzure/Storage/SignedIdentifier.php'; +require_once 'Zend/Service/WindowsAzure/Storage/Blob/Stream.php'; /** - * @see Zend_Service_WindowsAzure_Exception + * @see Zend_Service_WindowsAzure_Credentials_SharedAccessSignature */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - - +require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php'; /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_Storage @@ -154,7 +127,7 @@ * * @var Zend_Service_WindowsAzure_Credentials_SharedAccessSignature */ - private $_sharedAccessSignatureCredentials = null; + protected $_sharedAccessSignatureCredentials = null; /** * Creates a new Zend_Service_WindowsAzure_Storage_Blob instance @@ -187,12 +160,15 @@ public function blobExists($containerName = '', $blobName = '', $snapshotId = null) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } @@ -215,9 +191,11 @@ public function containerExists($containerName = '') { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } @@ -243,12 +221,15 @@ public function createContainer($containerName = '', $metadata = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if (!is_array($metadata)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Meta data should be an array of key and value pairs.'); } @@ -259,6 +240,7 @@ // Perform request $response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if ($response->isSuccessful()) { + return new Zend_Service_WindowsAzure_Storage_BlobContainer( $containerName, $response->getHeader('Etag'), @@ -266,9 +248,24 @@ $metadata ); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } + + /** + * Create container if it does not exist + * + * @param string $containerName Container name + * @param array $metadata Key/value pairs of meta data + * @throws Zend_Service_WindowsAzure_Exception + */ + public function createContainerIfNotExists($containerName = '', $metadata = array()) + { + if (!$this->containerExists($containerName)) { + $this->createContainer($containerName, $metadata); + } + } /** * Get container ACL @@ -281,9 +278,11 @@ public function getContainerAcl($containerName = '', $signedIdentifiers = false) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } @@ -313,6 +312,7 @@ } } + require_once 'Zend/Service/WindowsAzure/Storage/SignedIdentifier.php'; // Return value $returnValue = array(); foreach ($entries as $entry) { @@ -328,6 +328,7 @@ return $returnValue; } } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -343,9 +344,11 @@ public function setContainerAcl($containerName = '', $acl = self::ACL_PRIVATE, $signedIdentifiers = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } @@ -353,7 +356,7 @@ $headers = array(); // Acl specified? - if ($acl != self::ACL_PRIVATE && $acl !== null && $acl != '') { + if ($acl != self::ACL_PRIVATE && !is_null($acl) && $acl != '') { $headers[Zend_Service_WindowsAzure_Storage::PREFIX_STORAGE_HEADER . 'blob-public-access'] = $acl; } @@ -382,6 +385,7 @@ // Perform request $response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend_Http_Client::PUT, $headers, false, $policies, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -396,9 +400,11 @@ public function getContainer($containerName = '') { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } @@ -416,6 +422,7 @@ $metadata ); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -430,9 +437,11 @@ public function getContainerMetadata($containerName = '') { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } @@ -452,12 +461,15 @@ public function setContainerMetadata($containerName = '', $metadata = array(), $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if (!is_array($metadata)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Meta data should be an array of key and value pairs.'); } if (count($metadata) == 0) { @@ -476,6 +488,7 @@ // Perform request $response = $this->_performRequest($containerName, '?restype=container&comp=metadata', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -490,9 +503,11 @@ public function deleteContainer($containerName = '', $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } @@ -505,6 +520,7 @@ // Perform request $response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -524,16 +540,16 @@ { // Build query string $queryString = array('comp=list'); - if ($prefix !== null) { + if (!is_null($prefix)) { $queryString[] = 'prefix=' . $prefix; } - if ($maxResults !== null) { + if (!is_null($maxResults)) { $queryString[] = 'maxresults=' . $maxResults; } - if ($marker !== null) { + if (!is_null($marker)) { $queryString[] = 'marker=' . $marker; } - if ($include !== null) { + if (!is_null($include)) { $queryString[] = 'include=' . $include; } $queryString = self::createQueryStringFromArray($queryString); @@ -545,8 +561,9 @@ $xmlMarker = (string)$this->_parseResponse($response)->NextMarker; $containers = array(); - if ($xmlContainers !== null) { + if (!is_null($xmlContainers)) { for ($i = 0; $i < count($xmlContainers); $i++) { + $containers[] = new Zend_Service_WindowsAzure_Storage_BlobContainer( (string)$xmlContainers[$i]->Name, (string)$xmlContainers[$i]->Etag, @@ -556,17 +573,18 @@ } } $currentResultCount = $currentResultCount + count($containers); - if ($maxResults !== null && $currentResultCount < $maxResults) { - if ($xmlMarker !== null && $xmlMarker != '') { + if (!is_null($maxResults) && $currentResultCount < $maxResults) { + if (!is_null($xmlMarker) && $xmlMarker != '') { $containers = array_merge($containers, $this->listContainers($prefix, $maxResults, $xmlMarker, $include, $currentResultCount)); } } - if ($maxResults !== null && count($containers) > $maxResults) { + if (!is_null($maxResults) && count($containers) > $maxResults) { $containers = array_slice($containers, 0, $maxResults); } return $containers; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -586,27 +604,33 @@ public function putBlob($containerName = '', $blobName = '', $localFileName = '', $metadata = array(), $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($localFileName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.'); } if (!file_exists($localFileName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Local file not found.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Check file size if (filesize($localFileName) >= self::MAX_BLOB_SIZE) { - return $this->putLargeBlob($containerName, $blobName, $localFileName, $metadata, $leaseId); + return $this->putLargeBlob($containerName, $blobName, $localFileName, $metadata, $leaseId, $additionalHeaders); } // Put the data to Windows Azure Storage @@ -628,21 +652,25 @@ public function putBlobData($containerName = '', $blobName = '', $data = '', $metadata = array(), $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Create metadata headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); @@ -661,6 +689,7 @@ // Perform request $response = $this->_performRequest($resourceName, '', Zend_Http_Client::PUT, $headers, false, $data, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if ($response->isSuccessful()) { + return new Zend_Service_WindowsAzure_Storage_BlobInstance( $containerName, $blobName, @@ -676,6 +705,7 @@ $metadata ); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -688,33 +718,40 @@ * @param string $localFileName Local file name to be uploaded * @param array $metadata Key/value pairs of meta data * @param string $leaseId Lease identifier + * @param array $additionalHeaders Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information. * @return object Partial blob properties * @throws Zend_Service_WindowsAzure_Exception */ - public function putLargeBlob($containerName = '', $blobName = '', $localFileName = '', $metadata = array(), $leaseId = null) + public function putLargeBlob($containerName = '', $blobName = '', $localFileName = '', $metadata = array(), $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($localFileName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.'); } if (!file_exists($localFileName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Local file not found.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Check file size if (filesize($localFileName) < self::MAX_BLOB_SIZE) { - return $this->putBlob($containerName, $blobName, $localFileName, $metadata); + return $this->putBlob($containerName, $blobName, $localFileName, $metadata, $leaseId, $additionalHeaders); } // Determine number of parts @@ -729,6 +766,7 @@ // Open file $fp = fopen($localFileName, 'r'); if ($fp === false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Could not open local file.'); } @@ -752,7 +790,7 @@ fclose($fp); // Put block list - $this->putBlockList($containerName, $blobName, $blockIdentifiers, $metadata, $leaseId); + $this->putBlockList($containerName, $blobName, $blockIdentifiers, $metadata, $leaseId, $additionalHeaders); // Return information of the blob return $this->getBlobInstance($containerName, $blobName, null, $leaseId); @@ -771,24 +809,29 @@ public function putBlock($containerName = '', $blobName = '', $identifier = '', $contents = '', $leaseId = null) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($identifier === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Block identifier is not specified.'); } if (strlen($contents) > self::MAX_BLOB_TRANSFER_SIZE) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Block size is too big.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } @@ -798,6 +841,7 @@ // Upload $response = $this->_performRequest($resourceName, '?comp=block&blockid=' . base64_encode($identifier), Zend_Http_Client::PUT, $headers, false, $contents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -816,18 +860,23 @@ public function putBlockList($containerName = '', $blobName = '', $blockList = array(), $metadata = array(), $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if (count($blockList) == 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Block list does not contain any elements.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } @@ -839,15 +888,15 @@ // Generate block list request $fileContents = utf8_encode(implode("\n", array( - '<?xml version="1.0" encoding="utf-8"?>', - '<BlockList>', - $blocks, - '</BlockList>' + '<?xml version="1.0" encoding="utf-8"?>', + '<BlockList>', + $blocks, + '</BlockList>' ))); // Create metadata headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); @@ -863,6 +912,7 @@ // Perform request $response = $this->_performRequest($resourceName, '?comp=blocklist', Zend_Http_Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -881,15 +931,19 @@ public function getBlockList($containerName = '', $blobName = '', $snapshotId = null, $leaseId = null, $type = 0) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($type < 0 || $type > 2) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Invalid type of block list to retrieve.'); } @@ -904,13 +958,13 @@ // Headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } // Build query string $queryString = array('comp=blocklist', 'blocklisttype=' . $blockListType); - if ($snapshotId !== null) { + if (!is_null($snapshotId)) { $queryString[] = 'snapshot=' . $snapshotId; } $queryString = self::createQueryStringFromArray($queryString); @@ -945,6 +999,7 @@ return $returnValue; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -964,24 +1019,29 @@ public function createPageBlob($containerName = '', $blobName = '', $size = 0, $metadata = array(), $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } if ($size <= 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Page blob size must be specified.'); } // Create metadata headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); @@ -1002,6 +1062,7 @@ // Perform request $response = $this->_performRequest($resourceName, '', Zend_Http_Client::PUT, $headers, false, '', Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if ($response->isSuccessful()) { + return new Zend_Service_WindowsAzure_Storage_BlobInstance( $containerName, $blobName, @@ -1017,6 +1078,7 @@ $metadata ); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1037,33 +1099,40 @@ public function putPage($containerName = '', $blobName = '', $startByteOffset = 0, $endByteOffset = 0, $contents = '', $writeMethod = self::PAGE_WRITE_UPDATE, $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } if ($startByteOffset % 512 != 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Start byte offset must be a modulus of 512.'); } if (($endByteOffset + 1) % 512 != 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('End byte offset must be a modulus of 512 minus 1.'); } // Determine size $size = strlen($contents); if ($size >= self::MAX_BLOB_TRANSFER_SIZE) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Page blob size must not be larger than ' + self::MAX_BLOB_TRANSFER_SIZE . ' bytes.'); } // Create metadata headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } @@ -1084,6 +1153,7 @@ // Perform request $response = $this->_performRequest($resourceName, '?comp=page', Zend_Http_Client::PUT, $headers, false, $contents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1102,27 +1172,33 @@ public function getPageRegions($containerName = '', $blobName = '', $startByteOffset = 0, $endByteOffset = 0, $leaseId = null) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } if ($startByteOffset % 512 != 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Start byte offset must be a modulus of 512.'); } if ($endByteOffset > 0 && ($endByteOffset + 1) % 512 != 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('End byte offset must be a modulus of 512 minus 1.'); } // Create metadata headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } @@ -1144,8 +1220,10 @@ } else { $xmlRanges = array($result->PageRange); } - + + $ranges = array(); + for ($i = 0; $i < count($xmlRanges); $i++) { $ranges[] = new Zend_Service_WindowsAzure_Storage_PageRegionInstance( (int)$xmlRanges[$i]->Start, @@ -1155,6 +1233,7 @@ return $ranges; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1176,33 +1255,41 @@ public function copyBlob($sourceContainerName = '', $sourceBlobName = '', $destinationContainerName = '', $destinationBlobName = '', $metadata = array(), $sourceSnapshotId = null, $destinationLeaseId = null, $additionalHeaders = array()) { if ($sourceContainerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Source container name is not specified.'); } if (!self::isValidContainerName($sourceContainerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Source container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($sourceBlobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Source blob name is not specified.'); } if ($destinationContainerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Destination container name is not specified.'); } if (!self::isValidContainerName($destinationContainerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Destination container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($destinationBlobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Destination blob name is not specified.'); } if ($sourceContainerName === '$root' && strpos($sourceBlobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } if ($destinationContainerName === '$root' && strpos($destinationBlobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Create metadata headers $headers = array(); - if ($destinationLeaseId !== null) { + if (!is_null($destinationLeaseId)) { $headers['x-ms-lease-id'] = $destinationLeaseId; } $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); @@ -1214,7 +1301,7 @@ // Resource names $sourceResourceName = self::createResourceName($sourceContainerName, $sourceBlobName); - if ($sourceSnapshotId !== null) { + if (!is_null($sourceSnapshotId)) { $sourceResourceName .= '?snapshot=' . $sourceSnapshotId; } $destinationResourceName = self::createResourceName($destinationContainerName, $destinationBlobName); @@ -1225,6 +1312,7 @@ // Perform request $response = $this->_performRequest($destinationResourceName, '', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if ($response->isSuccessful()) { + return new Zend_Service_WindowsAzure_Storage_BlobInstance( $destinationContainerName, $destinationBlobName, @@ -1240,6 +1328,7 @@ $metadata ); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1258,15 +1347,19 @@ public function getBlob($containerName = '', $blobName = '', $localFileName = '', $snapshotId = null, $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($localFileName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.'); } @@ -1288,25 +1381,28 @@ public function getBlobData($containerName = '', $blobName = '', $snapshotId = null, $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } // Build query string $queryString = array(); - if ($snapshotId !== null) { + if (!is_null($snapshotId)) { $queryString[] = 'snapshot=' . $snapshotId; } $queryString = self::createQueryStringFromArray($queryString); // Additional headers? $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } foreach ($additionalHeaders as $key => $value) { @@ -1321,6 +1417,7 @@ if ($response->isSuccessful()) { return $response->getBody(); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1339,28 +1436,32 @@ public function getBlobInstance($containerName = '', $blobName = '', $snapshotId = null, $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Build query string $queryString = array(); - if ($snapshotId !== null) { + if (!is_null($snapshotId)) { $queryString[] = 'snapshot=' . $snapshotId; } $queryString = self::createQueryStringFromArray($queryString); // Additional headers? $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } foreach ($additionalHeaders as $key => $value) { @@ -1375,26 +1476,27 @@ if ($response->isSuccessful()) { // Parse metadata $metadata = $this->_parseMetadataHeaders($response->getHeaders()); - + // Return blob return new Zend_Service_WindowsAzure_Storage_BlobInstance( - $containerName, - $blobName, - $snapshotId, - $response->getHeader('Etag'), - $response->getHeader('Last-modified'), - $this->getBaseUrl() . '/' . $containerName . '/' . $blobName, - $response->getHeader('Content-Length'), - $response->getHeader('Content-Type'), - $response->getHeader('Content-Encoding'), - $response->getHeader('Content-Language'), - $response->getHeader('Cache-Control'), - $response->getHeader('x-ms-blob-type'), - $response->getHeader('x-ms-lease-status'), - false, - $metadata + $containerName, + $blobName, + $snapshotId, + $response->getHeader('Etag'), + $response->getHeader('Last-modified'), + $this->getBaseUrl() . '/' . $containerName . '/' . $blobName, + $response->getHeader('Content-Length'), + $response->getHeader('Content-Type'), + $response->getHeader('Content-Encoding'), + $response->getHeader('Content-Language'), + $response->getHeader('Cache-Control'), + $response->getHeader('x-ms-blob-type'), + $response->getHeader('x-ms-lease-status'), + false, + $metadata ); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1412,15 +1514,19 @@ public function getBlobMetadata($containerName = '', $blobName = '', $snapshotId = null, $leaseId = null) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } @@ -1442,15 +1548,19 @@ public function setBlobMetadata($containerName = '', $blobName = '', $metadata = array(), $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } if (count($metadata) == 0) { @@ -1459,7 +1569,7 @@ // Create metadata headers $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); @@ -1472,6 +1582,7 @@ // Perform request $response = $this->_performRequest($containerName . '/' . $blobName, '?comp=metadata', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1490,18 +1601,23 @@ public function setBlobProperties($containerName = '', $blobName = '', $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } if (count($additionalHeaders) == 0) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('No additional headers are specified.'); } @@ -1509,7 +1625,7 @@ $headers = array(); // Lease set? - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } @@ -1521,6 +1637,7 @@ // Perform request $response = $this->_performRequest($containerName . '/' . $blobName, '?comp=properties', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1538,15 +1655,19 @@ public function getBlobProperties($containerName = '', $blobName = '', $snapshotId = null, $leaseId = null) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } @@ -1566,28 +1687,32 @@ public function deleteBlob($containerName = '', $blobName = '', $snapshotId = null, $leaseId = null, $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Build query string $queryString = array(); - if ($snapshotId !== null) { + if (!is_null($snapshotId)) { $queryString[] = 'snapshot=' . $snapshotId; } $queryString = self::createQueryStringFromArray($queryString); // Additional headers? $headers = array(); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } foreach ($additionalHeaders as $key => $value) { @@ -1600,6 +1725,7 @@ // Perform request $response = $this->_performRequest($resourceName, $queryString, Zend_Http_Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1617,15 +1743,19 @@ public function snapshotBlob($containerName = '', $blobName = '', $metadata = array(), $additionalHeaders = array()) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } @@ -1643,6 +1773,7 @@ if ($response->isSuccessful()) { return $response->getHeader('x-ms-snapshot'); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1660,22 +1791,26 @@ public function leaseBlob($containerName = '', $blobName = '', $leaseAction = self::LEASE_ACQUIRE, $leaseId = null) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } if ($blobName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.'); } if ($containerName === '$root' && strpos($blobName, '/') !== false) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).'); } // Additional headers? $headers = array(); $headers['x-ms-lease-action'] = strtolower($leaseAction); - if ($leaseId !== null) { + if (!is_null($leaseId)) { $headers['x-ms-lease-id'] = $leaseId; } @@ -1684,6 +1819,9 @@ // Perform request $response = $this->_performRequest($resourceName, '?comp=lease', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE); + + + if ($response->isSuccessful()) { return new Zend_Service_WindowsAzure_Storage_LeaseInstance( $containerName, @@ -1691,6 +1829,7 @@ $response->getHeader('x-ms-lease-id'), $response->getHeader('x-ms-lease-time')); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1711,27 +1850,29 @@ public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $maxResults = null, $marker = null, $include = null, $currentResultCount = 0) { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } // Build query string $queryString = array('restype=container', 'comp=list'); - if ($prefix !== null) { + if (!is_null($prefix)) { $queryString[] = 'prefix=' . $prefix; } if ($delimiter !== '') { $queryString[] = 'delimiter=' . $delimiter; } - if ($maxResults !== null) { + if (!is_null($maxResults)) { $queryString[] = 'maxresults=' . $maxResults; } - if ($marker !== null) { + if (!is_null($marker)) { $queryString[] = 'marker=' . $marker; } - if ($include !== null) { + if (!is_null($include)) { $queryString[] = 'include=' . $include; } $queryString = self::createQueryStringFromArray($queryString); @@ -1741,10 +1882,11 @@ if ($response->isSuccessful()) { // Return value $blobs = array(); - + // Blobs $xmlBlobs = $this->_parseResponse($response)->Blobs->Blob; - if ($xmlBlobs !== null) { + if (!is_null($xmlBlobs)) { + for ($i = 0; $i < count($xmlBlobs); $i++) { $properties = (array)$xmlBlobs[$i]->Properties; @@ -1771,7 +1913,8 @@ // Blob prefixes (folders) $xmlBlobs = $this->_parseResponse($response)->Blobs->BlobPrefix; - if ($xmlBlobs !== null) { + if (!is_null($xmlBlobs)) { + for ($i = 0; $i < count($xmlBlobs); $i++) { $blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance( $containerName, @@ -1796,17 +1939,18 @@ // More blobs? $xmlMarker = (string)$this->_parseResponse($response)->NextMarker; $currentResultCount = $currentResultCount + count($blobs); - if ($maxResults !== null && $currentResultCount < $maxResults) { - if ($xmlMarker !== null && $xmlMarker != '') { + if (!is_null($maxResults) && $currentResultCount < $maxResults) { + if (!is_null($xmlMarker) && $xmlMarker != '') { $blobs = array_merge($blobs, $this->listBlobs($containerName, $prefix, $delimiter, $maxResults, $marker, $include, $currentResultCount)); } } - if ($maxResults !== null && count($blobs) > $maxResults) { + if (!is_null($maxResults) && count($blobs) > $maxResults) { $blobs = array_slice($blobs, 0, $maxResults); } return $blobs; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -1826,9 +1970,11 @@ public function generateSharedAccessUrl($containerName = '', $blobName = '', $resource = 'b', $permissions = 'r', $start = '', $expiry = '', $identifier = '') { if ($containerName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.'); } if (!self::isValidContainerName($containerName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.'); } @@ -1889,11 +2035,6 @@ */ public function registerStreamWrapper($name = 'azure') { - /** - * @see Zend_Service_WindowsAzure_Storage_Blob_Stream - */ - require_once 'Zend/Service/WindowsAzure/Storage/Blob/Stream.php'; - stream_register_wrapper($name, 'Zend_Service_WindowsAzure_Storage_Blob_Stream'); $this->registerAsClient($name); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,27 +15,16 @@ * @category Zend * @package Zend_Service_WindowsAzure_Storage * @subpackage Blob - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://todo name_todo - * @version $Id: Stream.php 23167 2010-10-19 17:53:31Z mabe $ - */ - -/** - * @see Zend_Service_WindowsAzure_Storage_Blob + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ -require_once 'Zend/Service/WindowsAzure/Storage/Blob.php'; - -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - /** * @category Zend * @package Zend_Service_WindowsAzure_Storage * @subpackage Blob - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Blob_Stream @@ -45,42 +34,42 @@ * * @var string */ - private $_fileName = null; + protected $_fileName = null; /** * Temporary file name * * @var string */ - private $_temporaryFileName = null; + protected $_temporaryFileName = null; /** * Temporary file handle * * @var resource */ - private $_temporaryFileHandle = null; + protected $_temporaryFileHandle = null; /** * Blob storage client * * @var Zend_Service_WindowsAzure_Storage_Blob */ - private $_storageClient = null; + protected $_storageClient = null; /** * Write mode? * * @var boolean */ - private $_writeMode = false; + protected $_writeMode = false; /** * List of blobs * * @var array */ - private $_blobs = null; + protected $_blobs = null; /** * Retrieve storage client for this stream type @@ -90,7 +79,7 @@ */ protected function _getStorageClient($path = '') { - if ($this->_storageClient === null) { + if (is_null($this->_storageClient)) { $url = explode(':', $path); if (!$url) { throw new Zend_Service_WindowsAzure_Exception('Could not parse path "' . $path . '".'); @@ -150,7 +139,7 @@ * @param string $opened_path * @return boolean */ - public function stream_open($path, $mode, $options, $opened_path) + public function stream_open($path, $mode, $options, &$opened_path) { $this->_fileName = $path; $this->_temporaryFileName = tempnam(sys_get_temp_dir(), 'azure'); @@ -347,36 +336,7 @@ return false; } - $stat = array(); - $stat['dev'] = 0; - $stat['ino'] = 0; - $stat['mode'] = 0; - $stat['nlink'] = 0; - $stat['uid'] = 0; - $stat['gid'] = 0; - $stat['rdev'] = 0; - $stat['size'] = 0; - $stat['atime'] = 0; - $stat['mtime'] = 0; - $stat['ctime'] = 0; - $stat['blksize'] = 0; - $stat['blocks'] = 0; - - $info = null; - try { - $info = $this->_getStorageClient($this->_fileName)->getBlobInstance( - $this->_getContainerName($this->_fileName), - $this->_getFileName($this->_fileName) - ); - } catch (Zend_Service_WindowsAzure_Exception $ex) { - // Unexisting file... - } - if ($info !== null) { - $stat['size'] = $info->Size; - $stat['atime'] = time(); - } - - return $stat; + return $this->url_stat($this->_fileName, 0); } /** @@ -391,6 +351,10 @@ $this->_getContainerName($path), $this->_getFileName($path) ); + + // Clear the stat cache for this path. + clearstatcache(true, $path); + return true; } /** @@ -420,6 +384,10 @@ $this->_getContainerName($path_from), $this->_getFileName($path_from) ); + + // Clear the stat cache for the affected paths. + clearstatcache(true, $path_from); + clearstatcache(true, $path_to); return true; } @@ -453,15 +421,21 @@ $this->_getContainerName($path), $this->_getFileName($path) ); + $stat['size'] = $info->Size; + + // Set the modification time and last modified to the Last-Modified header. + $lastmodified = strtotime($info->LastModified); + $stat['mtime'] = $lastmodified; + $stat['ctime'] = $lastmodified; + + // Entry is a regular file. + $stat['mode'] = 0100000; + + return array_values($stat) + $stat; } catch (Zend_Service_WindowsAzure_Exception $ex) { // Unexisting file... + return false; } - if ($info !== null) { - $stat['size'] = $info->Size; - $stat['atime'] = time(); - } - - return $stat; } /** @@ -480,6 +454,7 @@ $this->_getStorageClient($path)->createContainer( $this->_getContainerName($path) ); + return true; } catch (Zend_Service_WindowsAzure_Exception $ex) { return false; } @@ -498,11 +473,15 @@ public function rmdir($path, $options) { if ($this->_getContainerName($path) == $this->_getFileName($path)) { + // Clear the stat cache so that affected paths are refreshed. + clearstatcache(); + // Delete container try { $this->_getStorageClient($path)->deleteContainer( $this->_getContainerName($path) ); + return true; } catch (Zend_Service_WindowsAzure_Exception $ex) { return false; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,26 +15,17 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlobContainer.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: BlobContainer.php 24593 2012-01-05 20:35:02Z matthew $ */ -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** - * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract - */ -require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string $Name Name of the container diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlobInstance.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: BlobInstance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract */ require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; @@ -34,35 +29,29 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property string $Container Container name - * @property string $Name Name - * @property string $SnapshotId Snapshot id - * @property string $Etag Etag - * @property string $LastModified Last modified date - * @property string $Url Url - * @property int $Size Size - * @property string $ContentType Content Type - * @property string $ContentEncoding Content Encoding - * @property string $ContentLanguage Content Language - * @property string $CacheControl Cache control - * @property string $BlobType Blob type - * @property string $LeaseStatus Lease status - * @property boolean $IsPrefix Is Prefix? + * @property string $Container The name of the blob container in which the blob is stored. + * @property string $Name The name of the blob. + * @property string $SnapshotId The blob snapshot ID if it is a snapshot blob (= a backup copy of a blob). + * @property string $Etag The entity tag, used for versioning and concurrency. + * @property string $LastModified Timestamp when the blob was last modified. + * @property string $Url The full URL where the blob can be downloaded. + * @property int $Size The blob size in bytes. + * @property string $ContentType The blob content type header. + * @property string $ContentEncoding The blob content encoding header. + * @property string $ContentLanguage The blob content language header. + * @property string $CacheControl The blob cache control header. + * @property string $BlobType The blob type (block blob / page blob). + * @property string $LeaseStatus The blob lease status. + * @property boolean $IsPrefix Is it a blob or a directory prefix? * @property array $Metadata Key/value pairs of meta data */ class Zend_Service_WindowsAzure_Storage_BlobInstance + extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** - * Data - * - * @var array - */ - protected $_data = null; - - /** * Constructor * * @param string $containerName Container name @@ -101,32 +90,4 @@ 'metadata' => $metadata ); } - - /** - * Magic overload for setting properties - * - * @param string $name Name of the property - * @param string $value Value to set - */ - public function __set($name, $value) { - if (array_key_exists(strtolower($name), $this->_data)) { - $this->_data[strtolower($name)] = $value; - return; - } - - throw new Exception("Unknown property: " . $name); - } - - /** - * Magic overload for getting properties - * - * @param string $name Name of the property - */ - public function __get($name) { - if (array_key_exists(strtolower($name), $this->_data)) { - return $this->_data[strtolower($name)]; - } - - throw new Exception("Unknown property: " . $name); - } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,28 +15,21 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DynamicTableEntity.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: DynamicTableEntity.php 24593 2012-01-05 20:35:02Z matthew $ */ - -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - /** * @see Zend_Service_WindowsAzure_Storage_TableEntity */ require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php'; - /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_DynamicTableEntity extends Zend_Service_WindowsAzure_Storage_TableEntity @@ -86,7 +79,7 @@ } else { if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) { // Determine type? - if ($type === null) { + if (is_null($type)) { $type = 'Edm.String'; if (is_int($value)) { $type = 'Edm.Int32'; @@ -94,6 +87,11 @@ $type = 'Edm.Double'; } else if (is_bool($value)) { $type = 'Edm.Boolean'; + } else if ($value instanceof DateTime || $this->_convertToDateTime($value) !== false) { + if (!$value instanceof DateTime) { + $value = $this->_convertToDateTime($value); + } + $type = 'Edm.DateTime'; } } @@ -104,7 +102,28 @@ 'Value' => $value, ); } - + + // Set type? + if (!is_null($type)) { + $this->_dynamicProperties[strtolower($name)]->Type = $type; + + // Try to convert the type + if ($type == 'Edm.Int32' || $type == 'Edm.Int64') { + $value = intval($value); + } else if ($type == 'Edm.Double') { + $value = floatval($value); + } else if ($type == 'Edm.Boolean') { + if (!is_bool($value)) { + $value = strtolower($value) == 'true'; + } + } else if ($type == 'Edm.DateTime') { + if (!$value instanceof DateTime) { + $value = $this->_convertToDateTime($value); + } + } + } + + // Set value $this->_dynamicProperties[strtolower($name)]->Value = $value; } return $this; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/LeaseInstance.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/LeaseInstance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/LeaseInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract */ require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; @@ -34,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string $Container Container name diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract */ require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; @@ -34,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property int $start Page range start diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/Queue.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/Queue.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/Queue.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,57 +15,31 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://todo name_todo - * @version $Id: Queue.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Queue.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_Service_WindowsAzure_Credentials_SharedKey - */ -require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php'; - -/** - * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract - */ -require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php'; - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Http_Response - */ -require_once 'Zend/Http/Response.php'; - -/** - * @see Zend_Service_WindowsAzure_Storage + * see Zend_Service_WindowsAzure_Storage */ require_once 'Zend/Service/WindowsAzure/Storage.php'; /** - * Zend_Service_WindowsAzure_Storage_QueueInstance + * @see Zend_Service_WindowsAzure_Storage_QueueInstance */ require_once 'Zend/Service/WindowsAzure/Storage/QueueInstance.php'; /** - * Zend_Service_WindowsAzure_Storage_QueueMessage + * @see Zend_Service_WindowsAzure_Storage_QueueMessage */ require_once 'Zend/Service/WindowsAzure/Storage/QueueMessage.php'; /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - - -/** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_Storage @@ -106,9 +80,11 @@ public function queueExists($queueName = '') { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } @@ -134,9 +110,11 @@ public function createQueue($queueName = '', $metadata = array()) { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } @@ -147,16 +125,32 @@ // Perform request $response = $this->_performRequest($queueName, '', Zend_Http_Client::PUT, $headers); if ($response->isSuccessful()) { + return new Zend_Service_WindowsAzure_Storage_QueueInstance( $queueName, $metadata ); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } /** + * Create queue if it does not exist + * + * @param string $queueName Queue name + * @param array $metadata Key/value pairs of meta data + * @throws Zend_Service_WindowsAzure_Exception + */ + public function createQueueIfNotExists($queueName = '', $metadata = array()) + { + if (!$this->queueExists($queueName)) { + $this->createQueue($queueName, $metadata); + } + } + + /** * Get queue * * @param string $queueName Queue name @@ -166,9 +160,11 @@ public function getQueue($queueName = '') { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } @@ -177,7 +173,7 @@ if ($response->isSuccessful()) { // Parse metadata $metadata = $this->_parseMetadataHeaders($response->getHeaders()); - + // Return queue $queue = new Zend_Service_WindowsAzure_Storage_QueueInstance( $queueName, @@ -186,6 +182,7 @@ $queue->ApproximateMessageCount = intval($response->getHeader('x-ms-approximate-message-count')); return $queue; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -200,9 +197,11 @@ public function getQueueMetadata($queueName = '') { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } @@ -221,9 +220,11 @@ public function setQueueMetadata($queueName = '', $metadata = array()) { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } if (count($metadata) == 0) { @@ -238,6 +239,7 @@ $response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::PUT, $headers); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -251,15 +253,18 @@ public function deleteQueue($queueName = '') { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } // Perform request $response = $this->_performRequest($queueName, '', Zend_Http_Client::DELETE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -279,16 +284,16 @@ { // Build query string $queryString = array('comp=list'); - if ($prefix !== null) { + if (!is_null($prefix)) { $queryString[] = 'prefix=' . $prefix; } - if ($maxResults !== null) { + if (!is_null($maxResults)) { $queryString[] = 'maxresults=' . $maxResults; } - if ($marker !== null) { + if (!is_null($marker)) { $queryString[] = 'marker=' . $marker; } - if ($include !== null) { + if (!is_null($include)) { $queryString[] = 'include=' . $include; } $queryString = self::createQueryStringFromArray($queryString); @@ -300,7 +305,8 @@ $xmlMarker = (string)$this->_parseResponse($response)->NextMarker; $queues = array(); - if ($xmlQueues !== null) { + if (!is_null($xmlQueues)) { + for ($i = 0; $i < count($xmlQueues); $i++) { $queues[] = new Zend_Service_WindowsAzure_Storage_QueueInstance( (string)$xmlQueues[$i]->Name, @@ -309,17 +315,18 @@ } } $currentResultCount = $currentResultCount + count($queues); - if ($maxResults !== null && $currentResultCount < $maxResults) { - if ($xmlMarker !== null && $xmlMarker != '') { + if (!is_null($maxResults) && $currentResultCount < $maxResults) { + if (!is_null($xmlMarker) && $xmlMarker != '') { $queues = array_merge($queues, $this->listQueues($prefix, $maxResults, $xmlMarker, $include, $currentResultCount)); } } - if ($maxResults !== null && count($queues) > $maxResults) { + if (!is_null($maxResults) && count($queues) > $maxResults) { $queues = array_slice($queues, 0, $maxResults); } return $queues; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -335,24 +342,29 @@ public function putMessage($queueName = '', $message = '', $ttl = null) { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } if (strlen($message) > self::MAX_MESSAGE_SIZE) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Message is too big. Message content should be < 8KB.'); } if ($message == '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Message is not specified.'); } - if ($ttl !== null && ($ttl <= 0 || $ttl > self::MAX_MESSAGE_SIZE)) { + if (!is_null($ttl) && ($ttl <= 0 || $ttl > self::MAX_MESSAGE_SIZE)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Message TTL is invalid. Maximal TTL is 7 days (' . self::MAX_MESSAGE_SIZE . ' seconds) and should be greater than zero.'); } // Build query string $queryString = array(); - if ($ttl !== null) { + if (!is_null($ttl)) { $queryString[] = 'messagettl=' . $ttl; } $queryString = self::createQueryStringFromArray($queryString); @@ -367,6 +379,7 @@ $response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::POST, array(), false, $rawData); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Error putting message into queue.'); } } @@ -384,15 +397,19 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTimeout = null, $peek = false) { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } if ($numOfMessages < 1 || $numOfMessages > 32 || intval($numOfMessages) != $numOfMessages) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Invalid number of messages to retrieve.'); } - if ($visibilityTimeout !== null && ($visibilityTimeout <= 0 || $visibilityTimeout > 7200)) { + if (!is_null($visibilityTimeout) && ($visibilityTimeout <= 0 || $visibilityTimeout > 7200)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Visibility timeout is invalid. Maximum value is 2 hours (7200 seconds) and should be greater than zero.'); } @@ -404,7 +421,7 @@ if ($numOfMessages > 1) { $queryString[] = 'numofmessages=' . $numOfMessages; } - if (!$peek && $visibilityTimeout !== null) { + if (!$peek && !is_null($visibilityTimeout)) { $queryString[] = 'visibilitytimeout=' . $visibilityTimeout; } $queryString = self::createQueryStringFromArray($queryString); @@ -424,7 +441,7 @@ } else { $xmlMessages = array($result->QueueMessage); } - + $messages = array(); for ($i = 0; $i < count($xmlMessages); $i++) { $messages[] = new Zend_Service_WindowsAzure_Storage_QueueMessage( @@ -440,6 +457,7 @@ return $messages; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -458,6 +476,18 @@ } /** + * Checks to see if a given queue has messages + * + * @param string $queueName Queue name + * @return boolean + * @throws Zend_Service_WindowsAzure_Exception + */ + public function hasMessages($queueName = '') + { + return count($this->peekMessages($queueName)) > 0; + } + + /** * Clear queue messages * * @param string $queueName Queue name @@ -466,15 +496,18 @@ public function clearMessages($queueName = '') { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } // Perform request $response = $this->_performRequest($queueName . '/messages', '', Zend_Http_Client::DELETE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Error clearing messages from queue.'); } } @@ -482,25 +515,29 @@ /** * Delete queue message * - * @param string $queueName Queue name + * @param string $queueName Queue name * @param Zend_Service_WindowsAzure_Storage_QueueMessage $message Message to delete from queue. A message retrieved using "peekMessages" can NOT be deleted! * @throws Zend_Service_WindowsAzure_Exception */ public function deleteMessage($queueName = '', Zend_Service_WindowsAzure_Storage_QueueMessage $message) { if ($queueName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); } if (!self::isValidQueueName($queueName)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } if ($message->PopReceipt == '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('A message retrieved using "peekMessages" can NOT be deleted! Use "getMessages" instead.'); } // Perform request - $response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . $message->PopReceipt, Zend_Http_Client::DELETE); + $response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . urlencode($message->PopReceipt), Zend_Http_Client::DELETE); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueueInstance.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: QueueInstance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract */ require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; @@ -34,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string $Name Name of the queue diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueueMessage.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: QueueMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract */ require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; @@ -34,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string $MessageId Message ID diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SignedIdentifier.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: SignedIdentifier.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract */ require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; @@ -34,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string $Id Id for the signed identifier diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,22 +15,16 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - - -/** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * */ @@ -54,8 +48,8 @@ $this->_data[strtolower($name)] = $value; return; } - - throw new Exception("Unknown property: " . $name); + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception("Unknown property: " . $name); } /** @@ -67,7 +61,7 @@ if (array_key_exists(strtolower($name), $this->_data)) { return $this->_data[strtolower($name)]; } - - throw new Exception("Unknown property: " . $name); + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception("Unknown property: " . $name); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/Table.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/Table.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/Table.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,45 +15,10 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 23170 2010-10-19 18:29:24Z mabe $ - */ - -/** - * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract - */ -require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php'; - -/** - * @see Zend_Service_WindowsAzure_Credentials_SharedKey - */ -require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php'; - -/** - * @see Zend_Service_WindowsAzure_Credentials_SharedKeyLite + * @version $Id: Table.php 24697 2012-03-23 13:11:04Z ezimuel $ */ -require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php'; - -/** - * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract - */ -require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php'; - -/** - * @see Zend_Http_Client - */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Http_Response - */ -require_once 'Zend/Http/Response.php'; - -/** - * @see Zend_Service_WindowsAzure_Storage - */ -require_once 'Zend/Service/WindowsAzure/Storage.php'; /** * @see Zend_Service_WindowsAzure_Storage_BatchStorageAbstract @@ -66,9 +31,9 @@ require_once 'Zend/Service/WindowsAzure/Storage/TableInstance.php'; /** - * @see Zend_Service_WindowsAzure_Storage_TableEntity + * @see Zend_Service_WindowsAzure_Storage_TableEntityQuery */ -require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php'; +require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php'; /** * @see Zend_Service_WindowsAzure_Storage_DynamicTableEntity @@ -76,27 +41,48 @@ require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php'; /** - * @see Zend_Service_WindowsAzure_Storage_TableEntityQuery + * @see Zend_Service_WindowsAzure_Credentials_SharedKeyLite */ -require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php'; - -/** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - +require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php'; /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Table extends Zend_Service_WindowsAzure_Storage_BatchStorageAbstract { /** + * Throw Zend_Service_WindowsAzure_Exception when a property is not specified in Windows Azure? + * Defaults to true, making behaviour similar to Windows Azure StorageClient in .NET. + * + * @var boolean + */ + protected $_throwExceptionOnMissingData = true; + + /** + * Throw Zend_Service_WindowsAzure_Exception when a property is not specified in Windows Azure? + * Defaults to true, making behaviour similar to Windows Azure StorageClient in .NET. + * + * @param boolean $value + */ + public function setThrowExceptionOnMissingData($value = true) + { + $this->_throwExceptionOnMissingData = $value; + } + + /** + * Throw Zend_Service_WindowsAzure_Exception when a property is not specified in Windows Azure? + */ + public function getThrowExceptionOnMissingData() + { + return $this->_throwExceptionOnMissingData; + } + + /** * Creates a new Zend_Service_WindowsAzure_Storage_Table instance * * @param string $host Storage host name @@ -125,6 +111,7 @@ public function tableExists($tableName = '') { if ($tableName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.'); } @@ -187,7 +174,8 @@ } // More tables? - if ($response->getHeader('x-ms-continuation-NextTableName') !== null) { + if (!is_null($response->getHeader('x-ms-continuation-NextTableName'))) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; $returnValue = array_merge($returnValue, $this->listTables($response->getHeader('x-ms-continuation-NextTableName'))); } @@ -251,6 +239,7 @@ $tableName = $entry->xpath('.//m:properties/d:TableName'); $tableName = (string)$tableName[0]; + return new Zend_Service_WindowsAzure_Storage_TableInstance( (string)$entry->id, $tableName, @@ -258,7 +247,21 @@ (string)$entry->updated ); } else { - throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + require_once 'Zend/Service/WindowsAzure/Exception.php'; + throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * Create table if it does not exist + * + * @param string $tableName Table name + * @throws Zend_Service_WindowsAzure_Exception + */ + public function createTableIfNotExists($tableName = '') + { + if (!$this->tableExists($tableName)) { + $this->createTable($tableName); } } @@ -271,6 +274,7 @@ public function deleteTable($tableName = '') { if ($tableName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.'); } @@ -281,6 +285,7 @@ // Perform request $response = $this->_performRequest('Tables(\'' . $tableName . '\')', '', Zend_Http_Client::DELETE, $headers, true, null); if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -296,9 +301,11 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null) { if ($tableName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.'); } - if ($entity === null) { + if (is_null($entity)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.'); } @@ -340,7 +347,7 @@ $result = $this->_parseResponse($response); $timestamp = $result->xpath('//m:properties/d:Timestamp'); - $timestamp = (string)$timestamp[0]; + $timestamp = $this->_convertToDateTime( (string)$timestamp[0] ); $etag = $result->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata'); $etag = (string)$etag['etag']; @@ -351,6 +358,7 @@ return $entity; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -366,9 +374,11 @@ public function deleteEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false) { if ($tableName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.'); } - if ($entity === null) { + if (is_null($entity)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.'); } @@ -394,6 +404,7 @@ $response = $this->_performRequest($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', Zend_Http_Client::DELETE, $headers, true, null); } if (!$response->isSuccessful()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -408,18 +419,22 @@ * @return Zend_Service_WindowsAzure_Storage_TableEntity * @throws Zend_Service_WindowsAzure_Exception */ - public function retrieveEntityById($tableName = '', $partitionKey = '', $rowKey = '', $entityClass = 'Zend_Service_WindowsAzure_Storage_DynamicTableEntity') + public function retrieveEntityById($tableName, $partitionKey, $rowKey, $entityClass = 'Zend_Service_WindowsAzure_Storage_DynamicTableEntity') { - if ($tableName === '') { + if (is_null($tableName) || $tableName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.'); } - if ($partitionKey === '') { + if (is_null($partitionKey) || $partitionKey === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Partition key is not specified.'); } - if ($rowKey === '') { + if (is_null($rowKey) || $rowKey === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Row key is not specified.'); } - if ($entityClass === '') { + if (is_null($entityClass) || $entityClass === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Entity class is not specified.'); } @@ -429,6 +444,7 @@ if (strlen($partitionKey . $rowKey) >= 256) { // Start a batch if possible if ($this->isInBatch()) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Entity cannot be retrieved. A transaction is required to retrieve the entity, but another transaction is already active.'); } @@ -460,6 +476,7 @@ */ public function select() { + return new Zend_Service_WindowsAzure_Storage_TableEntityQuery(); } @@ -477,9 +494,11 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = 'Zend_Service_WindowsAzure_Storage_DynamicTableEntity', $nextPartitionKey = null, $nextRowKey = null) { if ($tableName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.'); } if ($entityClass === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Entity class is not specified.'); } @@ -497,7 +516,9 @@ // Option 1: $tableName is a string // Append parentheses - $tableName .= '()'; + if (strpos($tableName, '()') === false) { + $tableName .= '()'; + } // Build query $query = array(); @@ -520,16 +541,19 @@ // Change $tableName $tableName = $tableName->assembleFrom(true); } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Invalid argument: $tableName'); } // Add continuation querystring parameters? - if ($nextPartitionKey !== null && $nextRowKey !== null) { + if (!is_null($nextPartitionKey) && !is_null($nextRowKey)) { if ($queryString !== '') { $queryString .= '&'; + } else { + $queryString .= '?'; } - $queryString .= '&NextPartitionKey=' . rawurlencode($nextPartitionKey) . '&NextRowKey=' . rawurlencode($nextRowKey); + $queryString .= 'NextPartitionKey=' . rawurlencode($nextPartitionKey) . '&NextRowKey=' . rawurlencode($nextRowKey); } // Perform request @@ -580,15 +604,15 @@ // Create entity $entity = new $entityClass('', ''); - $entity->setAzureValues((array)$properties, true); + $entity->setAzureValues((array)$properties, $this->_throwExceptionOnMissingData); - // If we have a Zend_Service_WindowsAzure_Storage_DynamicTableEntity, make sure all property types are OK + // If we have a Zend_Service_WindowsAzure_Storage_DynamicTableEntity, make sure all property types are set if ($entity instanceof Zend_Service_WindowsAzure_Storage_DynamicTableEntity) { foreach ($properties as $key => $value) { $attributes = $value->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata'); $type = (string)$attributes['type']; if ($type !== '') { - $entity->setAzurePropertyType($key, $type); + $entity->setAzureProperty($key, (string)$value, $type); } } } @@ -603,7 +627,7 @@ } // More entities? - if ($response->getHeader('x-ms-continuation-NextPartitionKey') !== null && $response->getHeader('x-ms-continuation-NextRowKey') !== null) { + if (!is_null($response->getHeader('x-ms-continuation-NextPartitionKey')) && !is_null($response->getHeader('x-ms-continuation-NextRowKey'))) { if (strpos($queryString, '$top') === false) { $returnValue = array_merge($returnValue, $this->retrieveEntities($tableName, $filter, $entityClass, $response->getHeader('x-ms-continuation-NextPartitionKey'), $response->getHeader('x-ms-continuation-NextRowKey'))); } @@ -612,6 +636,7 @@ // Return return $returnValue; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -642,6 +667,7 @@ { $mergeEntity = null; if (is_array($properties) && count($properties) > 0) { + // Build a new object $mergeEntity = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($entity->getPartitionKey(), $entity->getRowKey()); @@ -655,10 +681,10 @@ } else { $mergeEntity = $entity; } - - // Ensure entity timestamp matches updated timestamp - $entity->setTimestamp($this->isoDate()); + // Ensure entity timestamp matches updated timestamp + $entity->setTimestamp(new DateTime()); + return $this->_changeEntity(Zend_Http_Client::MERGE, $tableName, $mergeEntity, $verifyEtag); } @@ -691,9 +717,11 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false) { if ($tableName === '') { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.'); } - if ($entity === null) { + if (is_null($entity)) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.'); } @@ -723,14 +751,11 @@ </content> </entry>'; - // Attempt to get timestamp from entity + // Attempt to get timestamp from entity $timestamp = $entity->getTimestamp(); - if ($timestamp == Zend_Service_WindowsAzure_Storage_TableEntity::DEFAULT_TIMESTAMP) { - $timestamp = $this->isoDate(); - } - + $requestBody = $this->_fillTemplate($requestBody, array( - 'Updated' => $timestamp, + 'Updated' => $this->_convertToEdmDateTime($timestamp), 'Properties' => $this->_generateAzureRepresentation($entity) )); @@ -746,18 +771,19 @@ // Perform request $response = null; if ($this->isInBatch()) { - $this->getCurrentBatch()->enlistOperation($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\',RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); + $this->getCurrentBatch()->enlistOperation($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); return null; } else { - $response = $this->_performRequest($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\',RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); + $response = $this->_performRequest($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); } if ($response->isSuccessful()) { // Update properties $entity->setEtag($response->getHeader('Etag')); - $entity->setTimestamp($response->getHeader('Last-modified')); + $entity->setTimestamp( $this->_convertToDateTime($response->getHeader('Last-modified')) ); return $entity; } else { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); } } @@ -804,14 +830,16 @@ if ($azureValue->Type != '') { $value[] = ' m:type="' . $azureValue->Type . '"'; } - if ($azureValue->Value === null) { + if (is_null($azureValue->Value)) { $value[] = ' m:null="true"'; } $value[] = '>'; - if ($azureValue->Value !== null) { + if (!is_null($azureValue->Value)) { if (strtolower($azureValue->Type) == 'edm.boolean') { $value[] = ($azureValue->Value == true ? '1' : '0'); + } else if (strtolower($azureValue->Type) == 'edm.datetime') { + $value[] = $this->_convertToEdmDateTime($azureValue->Value); } else { $value[] = htmlspecialchars($azureValue->Value); } @@ -862,5 +890,42 @@ $resourceType, $requiredPermission ); - } + } + + /** + * Converts a string to a DateTime object. Returns false on failure. + * + * @param string $value The string value to parse + * @return DateTime|boolean + */ + protected function _convertToDateTime($value = '') + { + if ($value instanceof DateTime) { + return $value; + } + + try { + if (substr($value, -1) == 'Z') { + $value = substr($value, 0, strlen($value) - 1); + } + return new DateTime($value, new DateTimeZone('UTC')); + } + catch (Exception $ex) { + return false; + } + } + + /** + * Converts a DateTime object into an Edm.DaeTime value in UTC timezone, + * represented as a string. + * + * @param DateTime $value + * @return string + */ + protected function _convertToEdmDateTime(DateTime $value) + { + $cloned = clone $value; + $cloned->setTimezone(new DateTimeZone('UTC')); + return str_replace('+0000', 'Z', $cloned->format(DateTime::ISO8601)); + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/TableEntity.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/TableEntity.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/TableEntity.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,28 +15,20 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableEntity.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: TableEntity.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - - -/** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_TableEntity { - const DEFAULT_TIMESTAMP = '1900-01-01T00:00:00'; - /** * Partition key * @@ -129,8 +121,8 @@ */ public function getTimestamp() { - if (null === $this->_timestamp) { - $this->setTimestamp(self::DEFAULT_TIMESTAMP); + if (null === $this->_timestamp) { + $this->setTimestamp(new DateTime()); } return $this->_timestamp; } @@ -139,9 +131,9 @@ * Set timestamp * * @azure Timestamp Edm.DateTime - * @param string $value + * @param DateTime $value */ - public function setTimestamp($value = '1900-01-01T00:00:00') + public function setTimestamp(DateTime $value) { $this->_timestamp = $value; } @@ -230,6 +222,8 @@ break; case 'edm.double': $values[$accessor->AzurePropertyName] = floatval($values[$accessor->AzurePropertyName]); break; + case 'edm.datetime': + $values[$accessor->AzurePropertyName] = $this->_convertToDateTime($values[$accessor->AzurePropertyName]); break; } } @@ -242,6 +236,7 @@ $this->$method($values[$accessor->AzurePropertyName]); } } else if ($throwOnError) { + require_once 'Zend/Service/WindowsAzure/Exception.php'; throw new Zend_Service_WindowsAzure_Exception("Property '" . $accessor->AzurePropertyName . "' was not found in \$values array"); } } @@ -268,7 +263,7 @@ $properties = $type->getProperties(); foreach ($properties as $property) { $accessor = self::getAzureAccessor($property); - if ($accessor !== null) { + if (!is_null($accessor)) { $azureAccessors[] = $accessor; } } @@ -277,7 +272,7 @@ $methods = $type->getMethods(); foreach ($methods as $method) { $accessor = self::getAzureAccessor($method); - if ($accessor !== null) { + if (!is_null($accessor)) { $azureAccessors[] = $accessor; } } @@ -325,4 +320,35 @@ 'AzurePropertyType' => isset($azureProperties[1]) ? $azureProperties[1] : '' ); } + + /** + * Converts a string to a DateTime object. Returns false on failure. + * + * @param string $value The string value to parse + * @return DateTime|boolean + */ + protected function _convertToDateTime($value = '') + { + if ($value === '') { + return false; + } + + if ($value instanceof DateTime) { + return $value; + } + + if (@strtotime($value) !== false) { + try { + if (substr($value, -1) == 'Z') { + $value = substr($value, 0, strlen($value) - 1); + } + return new DateTime($value, new DateTimeZone('UTC')); + } + catch (Exception $ex) { + return false; + } + } + + return false; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableEntityQuery.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: TableEntityQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_TableEntityQuery @@ -129,7 +129,7 @@ { $condition = $this->_replaceOperators($condition); - if ($value !== null) { + if (!is_null($value)) { $condition = $this->_quoteInto($condition, $value); } @@ -211,7 +211,7 @@ $query[] = '$orderby=' . ($urlEncode ? self::encodeQuery($orderBy) : $orderBy); } - if ($this->_top !== null) { + if (!is_null($this->_top)) { $query[] = '$top=' . $this->_top; } @@ -234,16 +234,16 @@ if ($includeParentheses) { $identifier .= '('; - if ($this->_partitionKey !== null) { - $identifier .= 'PartitionKey=\'' . $this->_partitionKey . '\''; + if (!is_null($this->_partitionKey)) { + $identifier .= 'PartitionKey=\'' . self::encodeQuery($this->_partitionKey) . '\''; } - if ($this->_partitionKey !== null && $this->_rowKey !== null) { + if (!is_null($this->_partitionKey) && !is_null($this->_rowKey)) { $identifier .= ', '; } - if ($this->_rowKey !== null) { - $identifier .= 'RowKey=\'' . $this->_rowKey . '\''; + if (!is_null($this->_rowKey)) { + $identifier .= 'RowKey=\'' . self::encodeQuery($this->_rowKey) . '\''; } $identifier .= ')'; @@ -331,8 +331,9 @@ $query = str_replace('+', '%2B', $query); $query = str_replace(',', '%2C', $query); $query = str_replace('$', '%24', $query); - - + $query = str_replace('{', '%7B', $query); + $query = str_replace('}', '%7D', $query); + $query = str_replace(' ', '%20', $query); return $query; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/WindowsAzure/Storage/TableInstance.php --- a/web/lib/Zend/Service/WindowsAzure/Storage/TableInstance.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/WindowsAzure/Storage/TableInstance.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableInstance.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: TableInstance.php 24593 2012-01-05 20:35:02Z matthew $ */ /** - * @see Zend_Service_WindowsAzure_Exception - */ -require_once 'Zend/Service/WindowsAzure/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Storage_StorageEntityAbstract */ require_once 'Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php'; @@ -34,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property string $Id Id diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo.php --- a/web/lib/Zend/Service/Yahoo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yahoo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Yahoo.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/Image.php --- a/web/lib/Zend/Service/Yahoo/Image.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/Image.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_Image diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/ImageResult.php --- a/web/lib/Zend/Service/Yahoo/ImageResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/ImageResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ImageResult extends Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/ImageResultSet.php --- a/web/lib/Zend/Service/Yahoo/ImageResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/ImageResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ImageResultSet extends Zend_Service_Yahoo_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/InlinkDataResult.php --- a/web/lib/Zend/Service/Yahoo/InlinkDataResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/InlinkDataResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InlinkDataResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InlinkDataResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_InlinkDataResult extends Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/InlinkDataResultSet.php --- a/web/lib/Zend/Service/Yahoo/InlinkDataResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/InlinkDataResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InlinkDataResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InlinkDataResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_InlinkDataResultSet extends Zend_Service_Yahoo_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/LocalResult.php --- a/web/lib/Zend/Service/Yahoo/LocalResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/LocalResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocalResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_LocalResult extends Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/LocalResultSet.php --- a/web/lib/Zend/Service/Yahoo/LocalResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/LocalResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocalResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_LocalResultSet extends Zend_Service_Yahoo_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/NewsResult.php --- a/web/lib/Zend/Service/Yahoo/NewsResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/NewsResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewsResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NewsResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_NewsResult extends Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/NewsResultSet.php --- a/web/lib/Zend/Service/Yahoo/NewsResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/NewsResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NewsResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_NewsResultSet extends Zend_Service_Yahoo_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/PageDataResult.php --- a/web/lib/Zend/Service/Yahoo/PageDataResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/PageDataResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PageDataResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PageDataResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_PageDataResult extends Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/PageDataResultSet.php --- a/web/lib/Zend/Service/Yahoo/PageDataResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/PageDataResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PageDataResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PageDataResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_PageDataResultSet extends Zend_Service_Yahoo_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/Result.php --- a/web/lib/Zend/Service/Yahoo/Result.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/Result.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/ResultSet.php --- a/web/lib/Zend/Service/Yahoo/ResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/ResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ResultSet implements SeekableIterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/VideoResult.php --- a/web/lib/Zend/Service/Yahoo/VideoResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/VideoResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_VideoResult extends Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/VideoResultSet.php --- a/web/lib/Zend/Service/Yahoo/VideoResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/VideoResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_VideoResultSet extends Zend_Service_Yahoo_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/WebResult.php --- a/web/lib/Zend/Service/Yahoo/WebResult.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/WebResult.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WebResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WebResult.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_WebResult extends Zend_Service_Yahoo_Result diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Service/Yahoo/WebResultSet.php --- a/web/lib/Zend/Service/Yahoo/WebResultSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Service/Yahoo/WebResultSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WebResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WebResultSet.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_WebResultSet extends Zend_Service_Yahoo_ResultSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session.php --- a/web/lib/Zend/Session.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 22587 2010-07-16 20:14:18Z ralph $ + * @version $Id: Session.php 25121 2012-11-13 21:51:23Z matthew $ * @since Preview Release 0.2 */ @@ -43,7 +43,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session extends Zend_Session_Abstract @@ -308,24 +308,13 @@ "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } - if (self::$_sessionStarted && self::$_regenerateIdState <= 0) { + if ( !self::$_sessionStarted ) { + self::$_regenerateIdState = -1; + } else { if (!self::$_unitTestEnabled) { session_regenerate_id(true); } self::$_regenerateIdState = 1; - } else { - /** - * @todo If we can detect that this requester had no session previously, - * then why regenerate the id before the session has started? - * Feedback wanted for: - // - if (isset($_COOKIE[session_name()]) || (!use only cookies && isset($_REQUEST[session_name()]))) { - self::$_regenerateIdState = 1; - } else { - self::$_regenerateIdState = -1; - } - //*/ - self::$_regenerateIdState = -1; } } @@ -335,7 +324,7 @@ * seconds is specified, then this defaults to self::$_rememberMeSeconds. Due to clock errors on end users' systems, * large values are recommended to avoid undesirable expiration of session cookies. * - * @param $seconds integer - OPTIONAL specifies TTL for cookie in seconds from present time + * @param int $seconds OPTIONAL specifies TTL for cookie in seconds from present time * @return void */ public static function rememberMe($seconds = null) @@ -394,9 +383,9 @@ */ public static function sessionExists() { - if (ini_get('session.use_cookies') == '1' && isset($_COOKIE[session_name()])) { + if ((bool)ini_get('session.use_cookies') == true && isset($_COOKIE[session_name()])) { return true; - } elseif (!empty($_REQUEST[session_name()])) { + } elseif ((bool)ini_get('session.use_only_cookies') == false && isset($_REQUEST[session_name()])) { return true; } elseif (self::$_unitTestEnabled) { return true; @@ -426,6 +415,14 @@ */ public static function start($options = false) { + // Check to see if we've been passed an invalid session ID + if ( self::getId() && !self::_checkId(self::getId()) ) { + // Generate a valid, temporary replacement + self::setId(md5(self::getId())); + // Force a regenerate after session is started + self::$_regenerateIdState = -1; + } + if (self::$_sessionStarted && self::$_destroyed) { require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('The session was explicitly destroyed during this request, attempting to re-start is not allowed.'); @@ -510,6 +507,34 @@ self::_processStartupMetadataGlobal(); } + /** + * Perform a hash-bits check on the session ID + * + * @param string $id Session ID + * @return bool + */ + protected static function _checkId($id) + { + $saveHandler = ini_get('session.save_handler'); + if ($saveHandler == 'cluster') { // Zend Server SC, validate only after last dash + $dashPos = strrpos($id, '-'); + if ($dashPos) { + $id = substr($id, $dashPos + 1); + } + } + + $hashBitsPerChar = ini_get('session.hash_bits_per_character'); + if (!$hashBitsPerChar) { + $hashBitsPerChar = 5; // the default value + } + switch($hashBitsPerChar) { + case 4: $pattern = '^[0-9a-f]*$'; break; + case 5: $pattern = '^[0-9a-v]*$'; break; + case 6: $pattern = '^[0-9a-zA-Z-,]*$'; break; + } + return preg_match('#'.$pattern.'#', $id); + } + /** * _processGlobalMetadata() - this method initizes the sessions GLOBAL @@ -572,13 +597,13 @@ } } if (empty($_SESSION['__ZF'][$namespace]['ENVGH'])) { - unset($_SESSION['__ZF'][$namespace]['ENVGH']); + unset($_SESSION['__ZF'][$namespace]['ENVGH']); } } - } - - if (isset($namespace) && empty($_SESSION['__ZF'][$namespace])) { - unset($_SESSION['__ZF'][$namespace]); + + if (isset($namespace) && empty($_SESSION['__ZF'][$namespace])) { + unset($_SESSION['__ZF'][$namespace]); + } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/Abstract.php --- a/web/lib/Zend/Session/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ * @since Preview Release 0.2 */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Session_Abstract @@ -120,7 +120,7 @@ unset(self::$_expiringData[$namespace]); } else { unset($_SESSION[$namespace][$name]); - unset(self::$_expiringData[$namespace]); + unset(self::$_expiringData[$namespace][$name]); } // if we remove the last value, remove namespace. diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/Exception.php --- a/web/lib/Zend/Session/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @since Preview Release 0.2 */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_Exception extends Zend_Exception @@ -55,7 +55,7 @@ */ static public function handleSessionStartError($errno, $errstr, $errfile, $errline, $errcontext) { - self::$sessionStartError = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext; + self::$sessionStartError = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr; } /** @@ -68,7 +68,7 @@ */ static public function handleSilentWriteClose($errno, $errstr, $errfile, $errline, $errcontext) { - self::$sessionStartError .= PHP_EOL . $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext; + self::$sessionStartError .= PHP_EOL . $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/Namespace.php --- a/web/lib/Zend/Session/Namespace.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/Namespace.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Namespace.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Namespace.php 24593 2012-01-05 20:35:02Z matthew $ * @since Preview Release 0.2 */ @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAggregate diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/SaveHandler/DbTable.php --- a/web/lib/Zend/Session/SaveHandler/DbTable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/SaveHandler/DbTable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Session * @subpackage SaveHandler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_SaveHandler_DbTable @@ -386,8 +386,8 @@ */ public function gc($maxlifetime) { - $this->delete($this->getAdapter()->quoteIdentifier($this->_modifiedColumn) . ' + ' - . $this->getAdapter()->quoteIdentifier($this->_lifetimeColumn) . ' < ' + $this->delete($this->getAdapter()->quoteIdentifier($this->_modifiedColumn, true) . ' + ' + . $this->getAdapter()->quoteIdentifier($this->_lifetimeColumn, true) . ' < ' . $this->getAdapter()->quote(time())); return true; @@ -548,7 +548,7 @@ $primaryArray[$primary] = $value; break; case self::PRIMARY_TYPE_WHERECLAUSE: - $primaryArray[] = $this->getAdapter()->quoteIdentifier($primary) . ' = ' + $primaryArray[] = $this->getAdapter()->quoteIdentifier($primary, true) . ' = ' . $this->getAdapter()->quote($value); break; case self::PRIMARY_TYPE_NUM: diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/SaveHandler/Exception.php --- a/web/lib/Zend/Session/SaveHandler/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/SaveHandler/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_SaveHandler_Exception extends Zend_Session_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/SaveHandler/Interface.php --- a/web/lib/Zend/Session/SaveHandler/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/SaveHandler/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ * @since Preview Release 0.2 */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Session * @subpackage SaveHandler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://php.net/session_set_save_handler */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/Validator/Abstract.php --- a/web/lib/Zend/Session/Validator/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/Validator/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ * @since Preview Release 0.2 */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Session * @subpackage Validator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Session_Validator_Abstract implements Zend_Session_Validator_Interface @@ -62,8 +62,10 @@ protected function getValidData() { $validatorName = get_class($this); - - return $_SESSION['__ZF']['VALID'][$validatorName]; + if (isset($_SESSION['__ZF']['VALID'][$validatorName])) { + return $_SESSION['__ZF']['VALID'][$validatorName]; + } + return null; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/Validator/HttpUserAgent.php --- a/web/lib/Zend/Session/Validator/HttpUserAgent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/Validator/HttpUserAgent.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpUserAgent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpUserAgent.php 24593 2012-01-05 20:35:02Z matthew $ * @since Preview Release 0.2 */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Session * @subpackage Validator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_Validator_HttpUserAgent extends Zend_Session_Validator_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Session/Validator/Interface.php --- a/web/lib/Zend/Session/Validator/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Session/Validator/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ * @since Preview Release 0.2 */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Session * @subpackage Validator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Session_Validator_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/AutoDiscover.php --- a/web/lib/Zend/Soap/AutoDiscover.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/AutoDiscover.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage AutoDiscover - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoDiscover.php 23338 2010-11-15 14:59:33Z alexander $ + * @version $Id: AutoDiscover.php 24842 2012-05-31 18:31:28Z rob $ */ /** @@ -268,7 +268,9 @@ */ protected function getRequestUriWithoutParameters() { - if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch + if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { // IIS with Microsoft Rewrite Module + $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL']; + } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch $requestUri = $_SERVER['HTTP_X_REWRITE_URL']; } elseif (isset($_SERVER['REQUEST_URI'])) { $requestUri = $_SERVER['REQUEST_URI']; @@ -378,10 +380,10 @@ /** * Add a function to the WSDL document. * - * @param $function Zend_Server_Reflection_Function_Abstract function to add - * @param $wsdl Zend_Soap_Wsdl WSDL document - * @param $port object wsdl:portType - * @param $binding object wsdl:binding + * @param Zend_Server_Reflection_Function_Abstract $function function to add + * @param Zend_Soap_Wsdl $wsdl WSDL document + * @param object $port wsdl:portType + * @param object $binding wsdl:binding * @return void */ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/AutoDiscover/Exception.php --- a/web/lib/Zend/Soap/AutoDiscover/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/AutoDiscover/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage AutoDiscover - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Client.php --- a/web/lib/Zend/Soap/Client.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 23453 2010-11-28 13:56:14Z ramon $ + * @version $Id: Client.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Client diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Client/Common.php --- a/web/lib/Zend/Soap/Client/Common.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Client/Common.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Common.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Common.php 24593 2012-01-05 20:35:02Z matthew $ */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Client/DotNet.php --- a/web/lib/Zend/Soap/Client/DotNet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Client/DotNet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DotNet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DotNet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Soap_Client */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Client/Exception.php --- a/web/lib/Zend/Soap/Client/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Client/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Soap_Client_Exception extends Zend_Exception {} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Client/Local.php --- a/web/lib/Zend/Soap/Client/Local.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Client/Local.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Local.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Local.php 25033 2012-08-17 19:50:08Z matthew $ */ /** Zend_Soap_Server */ @@ -83,8 +83,14 @@ // Perform request as is ob_start(); $this->_server->handle($request); - $response = ob_get_contents(); - ob_end_clean(); + $response = ob_get_clean(); + + if ($response === null || $response === '') { + $serverResponse = $this->server->getResponse(); + if ($serverResponse !== null) { + $response = $serverResponse; + } + } return $response; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Server.php --- a/web/lib/Zend/Soap/Server.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Server.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,9 +31,9 @@ * @package Zend_Soap * @subpackage Server * @uses Zend_Server_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 22223 2010-05-21 08:06:47Z jan $ + * @version $Id: Server.php 25177 2012-12-22 20:54:18Z rob $ */ class Zend_Soap_Server implements Zend_Server_Interface { @@ -86,7 +86,13 @@ */ protected $_wsdlCache; - + /** + * WS-I compliant + * + * @var boolean + */ + protected $_wsiCompliant; + /** * Registered fault exceptions * @var array @@ -217,6 +223,9 @@ case 'cache_wsdl': $this->setWsdlCache($value); break; + case 'wsi_compliant': + $this->setWsiCompliant($value); + break; default: break; } @@ -253,17 +262,42 @@ $options['uri'] = $this->_uri; } - if(null !== $this->_features) { + if (null !== $this->_features) { $options['features'] = $this->_features; } - if(null !== $this->_wsdlCache) { + if (null !== $this->_wsdlCache) { $options['cache_wsdl'] = $this->_wsdlCache; } + if (null !== $this->_wsiCompliant) { + $options['wsi_compliant'] = $this->_wsiCompliant; + } + return $options; } - + /** + * Set WS-I compliant + * + * @param boolean $value + * @return Zend_Soap_Server + */ + public function setWsiCompliant($value) + { + if (is_bool($value)) { + $this->_wsiCompliant = $value; + } + return $this; + } + /** + * Gt WS-I compliant + * + * @return boolean + */ + public function getWsiCompliant() + { + return $this->_wsiCompliant; + } /** * Set encoding * @@ -595,7 +629,12 @@ throw new Zend_Soap_Server_Exception('An object has already been registered with this soap server instance'); } - $this->_object = $object; + if ($this->_wsiCompliant) { + require_once 'Zend/Soap/Server/Proxy.php'; + $this->_object = new Zend_Soap_Server_Proxy($object); + } else { + $this->_object = $object; + } return $this; } @@ -690,11 +729,21 @@ $xml = $request; } + libxml_disable_entity_loader(true); $dom = new DOMDocument(); if(strlen($xml) == 0 || !$dom->loadXML($xml)) { require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid XML'); } + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/Soap/Server/Exception.php'; + throw new Zend_Soap_Server_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + libxml_disable_entity_loader(false); } $this->_request = $xml; return $this; @@ -768,6 +817,10 @@ if (!empty($this->_class)) { $args = $this->_classArgs; array_unshift($args, $this->_class); + if ($this->_wsiCompliant) { + require_once 'Zend/Soap/Server/Proxy.php'; + array_unshift($args, 'Zend_Soap_Server_Proxy'); + } call_user_func_array(array($server, 'setClass'), $args); } @@ -820,19 +873,19 @@ } catch (Zend_Soap_Server_Exception $e) { $setRequestException = $e; } - + $soap = $this->_getSoap(); + $fault = false; ob_start(); - if($setRequestException instanceof Exception) { - // Send SOAP fault message if we've catched exception - $soap->fault("Sender", $setRequestException->getMessage()); + if ($setRequestException instanceof Exception) { + // Create SOAP fault message if we've caught a request exception + $fault = $this->fault($setRequestException->getMessage(), 'Sender'); } else { try { - $soap->handle($request); + $soap->handle($this->_request); } catch (Exception $e) { $fault = $this->fault($e); - $soap->fault($fault->faultcode, $fault->faultstring); } } $this->_response = ob_get_clean(); @@ -841,6 +894,11 @@ restore_error_handler(); ini_set('display_errors', $displayErrorsOriginalState); + // Send a fault, if we have one + if ($fault) { + $soap->fault($fault->faultcode, $fault->faultstring); + } + if (!$this->_returnResponse) { echo $this->_response; return; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Server/Exception.php --- a/web/lib/Zend/Soap/Server/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Server/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Soap_Server_Exception extends Zend_Exception {} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Server/Proxy.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Soap/Server/Proxy.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,75 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Soap + * @subpackage AutoDiscover + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id:$ + */ + +class Zend_Soap_Server_Proxy +{ + /** + * @var object + */ + protected $_classInstance; + /** + * @var string + */ + protected $_className; + /** + * Constructor + * + * @param object $service + */ + public function __construct($className, $classArgs = array()) + { + $class = new ReflectionClass($className); + $constructor = $class->getConstructor(); + if ($constructor === null) { + $this->_classInstance = $class->newInstance(); + } else { + $this->_classInstance = $class->newInstanceArgs($classArgs); + } + $this->_className = $className; + } + /** + * Proxy for the WS-I compliant call + * + * @param string $name + * @param string $arguments + * @return array + */ + public function __call($name, $arguments) + { + $result = call_user_func_array(array($this->_classInstance, $name), $this->_preProcessArguments($arguments)); + return array("{$name}Result"=>$result); + } + /** + * Pre process arguments + * + * @param mixed $arguments + * @return array + */ + protected function _preProcessArguments($arguments) + { + if (count($arguments) == 1 && is_object($arguments[0])) { + return get_object_vars($arguments[0]); + } else { + return $arguments; + } + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl.php --- a/web/lib/Zend/Soap/Wsdl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Wsdl.php 23342 2010-11-15 15:29:20Z alexander $ + * @version $Id: Wsdl.php 25033 2012-08-17 19:50:08Z matthew $ */ /** @@ -96,13 +96,23 @@ xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:soap-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'></definitions>"; + libxml_disable_entity_loader(true); $this->_dom = new DOMDocument(); if (!$this->_dom->loadXML($wsdl)) { require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Unable to create DomDocument'); } else { + foreach ($this->_dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/Server/Exception.php'; + throw new Zend_Server_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } $this->_wsdl = $this->_dom->documentElement; } + libxml_disable_entity_loader(false); $this->setComplexTypeStrategy($strategy); } @@ -125,8 +135,10 @@ // @todo: This is the worst hack ever, but its needed due to design and non BC issues of WSDL generation $xml = $this->_dom->saveXML(); $xml = str_replace($oldUri, $uri, $xml); + libxml_disable_entity_loader(true); $this->_dom = new DOMDocument(); $this->_dom->loadXML($xml); + libxml_disable_entity_loader(false); } return $this; @@ -543,28 +555,24 @@ case 'string': case 'str': return 'xsd:string'; - break; + case 'long': + return 'xsd:long'; case 'int': case 'integer': return 'xsd:int'; - break; case 'float': + return 'xsd:float'; case 'double': - return 'xsd:float'; - break; + return 'xsd:double'; case 'boolean': case 'bool': return 'xsd:boolean'; - break; case 'array': return 'soap-enc:Array'; - break; case 'object': return 'xsd:struct'; - break; case 'mixed': return 'xsd:anyType'; - break; case 'void': return ''; default: diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Exception.php --- a/web/lib/Zend/Soap/Wsdl/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Exception extends Zend_Exception { } \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Strategy/Abstract.php --- a/web/lib/Zend/Soap/Wsdl/Strategy/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Strategy/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Soap_Wsdl_Strategy_Abstract implements Zend_Soap_Wsdl_Strategy_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Strategy/AnyType.php --- a/web/lib/Zend/Soap/Wsdl/Strategy/AnyType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Strategy/AnyType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AnyType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AnyType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_AnyType implements Zend_Soap_Wsdl_Strategy_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php --- a/web/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayOfTypeComplex.php 21858 2010-04-15 19:58:12Z beberlei $ + * @version $Id: ArrayOfTypeComplex.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy_DefaultComplexType diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php --- a/web/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayOfTypeSequence.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ArrayOfTypeSequence.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence extends Zend_Soap_Wsdl_Strategy_DefaultComplexType diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Strategy/Composite.php --- a/web/lib/Zend/Soap/Wsdl/Strategy/Composite.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Strategy/Composite.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Composite.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Composite.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_Composite implements Zend_Soap_Wsdl_Strategy_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php --- a/web/lib/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultComplexType.php 22674 2010-07-25 19:35:20Z ramon $ + * @version $Id: DefaultComplexType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Soap/Wsdl/Strategy/Interface.php --- a/web/lib/Zend/Soap/Wsdl/Strategy/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Soap/Wsdl/Strategy/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Soap_Wsdl_Strategy_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Stdlib/CallbackHandler.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Stdlib/CallbackHandler.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,301 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** + * CallbackHandler + * + * A handler for a event, event, filterchain, etc. Abstracts PHP callbacks, + * primarily to allow for lazy-loading and ensuring availability of default + * arguments (currying). + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Stdlib_CallbackHandler +{ + /** + * @var string|array PHP callback to invoke + */ + protected $callback; + + /** + * Did an error occur when testing the validity of the callback? + * @var bool + */ + protected $error = false; + + /** + * Callback metadata, if any + * @var array + */ + protected $metadata; + + /** + * Constructor + * + * @param string $event Event to which slot is subscribed + * @param string|array|object $callback PHP callback + * @param array $options Options used by the callback handler (e.g., priority) + * @return void + */ + public function __construct($callback, array $metadata = array()) + { + $this->metadata = $metadata; + $this->registerCallback($callback); + } + + /** + * Error handler + * + * Used by registerCallback() when calling is_callable() to capture engine warnings. + * + * @param int $errno + * @param string $errstr + * @return void + */ + public function errorHandler($errno, $errstr) + { + $this->error = true; + } + + /** + * Registers the callback provided in the constructor + * + * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed, + * this method provides additional behavior. + * + * If a callback is a functor, or an array callback composing an object + * instance, this method will pass the object to a WeakRef instance prior + * to registering the callback. + * + * @param Callable $callback + * @return void + */ + protected function registerCallback($callback) + { + set_error_handler(array($this, 'errorHandler'), E_STRICT); + $callable = is_callable($callback); + restore_error_handler(); + if (!$callable || $this->error) { + require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided; not callable'); + } + + // If pecl/weakref is not installed, simply store the callback and return + if (!class_exists('WeakRef')) { + $this->callback = $callback; + return; + } + + // If WeakRef exists, we want to use it. + + // If we have a non-closure object, pass it to WeakRef, and then + // register it. + if (is_object($callback) && !$callback instanceof Closure) { + $this->callback = new WeakRef($callback); + return; + } + + // If we have a string or closure, register as-is + if (!is_array($callback)) { + $this->callback = $callback; + return; + } + + list($target, $method) = $callback; + + // If we have an array callback, and the first argument is not an + // object, register as-is + if (!is_object($target)) { + $this->callback = $callback; + return; + } + + // We have an array callback with an object as the first argument; + // pass it to WeakRef, and then register the new callback + $target = new WeakRef($target); + $this->callback = array($target, $method); + } + + /** + * Retrieve registered callback + * + * @return Callable + */ + public function getCallback() + { + $callback = $this->callback; + + // String callbacks -- simply return + if (is_string($callback)) { + return $callback; + } + + // WeakRef callbacks -- pull it out of the object and return it + if ($callback instanceof WeakRef) { + return $callback->get(); + } + + // Non-WeakRef object callback -- return it + if (is_object($callback)) { + return $callback; + } + + // Array callback with WeakRef object -- retrieve the object first, and + // then return + list($target, $method) = $callback; + if ($target instanceof WeakRef) { + return array($target->get(), $method); + } + + // Otherwise, return it + return $callback; + } + + /** + * Invoke handler + * + * @param array $args Arguments to pass to callback + * @return mixed + */ + public function call(array $args = array()) + { + $callback = $this->getCallback(); + + $isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>='); + + if ($isPhp54 && is_string($callback)) { + $this->validateStringCallbackFor54($callback); + } + + // Minor performance tweak; use call_user_func() until > 3 arguments + // reached + switch (count($args)) { + case 0: + if ($isPhp54) { + return $callback(); + } + return call_user_func($callback); + case 1: + if ($isPhp54) { + return $callback(array_shift($args)); + } + return call_user_func($callback, array_shift($args)); + case 2: + $arg1 = array_shift($args); + $arg2 = array_shift($args); + if ($isPhp54) { + return $callback($arg1, $arg2); + } + return call_user_func($callback, $arg1, $arg2); + case 3: + $arg1 = array_shift($args); + $arg2 = array_shift($args); + $arg3 = array_shift($args); + if ($isPhp54) { + return $callback($arg1, $arg2, $arg3); + } + return call_user_func($callback, $arg1, $arg2, $arg3); + default: + return call_user_func_array($callback, $args); + } + } + + /** + * Invoke as functor + * + * @return mixed + */ + public function __invoke() + { + return $this->call(func_get_args()); + } + + /** + * Get all callback metadata + * + * @return array + */ + public function getMetadata() + { + return $this->metadata; + } + + /** + * Retrieve a single metadatum + * + * @param string $name + * @return mixed + */ + public function getMetadatum($name) + { + if (array_key_exists($name, $this->metadata)) { + return $this->metadata[$name]; + } + return null; + } + + /** + * Validate a static method call + * + * Validates that a static method call in PHP 5.4 will actually work + * + * @param string $callback + * @return true + * @throws Zend_Stdlib_Exception_InvalidCallbackException if invalid + */ + protected function validateStringCallbackFor54($callback) + { + if (!strstr($callback, '::')) { + return true; + } + + list($class, $method) = explode('::', $callback, 2); + + if (!class_exists($class)) { + require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( + 'Static method call "%s" refers to a class that does not exist', + $callback + )); + } + + $r = new ReflectionClass($class); + if (!$r->hasMethod($method)) { + require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( + 'Static method call "%s" refers to a method that does not exist', + $callback + )); + } + $m = $r->getMethod($method); + if (!$m->isStatic()) { + require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( + 'Static method call "%s" refers to a method that is not static', + $callback + )); + } + + return true; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Stdlib/Exception.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Stdlib/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,31 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +/** + * Marker interface for Stdlib exceptions + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +interface Zend_Stdlib_Exception +{ +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Stdlib/Exception/InvalidCallbackException.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Stdlib/Exception/InvalidCallbackException.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,35 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Stdlib/Exception.php'; + +/** + * Invalid callback exception + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Stdlib_Exception_InvalidCallbackException + extends DomainException + implements Zend_Stdlib_Exception +{ +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Stdlib/PriorityQueue.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Stdlib/PriorityQueue.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,319 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +require_once 'Zend/Stdlib/SplPriorityQueue.php'; + +/** + * Re-usable, serializable priority queue implementation + * + * SplPriorityQueue acts as a heap; on iteration, each item is removed from the + * queue. If you wish to re-use such a queue, you need to clone it first. This + * makes for some interesting issues if you wish to delete items from the queue, + * or, as already stated, iterate over it multiple times. + * + * This class aggregates items for the queue itself, but also composes an + * "inner" iterator in the form of an SplPriorityQueue object for performing + * the actual iteration. + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Stdlib_PriorityQueue implements Countable, IteratorAggregate, Serializable +{ + const EXTR_DATA = 0x00000001; + const EXTR_PRIORITY = 0x00000002; + const EXTR_BOTH = 0x00000003; + + /** + * Inner queue class to use for iteration + * @var string + */ + protected $queueClass = 'Zend_Stdlib_SplPriorityQueue'; + + /** + * Actual items aggregated in the priority queue. Each item is an array + * with keys "data" and "priority". + * @var array + */ + protected $items = array(); + + /** + * Inner queue object + * @var SplPriorityQueue + */ + protected $queue; + + /** + * Insert an item into the queue + * + * Priority defaults to 1 (low priority) if none provided. + * + * @param mixed $data + * @param int $priority + * @return Zend_Stdlib_PriorityQueue + */ + public function insert($data, $priority = 1) + { + $priority = (int) $priority; + $this->items[] = array( + 'data' => $data, + 'priority' => $priority, + ); + $this->getQueue()->insert($data, $priority); + return $this; + } + + /** + * Remove an item from the queue + * + * This is different than {@link extract()}; its purpose is to dequeue an + * item. + * + * This operation is potentially expensive, as it requires + * re-initialization and re-population of the inner queue. + * + * Note: this removes the first item matching the provided item found. If + * the same item has been added multiple times, it will not remove other + * instances. + * + * @param mixed $datum + * @return boolean False if the item was not found, true otherwise. + */ + public function remove($datum) + { + $found = false; + foreach ($this->items as $key => $item) { + if ($item['data'] === $datum) { + $found = true; + break; + } + } + if ($found) { + unset($this->items[$key]); + $this->queue = null; + $queue = $this->getQueue(); + foreach ($this->items as $item) { + $queue->insert($item['data'], $item['priority']); + } + return true; + } + return false; + } + + /** + * Is the queue empty? + * + * @return bool + */ + public function isEmpty() + { + return (0 === $this->count()); + } + + /** + * How many items are in the queue? + * + * @return int + */ + public function count() + { + return count($this->items); + } + + /** + * Peek at the top node in the queue, based on priority. + * + * @return mixed + */ + public function top() + { + return $this->getIterator()->top(); + } + + /** + * Extract a node from the inner queue and sift up + * + * @return mixed + */ + public function extract() + { + return $this->getQueue()->extract(); + } + + /** + * Retrieve the inner iterator + * + * SplPriorityQueue acts as a heap, which typically implies that as items + * are iterated, they are also removed. This does not work for situations + * where the queue may be iterated multiple times. As such, this class + * aggregates the values, and also injects an SplPriorityQueue. This method + * retrieves the inner queue object, and clones it for purposes of + * iteration. + * + * @return SplPriorityQueue + */ + public function getIterator() + { + $queue = $this->getQueue(); + return clone $queue; + } + + /** + * Serialize the data structure + * + * @return string + */ + public function serialize() + { + return serialize($this->items); + } + + /** + * Unserialize a string into a Zend_Stdlib_PriorityQueue object + * + * Serialization format is compatible with {@link Zend_Stdlib_SplPriorityQueue} + * + * @param string $data + * @return void + */ + public function unserialize($data) + { + foreach (unserialize($data) as $item) { + $this->insert($item['data'], $item['priority']); + } + } + + /** + * Serialize to an array + * + * By default, returns only the item data, and in the order registered (not + * sorted). You may provide one of the EXTR_* flags as an argument, allowing + * the ability to return priorities or both data and priority. + * + * @param int $flag + * @return array + */ + public function toArray($flag = self::EXTR_DATA) + { + switch ($flag) { + case self::EXTR_BOTH: + return $this->items; + case self::EXTR_PRIORITY: + return array_map(array($this, 'returnPriority'), $this->items); + case self::EXTR_DATA: + default: + return array_map(array($this, 'returnData'), $this->items); + } + } + + /** + * Specify the internal queue class + * + * Please see {@link getIterator()} for details on the necessity of an + * internal queue class. The class provided should extend SplPriorityQueue. + * + * @param string $class + * @return Zend_Stdlib_PriorityQueue + */ + public function setInternalQueueClass($class) + { + $this->queueClass = (string) $class; + return $this; + } + + /** + * Does the queue contain the given datum? + * + * @param mixed $datum + * @return bool + */ + public function contains($datum) + { + foreach ($this->items as $item) { + if ($item['data'] === $datum) { + return true; + } + } + return false; + } + + /** + * Does the queue have an item with the given priority? + * + * @param int $priority + * @return bool + */ + public function hasPriority($priority) + { + foreach ($this->items as $item) { + if ($item['priority'] === $priority) { + return true; + } + } + return false; + } + + /** + * Get the inner priority queue instance + * + * @return Zend_Stdlib_SplPriorityQueue + */ + protected function getQueue() + { + if (null === $this->queue) { + $this->queue = new $this->queueClass(); + if (!$this->queue instanceof SplPriorityQueue) { + throw new DomainException(sprintf( + 'Zend_Stdlib_PriorityQueue expects an internal queue of type SplPriorityQueue; received "%s"', + get_class($this->queue) + )); + } + } + return $this->queue; + } + + /** + * Return priority from an internal item + * + * Used as a lambda in toArray(). + * + * @param array $item + * @return mixed + */ + public function returnPriority($item) + { + return $item['priority']; + } + + /** + * Return data from an internal item + * + * Used as a lambda in toArray(). + * + * @param array $item + * @return mixed + */ + public function returnData($item) + { + return $item['data']; + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Stdlib/SplPriorityQueue.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Stdlib/SplPriorityQueue.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,499 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ + +if (version_compare(PHP_VERSION, '5.3.0', '<')) { + /** + * SplPriorityQueue + * + * PHP 5.2.X userland implementation of PHP's SplPriorityQueue + */ + class SplPriorityQueue implements Iterator , Countable + { + /** + * Extract data only + */ + const EXTR_DATA = 0x00000001; + + /** + * Extract priority only + */ + const EXTR_PRIORITY = 0x00000002; + + /** + * Extract an array of ('data' => $value, 'priority' => $priority) + */ + const EXTR_BOTH = 0x00000003; + + /** + * Count of items in the queue + * @var int + */ + protected $count = 0; + + /** + * Flag indicating what should be returned when iterating or extracting + * @var int + */ + protected $extractFlags = self::EXTR_DATA; + + /** + * @var bool|array + */ + protected $preparedQueue = false; + + /** + * All items in the queue + * @var array + */ + protected $queue = array(); + + /** + * Constructor + * + * Creates a new, empty queue + * + * @return void + */ + public function __construct() + { + } + + /** + * Compare two priorities + * + * Returns positive integer if $priority1 is greater than $priority2, 0 + * if equal, negative otherwise. + * + * Unused internally, and only included in order to retain the same + * interface as PHP's SplPriorityQueue. + * + * @param mixed $priority1 + * @param mixed $priority2 + * @return int + */ + public function compare($priority1, $priority2) + { + if ($priority1 > $priority2) { + return 1; + } + if ($priority1 == $priority2) { + return 0; + } + + return -1; + } + + /** + * Countable: return number of items composed in the queue + * + * @return int + */ + public function count() + { + return $this->count; + } + + /** + * Iterator: return current item + * + * @return mixed + */ + public function current() + { + if (!$this->preparedQueue) { + $this->rewind(); + } + if (!$this->count) { + throw new OutOfBoundsException('Cannot iterate SplPriorityQueue; no elements present'); + } + +if (!is_array($this->preparedQueue)) { + throw new DomainException(sprintf( + "Queue was prepared, but is empty?\n PreparedQueue: %s\n Internal Queue: %s\n", + var_export($this->preparedQueue, 1), + var_export($this->queue, 1) + )); +} + + $return = array_shift($this->preparedQueue); + $priority = $return['priority']; + $priorityKey = $return['priorityKey']; + $key = $return['key']; + unset($return['key']); + unset($return['priorityKey']); + unset($this->queue[$priorityKey][$key]); + + switch ($this->extractFlags) { + case self::EXTR_DATA: + return $return['data']; + case self::EXTR_PRIORITY: + return $return['priority']; + case self::EXTR_BOTH: + default: + return $return; + }; + } + + /** + * Extract a node from top of the heap and sift up + * + * Returns either the value, the priority, or both, depending on the extract flag. + * + * @return mixed; + */ + public function extract() + { + if (!$this->count) { + return null; + } + + if (!$this->preparedQueue) { + $this->prepareQueue(); + } + + if (empty($this->preparedQueue)) { + return null; + } + + $return = array_shift($this->preparedQueue); + $priority = $return['priority']; + $priorityKey = $return['priorityKey']; + $key = $return['key']; + unset($return['key']); + unset($return['priorityKey']); + unset($this->queue[$priorityKey][$key]); + $this->count--; + + switch ($this->extractFlags) { + case self::EXTR_DATA: + return $return['data']; + case self::EXTR_PRIORITY: + return $return['priority']; + case self::EXTR_BOTH: + default: + return $return; + }; + } + + /** + * Insert a value into the heap, at the specified priority + * + * @param mixed $value + * @param mixed $priority + * @return void + */ + public function insert($value, $priority) + { + if (!is_scalar($priority)) { + $priority = serialize($priority); + } + if (!isset($this->queue[$priority])) { + $this->queue[$priority] = array(); + } + $this->queue[$priority][] = $value; + $this->count++; + $this->preparedQueue = false; + } + + /** + * Is the queue currently empty? + * + * @return bool + */ + public function isEmpty() + { + return (0 == $this->count); + } + + /** + * Iterator: return current key + * + * @return mixed Usually an int or string + */ + public function key() + { + return $this->count; + } + + /** + * Iterator: Move pointer forward + * + * @return void + */ + public function next() + { + $this->count--; + } + + /** + * Recover from corrupted state and allow further actions on the queue + * + * Unimplemented, and only included in order to retain the same interface as PHP's + * SplPriorityQueue. + * + * @return void + */ + public function recoverFromCorruption() + { + } + + /** + * Iterator: Move pointer to first item + * + * @return void + */ + public function rewind() + { + if (!$this->preparedQueue) { + $this->prepareQueue(); + } + } + + /** + * Set the extract flags + * + * Defines what is extracted by SplPriorityQueue::current(), + * SplPriorityQueue::top() and SplPriorityQueue::extract(). + * + * - SplPriorityQueue::EXTR_DATA (0x00000001): Extract the data + * - SplPriorityQueue::EXTR_PRIORITY (0x00000002): Extract the priority + * - SplPriorityQueue::EXTR_BOTH (0x00000003): Extract an array containing both + * + * The default mode is SplPriorityQueue::EXTR_DATA. + * + * @param int $flags + * @return void + */ + public function setExtractFlags($flags) + { + $expected = array( + self::EXTR_DATA => true, + self::EXTR_PRIORITY => true, + self::EXTR_BOTH => true, + ); + if (!isset($expected[$flags])) { + throw new InvalidArgumentException(sprintf('Expected an EXTR_* flag; received %s', $flags)); + } + $this->extractFlags = $flags; + } + + /** + * Return the value or priority (or both) of the top node, depending on + * the extract flag + * + * @return mixed + */ + public function top() + { + $this->sort(); + $keys = array_keys($this->queue); + $key = array_shift($keys); + if (preg_match('/^(a|O):/', $key)) { + $key = unserialize($key); + } + + if ($this->extractFlags == self::EXTR_PRIORITY) { + return $key; + } + + if ($this->extractFlags == self::EXTR_DATA) { + return $this->queue[$key][0]; + } + + return array( + 'data' => $this->queue[$key][0], + 'priority' => $key, + ); + } + + /** + * Iterator: is the current position valid for the queue + * + * @return bool + */ + public function valid() + { + return (bool) $this->count; + } + + /** + * Sort the queue + * + * @return void + */ + protected function sort() + { + krsort($this->queue); + } + + /** + * Prepare the queue for iteration and/or extraction + * + * @return void + */ + protected function prepareQueue() + { + $this->sort(); + $count = $this->count; + $queue = array(); + foreach ($this->queue as $priority => $values) { + $priorityKey = $priority; + if (preg_match('/^(a|O):/', $priority)) { + $priority = unserialize($priority); + } + foreach ($values as $key => $value) { + $queue[$count] = array( + 'data' => $value, + 'priority' => $priority, + 'priorityKey' => $priorityKey, + 'key' => $key, + ); + $count--; + } + } + $this->preparedQueue = $queue; + } + } +} + +/** + * Serializable version of SplPriorityQueue + * + * Also, provides predictable heap order for datums added with the same priority + * (i.e., they will be emitted in the same order they are enqueued). + * + * @category Zend + * @package Zend_Stdlib + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Stdlib_SplPriorityQueue extends SplPriorityQueue implements Serializable +{ + /** + * @var int Seed used to ensure queue order for items of the same priority + */ + protected $serial = PHP_INT_MAX; + + /** + * @var bool + */ + protected $isPhp53; + + /** + * Constructor + * + * @return void + */ + public function __construct() + { + $this->isPhp53 = version_compare(PHP_VERSION, '5.3', '>='); + } + + /** + * Insert a value with a given priority + * + * Utilizes {@var $serial} to ensure that values of equal priority are + * emitted in the same order in which they are inserted. + * + * @param mixed $datum + * @param mixed $priority + * @return void + */ + public function insert($datum, $priority) + { + // If using the native PHP SplPriorityQueue implementation, we need to + // hack around it to ensure that items registered at the same priority + // return in the order registered. In the userland version, this is not + // necessary. + if ($this->isPhp53) { + if (!is_array($priority)) { + $priority = array($priority, $this->serial--); + } + } + parent::insert($datum, $priority); + } + + /** + * Serialize to an array + * + * Array will be priority => data pairs + * + * @return array + */ + public function toArray() + { + $this->setExtractFlags(self::EXTR_BOTH); + $array = array(); + while ($this->valid()) { + $array[] = $this->current(); + $this->next(); + } + $this->setExtractFlags(self::EXTR_DATA); + + // Iterating through a priority queue removes items + foreach ($array as $item) { + $this->insert($item['data'], $item['priority']); + } + + // Return only the data + $return = array(); + foreach ($array as $item) { + $return[] = $item['data']; + } + + return $return; + } + + /** + * Serialize + * + * @return string + */ + public function serialize() + { + $data = array(); + $this->setExtractFlags(self::EXTR_BOTH); + while ($this->valid()) { + $data[] = $this->current(); + $this->next(); + } + $this->setExtractFlags(self::EXTR_DATA); + + // Iterating through a priority queue removes items + foreach ($data as $item) { + $this->insert($item['data'], $item['priority']); + } + + return serialize($data); + } + + /** + * Deserialize + * + * @param string $data + * @return void + */ + public function unserialize($data) + { + foreach (unserialize($data) as $item) { + $this->insert($item['data'], $item['priority']); + } + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Cloud.php --- a/web/lib/Zend/Tag/Cloud.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Cloud.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cloud.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cloud.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Cloud/Decorator/Cloud.php --- a/web/lib/Zend/Tag/Cloud/Decorator/Cloud.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Cloud/Decorator/Cloud.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cloud.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cloud.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tag_Cloud_Decorator_Cloud diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Cloud/Decorator/Exception.php --- a/web/lib/Zend/Tag/Cloud/Decorator/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Cloud/Decorator/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Cloud_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Decorator_Exception extends Zend_Tag_Cloud_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Cloud/Decorator/HtmlCloud.php --- a/web/lib/Zend/Tag/Cloud/Decorator/HtmlCloud.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Cloud/Decorator/HtmlCloud.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlCloud.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: HtmlCloud.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Cloud_Decorator_Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Decorator_HtmlCloud extends Zend_Tag_Cloud_Decorator_Cloud diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Cloud/Decorator/HtmlTag.php --- a/web/lib/Zend/Tag/Cloud/Decorator/HtmlTag.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Cloud/Decorator/HtmlTag.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlTag.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: HtmlTag.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Cloud_Decorator_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Decorator_HtmlTag extends Zend_Tag_Cloud_Decorator_Tag diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Cloud/Decorator/Tag.php --- a/web/lib/Zend/Tag/Cloud/Decorator/Tag.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Cloud/Decorator/Tag.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tag.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tag_Cloud_Decorator_Tag diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Cloud/Exception.php --- a/web/lib/Zend/Tag/Cloud/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Cloud/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Exception extends Zend_Tag_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Exception.php --- a/web/lib/Zend/Tag/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Item.php --- a/web/lib/Zend/Tag/Item.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Item.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Item - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Item.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Item.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Taggable - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Item implements Zend_Tag_Taggable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/ItemList.php --- a/web/lib/Zend/Tag/ItemList.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/ItemList.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage ItemList - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemList.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_ItemList implements Countable, SeekableIterator, ArrayAccess diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tag/Taggable.php --- a/web/lib/Zend/Tag/Taggable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tag/Taggable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tag * @subpackage Item - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Taggable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Taggable.php 25024 2012-07-30 15:08:15Z rob $ */ /** * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tag_Taggable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/DbAdapter.php --- a/web/lib/Zend/Test/DbAdapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/DbAdapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbAdapter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbAdapter.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_DbAdapter extends Zend_Db_Adapter_Abstract @@ -73,7 +73,7 @@ /** * @var string - */ + */ protected $_quoteIdentifierSymbol = ''; /** @@ -112,7 +112,7 @@ /** * @var string - */ + */ public function setQuoteIdentifierSymbol($symbol) { $this->_quoteIdentifierSymbol = $symbol; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/DbStatement.php --- a/web/lib/Zend/Test/DbStatement.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/DbStatement.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbStatement.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbStatement.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_DbStatement implements Zend_Db_Statement_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Constraint/DomQuery.php --- a/web/lib/Zend/Test/PHPUnit/Constraint/DomQuery.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Constraint/DomQuery.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DomQuery.php 22561 2010-07-15 17:49:16Z dragonbe $ + * @version $Id: DomQuery.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see PHPUnit_Framework_Constraint */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Constraint/Exception.php --- a/web/lib/Zend/Test/PHPUnit/Constraint/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Constraint/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see PHPUnit_Framework_ExpectationFailedException */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_Exception extends PHPUnit_Framework_ExpectationFailedException diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Constraint/Redirect.php --- a/web/lib/Zend/Test/PHPUnit/Constraint/Redirect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Constraint/Redirect.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Redirect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Redirect.php 25002 2012-06-26 14:38:28Z adamlundrigan $ */ /** @see PHPUnit_Framework_Constraint */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint @@ -64,6 +64,11 @@ * @var string */ protected $_match = null; + + /** + * What is actual redirect + */ + protected $_actual = null; /** * Whether or not assertion is negated @@ -142,6 +147,12 @@ : $this->_regex($response, $match); case self::ASSERT_REDIRECT: default: + $headers = $response->sendHeaders(); + if (isset($headers['location'])) { + $redirect = $headers['location']; + $redirect = str_replace('Location: ', '', $redirect); + $this->_actual = $redirect; + } return ($this->_negate) ? !$response->isRedirect() : $response->isRedirect(); } } @@ -166,6 +177,9 @@ $failure = 'Failed asserting response DOES NOT redirect to "%s"'; } $failure = sprintf($failure, $this->_match); + if (!$this->_negate && $this->_actual) { + $failure .= sprintf(PHP_EOL . 'It redirects to "%s".', $this->_actual); + } break; case self::ASSERT_REDIRECT_REGEX: $failure = 'Failed asserting response redirects to URL MATCHING "%s"'; @@ -173,12 +187,18 @@ $failure = 'Failed asserting response DOES NOT redirect to URL MATCHING "%s"'; } $failure = sprintf($failure, $this->_match); + if ($this->_actual) { + $failure .= sprintf(PHP_EOL . 'It redirects to "%s".', $this->_actual); + } break; case self::ASSERT_REDIRECT: default: $failure = 'Failed asserting response is a redirect'; if ($this->_negate) { $failure = 'Failed asserting response is NOT a redirect'; + if ($this->_actual) { + $failure .= sprintf(PHP_EOL . 'It redirects to "%s"', $this->_actual); + } } break; } @@ -216,6 +236,7 @@ $headers = $response->sendHeaders(); $redirect = $headers['location']; $redirect = str_replace('Location: ', '', $redirect); + $this->_actual = $redirect; return ($redirect == $match); } @@ -236,6 +257,7 @@ $headers = $response->sendHeaders(); $redirect = $headers['location']; $redirect = str_replace('Location: ', '', $redirect); + $this->_actual = $redirect; return ($redirect != $match); } @@ -256,6 +278,7 @@ $headers = $response->sendHeaders(); $redirect = $headers['location']; $redirect = str_replace('Location: ', '', $redirect); + $this->_actual = $redirect; return preg_match($pattern, $redirect); } @@ -276,6 +299,7 @@ $headers = $response->sendHeaders(); $redirect = $headers['location']; $redirect = str_replace('Location: ', '', $redirect); + $this->_actual = $redirect; return !preg_match($pattern, $redirect); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader.php --- a/web/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResponseHeader.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResponseHeader.php 25205 2013-01-10 11:23:25Z frosch $ */ /** @see PHPUnit_Framework_Constraint */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint @@ -65,6 +65,11 @@ * @var int Response code */ protected $_code = 200; + + /** + * @var int Actual response code + */ + protected $_actualCode = null; /** * @var string Header @@ -197,6 +202,9 @@ $failure = 'Failed asserting response code IS NOT "%s"'; } $failure = sprintf($failure, $this->_code); + if (!$this->_negate && $this->_actualCode) { + $failure .= sprintf(PHP_EOL . 'Was "%s"', $this->_actualCode); + } break; case self::ASSERT_HEADER: $failure = 'Failed asserting response header "%s" found'; @@ -250,6 +258,7 @@ protected function _code(Zend_Controller_Response_Abstract $response, $code) { $test = $this->_getCode($response); + $this->_actualCode = $test; return ($test == $code); } @@ -338,7 +347,7 @@ $contents = str_replace($header . ': ', '', $fullHeader); - return (strstr($contents, $match)); + return (strstr($contents, $match) !== false); } /** @@ -357,7 +366,7 @@ $contents = str_replace($header . ': ', '', $fullHeader); - return (!strstr($contents, $match)); + return (strstr($contents, $match) === false); } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/ControllerTestCase.php --- a/web/lib/Zend/Test/PHPUnit/ControllerTestCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/ControllerTestCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,17 +14,20 @@ * * @category Zend * @package Zend_Test - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ControllerTestCase.php 22291 2010-05-25 15:52:09Z bradley.holt $ + * @version $Id: ControllerTestCase.php 24593 2012-01-05 20:35:02Z matthew $ */ -/** @see PHPUnit_Framework_TestCase */ -require_once 'PHPUnit/Framework/TestCase.php'; - /** @see PHPUnit_Runner_Version */ require_once 'PHPUnit/Runner/Version.php'; +/** + * Depending on version, include the proper PHPUnit support + * @see PHPUnit_Autoload + */ +require_once (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '>=')) ? 'PHPUnit/Autoload.php' : 'PHPUnit/Framework.php'; + /** @see Zend_Controller_Front */ require_once 'Zend/Controller/Front.php'; @@ -47,7 +50,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_TestCase @@ -1117,7 +1120,7 @@ /** * Retrieve test case request object * - * @return Zend_Controller_Request_Abstract + * @return Zend_Controller_Request_HttpTestCase */ public function getRequest() { @@ -1131,7 +1134,7 @@ /** * Retrieve test case response object * - * @return Zend_Controller_Response_Abstract + * @return Zend_Controller_Response_HttpTestCase */ public function getResponse() { @@ -1155,6 +1158,38 @@ } return $this->_query; } + + /** + * URL Helper + * + * @param array $urlOptions + * @param string $name + * @param bool $reset + * @param bool $encode + */ + public function url($urlOptions = array(), $name = null, $reset = false, $encode = true) + { + $frontController = $this->getFrontController(); + $router = $frontController->getRouter(); + if (!$router instanceof Zend_Controller_Router_Rewrite) { + throw new Exception('This url helper utility function only works when the router is of type Zend_Controller_Router_Rewrite'); + } + if (count($router->getRoutes()) == 0) { + $router->addDefaultRoutes(); + } + return $router->assemble($urlOptions, $name, $reset, $encode); + } + + public function urlizeOptions($urlOptions, $actionControllerModuleOnly = true) + { + $ccToDash = new Zend_Filter_Word_CamelCaseToDash(); + foreach ($urlOptions as $n => $v) { + if (in_array($n, array('action', 'controller', 'module'))) { + $urlOptions[$n] = $ccToDash->filter($v); + } + } + return $urlOptions; + } /** * Increment assertion count diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/DatabaseTestCase.php --- a/web/lib/Zend/Test/PHPUnit/DatabaseTestCase.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/DatabaseTestCase.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DatabaseTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DatabaseTestCase.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Test_PHPUnit_DatabaseTestCase extends PHPUnit_Extensions_Database_TestCase diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/Connection.php --- a/web/lib/Zend/Test/PHPUnit/Db/Connection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/Connection.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Connection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Connection.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Connection extends PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php --- a/web/lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbRowset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbRowset.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_DbRowset extends PHPUnit_Extensions_Database_DataSet_AbstractTable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php --- a/web/lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_DbTable extends PHPUnit_Extensions_Database_DataSet_QueryTable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php --- a/web/lib/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableDataSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTableDataSet.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once "PHPUnit/Extensions/Database/DataSet/QueryDataSet.php"; @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet extends PHPUnit_Extensions_Database_DataSet_AbstractDataSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php --- a/web/lib/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryDataSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryDataSet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_QueryDataSet extends PHPUnit_Extensions_Database_DataSet_QueryDataSet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php --- a/web/lib/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryTable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_QueryTable extends PHPUnit_Extensions_Database_DataSet_QueryTable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/Exception.php --- a/web/lib/Zend/Test/PHPUnit/Db/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php --- a/web/lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Generic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Generic.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Metadata_Generic implements PHPUnit_Extensions_Database_DB_IMetaData diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php --- a/web/lib/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DeleteAll.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DeleteAll.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -52,7 +52,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Operation_DeleteAll implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/Operation/Insert.php --- a/web/lib/Zend/Test/PHPUnit/Db/Operation/Insert.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/Operation/Insert.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Insert.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Insert.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -52,7 +52,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Operation_Insert implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/Operation/Truncate.php --- a/web/lib/Zend/Test/PHPUnit/Db/Operation/Truncate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/Operation/Truncate.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Truncate.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Truncate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -52,7 +52,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Operation_Truncate implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation @@ -89,7 +89,7 @@ */ protected function _truncate(Zend_Db_Adapter_Abstract $db, $tableName) { - $tableName = $db->quoteIdentifier($tableName); + $tableName = $db->quoteIdentifier($tableName, true); if($db instanceof Zend_Db_Adapter_Pdo_Sqlite) { $db->query('DELETE FROM '.$tableName); } else if($db instanceof Zend_Db_Adapter_Db2) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Db/SimpleTester.php --- a/web/lib/Zend/Test/PHPUnit/Db/SimpleTester.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Db/SimpleTester.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimpleTester.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimpleTester.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_SimpleTester extends PHPUnit_Extensions_Database_DefaultTester diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Exception.php --- a/web/lib/Zend/Text/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Figlet.php --- a/web/lib/Zend/Text/Figlet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Figlet.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Figlet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Figlet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Figlet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Figlet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Figlet diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Figlet/Exception.php --- a/web/lib/Zend/Text/Figlet/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Figlet/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Figlet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Figlet * @uses Zend_Text_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Figlet_Exception extends Zend_Text_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Figlet/zend-framework.flf --- a/web/lib/Zend/Text/Figlet/zend-framework.flf Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Figlet/zend-framework.flf Sun Apr 21 21:54:24 2013 +0200 @@ -17,7 +17,7 @@ obtain it through the world-wide-web, please send an email to license@zend.com so we can send you a copy immediately. - Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) ------------------------------------------------------------------------------- diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/MultiByte.php --- a/web/lib/Zend/Text/MultiByte.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/MultiByte.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiByte.php 21931 2010-04-18 15:25:32Z dasprid $ + * @version $Id: MultiByte.php 24762 2012-05-06 00:06:46Z adamlundrigan $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_MultiByte @@ -39,78 +39,56 @@ * @param string $charset * @return string */ - public static function wordWrap($string, $width = 75, $break = "\n", $cut = false, $charset = 'UTF-8') + public static function wordWrap($string, $width = 75, $break = "\n", $cut = false, $charset = 'utf-8') { - $result = array(); - $breakWidth = iconv_strlen($break, $charset); - - while (($stringLength = iconv_strlen($string, $charset)) > 0) { - $breakPos = iconv_strpos($string, $break, 0, $charset); - - if ($breakPos !== false && $breakPos < $width) { - if ($breakPos === $stringLength - $breakWidth) { - $subString = $string; - $cutLength = null; - } else { - $subString = iconv_substr($string, 0, $breakPos, $charset); - $cutLength = $breakPos + $breakWidth; - } + $stringWidth = iconv_strlen($string, $charset); + $breakWidth = iconv_strlen($break, $charset); + + if (strlen($string) === 0) { + return ''; + } elseif ($breakWidth === null) { + throw new Zend_Text_Exception('Break string cannot be empty'); + } elseif ($width === 0 && $cut) { + throw new Zend_Text_Exception('Can\'t force cut when width is zero'); + } + + $result = ''; + $lastStart = $lastSpace = 0; + + for ($current = 0; $current < $stringWidth; $current++) { + $char = iconv_substr($string, $current, 1, $charset); + + if ($breakWidth === 1) { + $possibleBreak = $char; } else { - $subString = iconv_substr($string, 0, $width, $charset); - - if ($subString === $string) { - $cutLength = null; - } else { - $nextChar = iconv_substr($string, $width, 1, $charset); - - if ($breakWidth === 1) { - $nextBreak = $nextChar; - } else { - $nextBreak = iconv_substr($string, $breakWidth, 1, $charset); - } - - if ($nextChar === ' ' || $nextBreak === $break) { - $afterNextChar = iconv_substr($string, $width + 1, 1, $charset); - - if ($afterNextChar === false) { - $subString .= $nextChar; - } - - $cutLength = iconv_strlen($subString, $charset) + 1; - } else { - $spacePos = iconv_strrpos($subString, ' ', $charset); - - if ($spacePos !== false) { - $subString = iconv_substr($subString, 0, $spacePos, $charset); - $cutLength = $spacePos + 1; - } else if ($cut === false) { - $spacePos = iconv_strpos($string, ' ', 0, $charset); - - if ($spacePos !== false) { - $subString = iconv_substr($string, 0, $spacePos, $charset); - $cutLength = $spacePos + 1; - } else { - $subString = $string; - $cutLength = null; - } - } else { - $subString = iconv_substr($subString, 0, $width, $charset); - $cutLength = $width; - } - } + $possibleBreak = iconv_substr($string, $current, $breakWidth, $charset); + } + + if ($possibleBreak === $break) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart + $breakWidth, $charset); + $current += $breakWidth - 1; + $lastStart = $lastSpace = $current + 1; + } elseif ($char === ' ') { + if ($current - $lastStart >= $width) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break; + $lastStart = $current + 1; } - } - - $result[] = $subString; - - if ($cutLength !== null) { - $string = iconv_substr($string, $cutLength, ($stringLength - $cutLength), $charset); - } else { - break; + + $lastSpace = $current; + } elseif ($current - $lastStart >= $width && $cut && $lastStart >= $lastSpace) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break; + $lastStart = $lastSpace = $current; + } elseif ($current - $lastStart >= $width && $lastStart < $lastSpace) { + $result .= iconv_substr($string, $lastStart, $lastSpace - $lastStart, $charset) . $break; + $lastStart = $lastSpace = $lastSpace + 1; } } - - return implode($break, $result); + + if ($lastStart !== $current) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset); + } + + return $result; } /** @@ -123,13 +101,13 @@ * @param string $charset * @return string */ - public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'UTF-8') + public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'utf-8') { $return = ''; $lengthOfPadding = $padLength - iconv_strlen($input, $charset); $padStringLength = iconv_strlen($padString, $charset); - if ($padStringLength === 0 || $lengthOfPadding === 0) { + if ($padStringLength === 0 || $lengthOfPadding <= 0) { $return = $input; } else { $repeatCount = floor($lengthOfPadding / $padStringLength); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Table.php --- a/web/lib/Zend/Text/Table.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Table.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Table.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table @@ -341,6 +341,7 @@ } require_once 'Zend/Text/Table/Row.php'; + require_once 'Zend/Text/Table/Column.php'; $data = $row; $row = new Zend_Text_Table_Row(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Table/Column.php --- a/web/lib/Zend/Text/Table/Column.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Table/Column.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Column.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Column.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Column diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Table/Decorator/Ascii.php --- a/web/lib/Zend/Text/Table/Decorator/Ascii.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Table/Decorator/Ascii.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ascii.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ascii.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Table * @uses Zend_Text_Table_Decorator_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Decorator_Ascii implements Zend_Text_Table_Decorator_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Table/Decorator/Interface.php --- a/web/lib/Zend/Text/Table/Decorator/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Table/Decorator/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Text_Table_Decorator_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Table/Decorator/Unicode.php --- a/web/lib/Zend/Text/Table/Decorator/Unicode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Table/Decorator/Unicode.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Unicode.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Unicode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Table * @uses Zend_Text_Table_Decorator_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Decorator_Unicode implements Zend_Text_Table_Decorator_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Table/Exception.php --- a/web/lib/Zend/Text/Table/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Table/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Table * @uses Zend_Text_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Exception extends Zend_Text_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Text/Table/Row.php --- a/web/lib/Zend/Text/Table/Row.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Text/Table/Row.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Row.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Row.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Row @@ -197,11 +197,11 @@ for ($line = 0; $line < $maxHeight; $line++) { $result .= $decorator->getVertical(); - foreach ($renderedColumns as $renderedColumn) { + foreach ($renderedColumns as $index => $renderedColumn) { if (isset($renderedColumn[$line]) === true) { $result .= $renderedColumn[$line]; } else { - $result .= str_repeat(' ', strlen($renderedColumn[0])); + $result .= str_repeat(' ', $this->_columnWidths[$index]); } $result .= $decorator->getVertical(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/TimeSync.php --- a/web/lib/Zend/TimeSync.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/TimeSync.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: TimeSync.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: TimeSync.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync implements IteratorAggregate @@ -233,7 +233,7 @@ * facade and will try to return the date from the first server that * returns a valid result. * - * @param $locale - OPTIONAL locale + * @param Zend_Locale $locale - OPTIONAL locale * @return object * @throws Zend_TimeSync_Exception */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/TimeSync/Exception.php --- a/web/lib/Zend/TimeSync/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/TimeSync/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/TimeSync/Ntp.php --- a/web/lib/Zend/TimeSync/Ntp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/TimeSync/Ntp.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ntp.php 21480 2010-03-13 22:09:26Z thomas $ + * @version $Id: Ntp.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync_Ntp extends Zend_TimeSync_Protocol diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/TimeSync/Protocol.php --- a/web/lib/Zend/TimeSync/Protocol.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/TimeSync/Protocol.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Protocol.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Protocol.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_TimeSync_Protocol diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/TimeSync/Sntp.php --- a/web/lib/Zend/TimeSync/Sntp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/TimeSync/Sntp.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sntp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sntp.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync_Sntp extends Zend_TimeSync_Protocol diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Action/Base.php --- a/web/lib/Zend/Tool/Framework/Action/Base.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Action/Base.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Action_Base implements Zend_Tool_Framework_Action_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Action/Exception.php --- a/web/lib/Zend/Tool/Framework/Action/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Action/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Action_Exception extends Zend_Tool_Framework_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Action/Interface.php --- a/web/lib/Zend/Tool/Framework/Action/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Action/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Action_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Action/Repository.php --- a/web/lib/Zend/Tool/Framework/Action/Repository.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Action/Repository.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Repository.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Action_Repository diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Abstract.php --- a/web/lib/Zend/Tool/Framework/Client/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23204 2010-10-21 15:35:21Z ralph $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framework_Registry_EnabledInterface @@ -61,7 +61,7 @@ public function __construct($options = array()) { - // require autoloader + // require autoloader Zend_Loader_Autoloader::getInstance(); // this might look goofy, but this is setting up the @@ -70,7 +70,7 @@ $registry->setClient($this); // NOTE: at this moment, $this->_registry should contain the registry object - + if ($options) { $this->setOptions($options); } @@ -110,7 +110,7 @@ $manifest = $this->_registry->getManifestRepository(); $manifest->addManifest(new Zend_Tool_Framework_Client_Manifest()); - + // setup the debug log if (!$this->_debugLogger instanceof Zend_Log) { require_once 'Zend/Log.php'; @@ -177,10 +177,10 @@ $this->_registry = $registry; return $this; } - + /** * getRegistry(); - * + * * @return Zend_Tool_Framework_Registry_Interface */ public function getRegistry() @@ -317,7 +317,7 @@ $this->_handleDispatchExecution($provider, $methodName, $callParameters); } - + protected function _handleDispatchExecution($class, $methodName, $callParameters) { if (method_exists($class, $methodName)) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Config.php --- a/web/lib/Zend/Tool/Framework/Client/Config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Config.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Config.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Config @@ -72,13 +72,13 @@ $this->_configFilepath = $configFilepath; $this->loadConfig($configFilepath); - + return $this; } /** * Load the configuration from the given path. - * + * * @param string $configFilepath */ protected function loadConfig($configFilepath) @@ -108,7 +108,7 @@ /** * Return the filepath of the configuration. - * + * * @return string */ public function getConfigFilepath() @@ -118,7 +118,7 @@ /** * Get a configuration value. - * + * * @param string $name * @param string $defaultValue * @return mixed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console.php --- a/web/lib/Zend/Tool/Framework/Client/Console.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Console.php 23204 2010-10-21 15:35:21Z ralph $ + * @version $Id: Console.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,8 +40,10 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @todo methods need more API documentation. */ class Zend_Tool_Framework_Client_Console extends Zend_Tool_Framework_Client_Abstract @@ -73,7 +75,7 @@ * @var array */ protected $_classesToLoad = array(); - + /** * main() - This is typically called from zf.php. This method is a * self contained main() function. @@ -94,11 +96,11 @@ { return 'console'; } - + /** * setConfigOptions() - * - * @param $configOptions + * + * @param array $configOptions */ public function setConfigOptions($configOptions) { @@ -108,15 +110,18 @@ /** * setStorageOptions() - * - * @param $storageOptions + * + * @param array $storageOptions */ public function setStorageOptions($storageOptions) { $this->_storageOptions = $storageOptions; return $this; } - + + /** + * @param array $classesToLoad + */ public function setClassesToLoad($classesToLoad) { $this->_classesToLoad = $classesToLoad; @@ -145,10 +150,10 @@ // which classes are essential to initializing Zend_Tool_Framework_Client_Console $classesToLoad = array( - 'Zend_Tool_Framework_Client_Console_Manifest', + 'Zend_Tool_Framework_Client_Console_Manifest', 'Zend_Tool_Framework_System_Manifest' ); - + if ($this->_classesToLoad) { if (is_string($this->_classesToLoad)) { $classesToLoad[] = $this->_classesToLoad; @@ -156,7 +161,7 @@ $classesToLoad = array_merge($classesToLoad, $this->_classesToLoad); } } - + // add classes to the basic loader from the config file basicloader.classes.1 .. if (isset($config->basicloader) && isset($config->basicloader->classes)) { foreach ($config->basicloader->classes as $classKey => $className) { @@ -186,7 +191,7 @@ if (function_exists('posix_isatty')) { $response->addContentDecorator(new Zend_Tool_Framework_Client_Console_ResponseDecorator_Colorizer()); } - + $response->addContentDecorator(new Zend_Tool_Framework_Client_Response_ContentDecorator_Separator()) ->setDefaultDecoratorOptions(array('separator' => true)); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console/ArgumentParser.php --- a/web/lib/Zend/Tool/Framework/Client/Console/ArgumentParser.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console/ArgumentParser.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArgumentParser.php 22877 2010-08-21 19:53:14Z ramon $ + * @version $Id: ArgumentParser.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Framework_Registry_EnabledInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console/HelpSystem.php --- a/web/lib/Zend/Tool/Framework/Client/Console/HelpSystem.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console/HelpSystem.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelpSystem.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelpSystem.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_HelpSystem @@ -271,7 +271,7 @@ $this->_respondWithProviderName($providerMetadata); $providerNameDisplayed = true; } - + if ($includeAllSpecialties || $isSingleSpecialProviderAction) { foreach ($providerSignature->getSpecialties() as $specialtyName) { @@ -303,7 +303,7 @@ } } - + // reset the special flag for single provider action with specialty $isSingleSpecialProviderAction = false; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console/Manifest.php --- a/web/lib/Zend/Tool/Framework/Client/Console/Manifest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console/Manifest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manifest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -54,7 +54,7 @@ * Zend_Tool_Framework_Client_ConsoleClient_Manifest * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_Manifest diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php --- a/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlignCenter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlignCenter.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_AlignCenter implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php --- a/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Blockize.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Blockize.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_Blockize implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php --- a/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Colorizer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Colorizer.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_Colorizer diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php --- a/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Indention.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Indention.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php"; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_Indention diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Exception.php --- a/web/lib/Zend/Tool/Framework/Client/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Exception extends Zend_Tool_Framework_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Interactive/InputHandler.php --- a/web/lib/Zend/Tool/Framework/Client/Interactive/InputHandler.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Interactive/InputHandler.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputHandler.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputHandler.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Interactive_InputHandler diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Interactive/InputInterface.php --- a/web/lib/Zend/Tool/Framework/Client/Interactive/InputInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Interactive/InputInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Interactive_InputInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Interactive/InputRequest.php --- a/web/lib/Zend/Tool/Framework/Client/Interactive/InputRequest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Interactive/InputRequest.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputRequest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputRequest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Interactive_InputRequest diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Interactive/InputResponse.php --- a/web/lib/Zend/Tool/Framework/Client/Interactive/InputResponse.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Interactive/InputResponse.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputResponse.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputResponse.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Interactive_InputResponse diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Interactive/OutputInterface.php --- a/web/lib/Zend/Tool/Framework/Client/Interactive/OutputInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Interactive/OutputInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OutputInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OutputInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Interactive_OutputInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Manifest.php --- a/web/lib/Zend/Tool/Framework/Client/Manifest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Manifest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Manifest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -54,7 +54,7 @@ * Zend_Tool_Framework_Client_ConsoleClient_Manifest * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Manifest @@ -140,7 +140,7 @@ if ($specialty == '_Global') { continue; } - + $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array( 'name' => 'normalizedSpecialtyName', 'value' => $lowerFilter->filter($specialty), diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Request.php --- a/web/lib/Zend/Tool/Framework/Client/Request.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Request.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Request.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Request diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Response.php --- a/web/lib/Zend/Tool/Framework/Client/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Response diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php --- a/web/lib/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Response_ContentDecorator_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php --- a/web/lib/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Separator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Separator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Response_ContentDecorator_Separator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Storage.php --- a/web/lib/Zend/Tool/Framework/Client/Storage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Storage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Storage diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Storage/AdapterInterface.php --- a/web/lib/Zend/Tool/Framework/Client/Storage/AdapterInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Storage/AdapterInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AdapterInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Storage_AdapterInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Client/Storage/Directory.php --- a/web/lib/Zend/Tool/Framework/Client/Storage/Directory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Client/Storage/Directory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Directory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Storage_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Exception.php --- a/web/lib/Zend/Tool/Framework/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Loader/Abstract.php --- a/web/lib/Zend/Tool/Framework/Loader/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Loader/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,10 +33,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -abstract class Zend_Tool_Framework_Loader_Abstract +abstract class Zend_Tool_Framework_Loader_Abstract implements Zend_Tool_Framework_Loader_Interface, Zend_Tool_Framework_Registry_EnabledInterface { /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Loader/BasicLoader.php --- a/web/lib/Zend/Tool/Framework/Loader/BasicLoader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Loader/BasicLoader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BasicLoader.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: BasicLoader.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,10 +40,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Framework_Loader_BasicLoader +class Zend_Tool_Framework_Loader_BasicLoader implements Zend_Tool_Framework_Loader_Interface, Zend_Tool_Framework_Registry_EnabledInterface { /** @@ -55,14 +55,14 @@ * @var array */ protected $_classesToLoad = array(); - + public function __construct($options = array()) { if ($options) { $this->setOptions($options); } } - + public function setOptions(Array $options) { foreach ($options as $optionName => $optionValue) { @@ -72,7 +72,7 @@ } } } - + /** * setRegistry() - required by the enabled interface to get an instance of * the registry @@ -95,17 +95,17 @@ $this->_classesToLoad = $classesToLoad; return $this; } - + public function load() { $manifestRegistry = $this->_registry->getManifestRepository(); $providerRegistry = $this->_registry->getProviderRepository(); - + $loadedClasses = array(); - + // loop through the loaded classes and ensure that foreach ($this->_classesToLoad as $class) { - + if (!class_exists($class)) { Zend_Loader::loadClass($class); } @@ -153,5 +153,5 @@ && !$providerRegistry->hasProvider($reflectionClass->getName(), false) ); } - + } \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Loader/IncludePathLoader.php --- a/web/lib/Zend/Tool/Framework/Loader/IncludePathLoader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Loader/IncludePathLoader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IncludePathLoader.php 20904 2010-02-04 16:18:18Z matthew $ + * @version $Id: IncludePathLoader.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Loader_IncludePathLoader extends Zend_Tool_Framework_Loader_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php --- a/web/lib/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecursiveFilterIterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecursiveFilterIterator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Loader_IncludePathLoader_RecursiveFilterIterator extends RecursiveFilterIterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Loader/Interface.php --- a/web/lib/Zend/Tool/Framework/Loader/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Loader/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 21308 2010-03-03 15:42:27Z elazar $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Loader_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/ActionManifestable.php --- a/web/lib/Zend/Tool/Framework/Manifest/ActionManifestable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Manifest/ActionManifestable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActionManifestable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_ActionManifestable extends Zend_Tool_Framework_Manifest_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/ActionMetadata.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Framework/Manifest/ActionMetadata.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,31 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: ActionMetadata.php 24593 2012-01-05 20:35:02Z matthew $ + */ + +/** + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Framework_Manifest_ActionMetadata +{ + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/Exception.php --- a/web/lib/Zend/Tool/Framework/Manifest/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Manifest/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Manifest_Exception extends Zend_Tool_Framework_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/Indexable.php --- a/web/lib/Zend/Tool/Framework/Manifest/Indexable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Manifest/Indexable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Indexable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Indexable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_Indexable extends Zend_Tool_Framework_Manifest_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/Interface.php --- a/web/lib/Zend/Tool/Framework/Manifest/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Manifest/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/Metadata.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Framework/Manifest/Metadata.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,31 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: Metadata.php 24593 2012-01-05 20:35:02Z matthew $ + */ + +/** + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Framework_Manifest_Metadata +{ + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/MetadataManifestable.php --- a/web/lib/Zend/Tool/Framework/Manifest/MetadataManifestable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Manifest/MetadataManifestable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MetadataManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MetadataManifestable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_MetadataManifestable extends Zend_Tool_Framework_Manifest_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/ProviderManifestable.php --- a/web/lib/Zend/Tool/Framework/Manifest/ProviderManifestable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Manifest/ProviderManifestable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProviderManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProviderManifestable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_ProviderManifestable extends Zend_Tool_Framework_Manifest_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/ProviderMetadata.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Framework/Manifest/ProviderMetadata.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,31 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: ProviderMetadata.php 24593 2012-01-05 20:35:02Z matthew $ + */ + +/** + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Framework_Manifest_ProviderMetadata +{ + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Manifest/Repository.php --- a/web/lib/Zend/Tool/Framework/Manifest/Repository.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Manifest/Repository.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Repository.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Manifest_Repository @@ -100,7 +100,7 @@ if (is_string($provider)) { $provider = new $provider(); } - + if (!$provider instanceof Zend_Tool_Framework_Provider_Interface) { require_once 'Zend/Tool/Framework/Manifest/Exception.php'; throw new Zend_Tool_Framework_Manifest_Exception( @@ -183,7 +183,7 @@ } $metadata = new Zend_Tool_Framework_Metadata_Dynamic($metadata); } - + if (!$metadata instanceof Zend_Tool_Framework_Metadata_Interface) { require_once 'Zend/Tool/Framework/Manifest/Exception.php'; throw new Zend_Tool_Framework_Manifest_Exception( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Metadata/Attributable.php --- a/web/lib/Zend/Tool/Framework/Metadata/Attributable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Metadata/Attributable.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Attributable.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Attributable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Metadata_Attributable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Metadata/Basic.php --- a/web/lib/Zend/Tool/Framework/Metadata/Basic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Metadata/Basic.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Basic.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Basic.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,10 +33,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Framework_Metadata_Basic +class Zend_Tool_Framework_Metadata_Basic implements Zend_Tool_Framework_Metadata_Interface, Zend_Tool_Framework_Metadata_Attributable { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Metadata/Dynamic.php --- a/web/lib/Zend/Tool/Framework/Metadata/Dynamic.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Metadata/Dynamic.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dynamic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dynamic.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,10 +33,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Framework_Metadata_Dynamic +class Zend_Tool_Framework_Metadata_Dynamic implements Zend_Tool_Framework_Metadata_Interface, Zend_Tool_Framework_Metadata_Attributable { @@ -66,7 +66,7 @@ $this->setOptions($options); } } - + public function setOptions(Array $options = array()) { foreach ($options as $optName => $optValue) { @@ -74,11 +74,11 @@ $this->{$methodName}($optValue); } } - + /** * setType() - * - * @param $type + * + * @param string $type * @return Zend_Tool_Framework_Metadata_Dynamic */ public function setType($type) @@ -86,7 +86,7 @@ $this->_type = $type; return $this; } - + /** * getType() * @@ -101,8 +101,8 @@ /** * setName() - * - * @param $name + * + * @param string $name * @return Zend_Tool_Framework_Metadata_Dynamic */ public function setName($name) @@ -110,7 +110,7 @@ $this->_name = $name; return $this; } - + /** * getName() * @@ -125,8 +125,8 @@ /** * setValue() - * - * @param $value + * + * @param mixed $value * @return Zend_Tool_Framework_Metadata_Dynamic */ public function setValue($value) @@ -134,7 +134,7 @@ $this->_value = $value; return $this; } - + /** * getValue() * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Metadata/Interface.php --- a/web/lib/Zend/Tool/Framework/Metadata/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Metadata/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Metadata_Interface @@ -48,5 +48,5 @@ * */ public function getValue(); - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Metadata/Tool.php --- a/web/lib/Zend/Tool/Framework/Metadata/Tool.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Metadata/Tool.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tool.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tool.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Metadata_Tool extends Zend_Tool_Framework_Metadata_Basic diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Abstract.php --- a/web/lib/Zend/Tool/Framework/Provider/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -40,7 +40,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Framework_Provider_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/DocblockManifestable.php --- a/web/lib/Zend/Tool/Framework/Provider/DocblockManifestable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/DocblockManifestable.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocblockManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocblockManifestable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_DocblockManifestInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Exception.php --- a/web/lib/Zend/Tool/Framework/Provider/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Provider_Exception extends Zend_Tool_Framework_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Initializable.php --- a/web/lib/Zend/Tool/Framework/Provider/Initializable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Initializable.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Interactable.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -22,7 +22,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Initializable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Interactable.php --- a/web/lib/Zend/Tool/Framework/Provider/Interactable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Interactable.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interactable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interactable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Interactable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Interface.php --- a/web/lib/Zend/Tool/Framework/Provider/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Pretendable.php --- a/web/lib/Zend/Tool/Framework/Provider/Pretendable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Pretendable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pretendable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pretendable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Pretendable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Repository.php --- a/web/lib/Zend/Tool/Framework/Provider/Repository.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Repository.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: Repository.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Provider_Repository @@ -163,7 +163,7 @@ //foreach ($this->_unprocessedProviders as $providerName => $provider) { reset($this->_unprocessedProviders); while ($this->_unprocessedProviders) { - + $providerName = key($this->_unprocessedProviders); $provider = array_shift($this->_unprocessedProviders); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Provider/Signature.php --- a/web/lib/Zend/Tool/Framework/Provider/Signature.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Provider/Signature.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Signature.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: Signature.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -41,7 +41,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Provider_Signature implements Zend_Tool_Framework_Registry_EnabledInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Registry.php --- a/web/lib/Zend/Tool/Framework/Registry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Registry.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Registry.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Registry/EnabledInterface.php --- a/web/lib/Zend/Tool/Framework/Registry/EnabledInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Registry/EnabledInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EnabledInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EnabledInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Registry_EnabledInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Registry/Exception.php --- a/web/lib/Zend/Tool/Framework/Registry/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Registry/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Tool/Framework/Exception.php'; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Registry_Exception extends Zend_Tool_Framework_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/Registry/Interface.php --- a/web/lib/Zend/Tool/Framework/Registry/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/Registry/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Registry_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/System/Action/Create.php --- a/web/lib/Zend/Tool/Framework/System/Action/Create.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/System/Action/Create.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Create.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Create.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Action_Create extends Zend_Tool_Framework_Action_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/System/Action/Delete.php --- a/web/lib/Zend/Tool/Framework/System/Action/Delete.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/System/Action/Delete.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Delete.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Delete.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Action_Delete extends Zend_Tool_Framework_Action_Base diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/System/Manifest.php --- a/web/lib/Zend/Tool/Framework/System/Manifest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/System/Manifest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manifest.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Tool/Framework/Manifest/ProviderManifestable.php'; @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Manifest diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/System/Provider/Config.php --- a/web/lib/Zend/Tool/Framework/System/Provider/Config.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/System/Provider/Config.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,9 +46,9 @@ * @package Zend_Tool * @package Framework * @uses Zend_Tool_Framework_Provider_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 23206 2010-10-21 15:49:31Z ralph $ + * @version $Id: Config.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Provider_Abstract { @@ -59,11 +59,11 @@ /** * array of specialties handled by this provider - * + * * @var array */ protected $_specialties = array('Manifest', 'Provider'); - + /** * @param string $type */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/System/Provider/Manifest.php --- a/web/lib/Zend/Tool/Framework/System/Provider/Manifest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/System/Provider/Manifest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manifest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Provider_Manifest diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/System/Provider/Phpinfo.php --- a/web/lib/Zend/Tool/Framework/System/Provider/Phpinfo.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/System/Provider/Phpinfo.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phpinfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phpinfo.php 25024 2012-07-30 15:08:15Z rob $ */ require_once 'Zend/Tool/Framework/Provider/Interface.php'; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Provider_Phpinfo implements Zend_Tool_Framework_Provider_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Framework/System/Provider/Version.php --- a/web/lib/Zend/Tool/Framework/System/Provider/Version.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Framework/System/Provider/Version.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Version.php 22763 2010-08-02 02:59:36Z ramon $ + * @version $Id: Version.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Tool/Framework/Registry.php'; @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Provider_Version diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Content/Engine.php --- a/web/lib/Zend/Tool/Project/Context/Content/Engine.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Content/Engine.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Engine.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Engine.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Content_Engine diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php --- a/web/lib/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CodeGenerator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CodeGenerator.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Content_Engine_CodeGenerator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Content/Engine/Phtml.php --- a/web/lib/Zend/Tool/Project/Context/Content/Engine/Phtml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Content/Engine/Phtml.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phtml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phtml.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Content_Engine_Phtml diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Exception.php --- a/web/lib/Zend/Tool/Project/Context/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Tool/Project/Exception.php'; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Exception extends Zend_Tool_Project_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php --- a/web/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Project_Context_Filesystem_Abstract implements Zend_Tool_Project_Context_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Filesystem/Directory.php --- a/web/lib/Zend/Tool/Project/Context/Filesystem/Directory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Filesystem/Directory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Directory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Filesystem_Directory extends Zend_Tool_Project_Context_Filesystem_Abstract @@ -41,14 +41,14 @@ /** * getName() - * + * * @return string */ public function getName() { return 'directory'; } - + /** * create() * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Filesystem/File.php --- a/web/lib/Zend/Tool/Project/Context/Filesystem/File.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Filesystem/File.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20901 2010-02-04 16:06:12Z ralph $ + * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,28 +33,28 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Filesystem_File extends Zend_Tool_Project_Context_Filesystem_Abstract { protected $_fileOnlyContext = null; - + protected $_filesystemName = null; - + protected $_content = null; - + /** * getName() - * + * * @return string */ public function getName() { return 'file'; } - + /** * init() * @@ -65,12 +65,12 @@ if ($this->_resource->hasAttribute('filesystemName')) { $this->_filesystemName = $this->_resource->getAttribute('filesystemName'); } - - // check to see if this file is + + // check to see if this file is if ($this->getName() == 'file') { $this->_initFileOnlyContext(); } - + // @potential-todo check to ensure that this 'file' resource has no children parent::init(); return $this; @@ -89,7 +89,7 @@ } return $returnAttrs; } - + /** * setResource() * @@ -101,10 +101,10 @@ $this->_resource->setAppendable(false); return $this; } - + /** * getResource() - * + * * @return Zend_Tool_Project_Profile_Resource */ public function getResource() @@ -170,5 +170,5 @@ $this->_filesystemName = 'file.txt'; } } - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Interface.php --- a/web/lib/Zend/Tool/Project/Context/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Repository.php --- a/web/lib/Zend/Tool/Project/Context/Repository.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Repository.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Repository.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Tool/Project/Context/System/Interface.php'; @@ -26,7 +26,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Repository implements Countable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/System/Interface.php --- a/web/lib/Zend/Tool/Project/Context/System/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/System/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_System_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/System/NotOverwritable.php --- a/web/lib/Zend/Tool/Project/Context/System/NotOverwritable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/System/NotOverwritable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NotOverwritable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NotOverwritable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_System_NotOverwritable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/System/ProjectDirectory.php --- a/web/lib/Zend/Tool/Project/Context/System/ProjectDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/System/ProjectDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProjectDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -48,7 +48,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_System_ProjectDirectory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/System/ProjectProfileFile.php --- a/web/lib/Zend/Tool/Project/Context/System/ProjectProfileFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/System/ProjectProfileFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProfileFile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: ProjectProfileFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -48,7 +48,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_System_ProjectProfileFile @@ -66,7 +66,7 @@ * @var Zend_Tool_Project_Profile */ protected $_profile = null; - + /** * getName() * @@ -76,7 +76,7 @@ { return 'ProjectProfileFile'; } - + /** * setProfile() * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php --- a/web/lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProvidersDirectory.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: ProjectProvidersDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -43,7 +43,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_System_ProjectProvidersDirectory @@ -66,13 +66,13 @@ { return 'ProjectProvidersDirectory'; } - + public function loadProviders(Zend_Tool_Framework_Registry_Interface $registry) { if (file_exists($this->getPath())) { $providerRepository = $registry->getProviderRepository(); - + foreach (new DirectoryIterator($this->getPath()) as $item) { if ($item->isFile() && (($suffixStart = strpos($item->getFilename(), 'Provider.php')) !== false)) { $className = substr($item->getFilename(), 0, $suffixStart+8); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/System/TopLevelRestrictable.php --- a/web/lib/Zend/Tool/Project/Context/System/TopLevelRestrictable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/System/TopLevelRestrictable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TopLevelRestrictable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TopLevelRestrictable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_System_TopLevelRestrictable diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/AbstractClassFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/AbstractClassFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/AbstractClassFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,12 +15,17 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AbstractClassFile.php 23417 2010-11-20 16:24:35Z ramon $ + * @version $Id: AbstractClassFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** + * Zend_Tool_Project_Context_Filesystem_File + */ +require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; + +/** * This class is the front most class for utilizing Zend_Tool_Project * * A profile is a hierarchical set of resources that keep track of @@ -28,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Project_Context_Zf_AbstractClassFile extends Zend_Tool_Project_Context_Filesystem_File @@ -37,8 +42,8 @@ /** * getFullClassName() * - * @param $localClassName - * @param $classContextName + * @param string $localClassName + * @param string $classContextName */ public function getFullClassName($localClassName, $classContextName = null) { @@ -62,7 +67,8 @@ $prefix = $containingResource->getAttribute('classNamePrefix'); $fullClassName = $prefix; } elseif ($containingResource->getName() == 'ModuleDirectory') { - $prefix = ucfirst($containingResource->getAttribute('moduleName')) . '_'; + $filter = new Zend_Filter_Word_DashToCamelCase(); + $prefix = $filter->filter(ucfirst($containingResource->getAttribute('moduleName'))) . '_'; $fullClassName = $prefix; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ActionMethod.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ActionMethod.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ActionMethod.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionMethod.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActionMethod.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ActionMethod implements Zend_Tool_Project_Context_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ApisDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ApisDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ApisDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ApisDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ApisDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,12 +33,11 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ApisDirectory extends Zend_Tool_Project_Context_Filesystem_Directory { - /** * @var string */ @@ -53,5 +52,4 @@ { return 'ApisDirectory'; } - -} +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ApplicationConfigFile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: ApplicationConfigFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ApplicationConfigFile extends Zend_Tool_Project_Context_Filesystem_File @@ -48,7 +48,7 @@ * @var string */ protected $_content = null; - + /** * getName() * @@ -94,9 +94,9 @@ } else { $this->_content = $this->_getDefaultContents(); } - + } - + return $this->_content; } @@ -104,11 +104,11 @@ { return new Zend_Config_Ini($this->getPath(), $section); } - + /** * addStringItem() - * - * @param string $key + * + * @param string $key * @param string $value * @param string $section * @param bool $quoteValue @@ -120,39 +120,41 @@ if ($quoteValue === null) { $quoteValue = preg_match('#[\"\']#', $value) ? false : true; } - + if ($quoteValue == true) { $value = '"' . $value . '"'; } - + $contentLines = preg_split('#[\n\r]#', $this->getContents()); - + $newLines = array(); $insideSection = false; - + foreach ($contentLines as $contentLineIndex => $contentLine) { - + if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) { $insideSection = true; } - + + $newLines[] = $contentLine; if ($insideSection) { // if its blank, or a section heading - if ((trim($contentLine) == null) || (isset($contentLines[$contentLineIndex + 1]{0}) && $contentLines[$contentLineIndex + 1]{0} == '[')) { + if (isset($contentLines[$contentLineIndex + 1]{0}) && $contentLines[$contentLineIndex + 1]{0} == '[') { + $newLines[] = $key . ' = ' . $value; + $insideSection = null; + } else if (!isset($contentLines[$contentLineIndex + 1])){ $newLines[] = $key . ' = ' . $value; $insideSection = null; } } - - $newLines[] = $contentLine; } $this->_content = implode("\n", $newLines); return $this; } - + /** - * + * * @param array $item * @param string $section * @param bool $quoteValue @@ -163,18 +165,18 @@ $stringItems = array(); $stringValues = array(); $configKeyNames = array(); - + $rii = new RecursiveIteratorIterator( new RecursiveArrayIterator($item), RecursiveIteratorIterator::SELF_FIRST ); - + $lastDepth = 0; - + // loop through array structure recursively to create proper keys foreach ($rii as $name => $value) { $lastDepth = $rii->getDepth(); - + if (is_array($value)) { array_push($configKeyNames, $name); } else { @@ -182,59 +184,59 @@ $stringValues[] = $value; } } - + foreach ($stringItems as $stringItemIndex => $stringItem) { $this->addStringItem($stringItem, $stringValues[$stringItemIndex], $section, $quoteValue); } - + return $this; } - + public function removeStringItem($key, $section = 'production') { $contentLines = file($this->getPath()); - + $newLines = array(); $insideSection = false; - + foreach ($contentLines as $contentLineIndex => $contentLine) { - + if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) { $insideSection = true; } - + if ($insideSection) { // if its blank, or a section heading if ((trim($contentLine) == null) || ($contentLines[$contentLineIndex + 1][0] == '[')) { $insideSection = null; } } - - if (!preg_match('#' . $key . '\s?=.*#', $contentLine)) { + + if (!preg_match('#' . $key . '\s?=.*#', $contentLine)) { $newLines[] = $contentLine; } } $this->_content = implode('', $newLines); } - + public function removeItem($item, $section = 'production') { $stringItems = array(); $stringValues = array(); $configKeyNames = array(); - + $rii = new RecursiveIteratorIterator( new RecursiveArrayIterator($item), RecursiveIteratorIterator::SELF_FIRST ); - + $lastDepth = 0; - + // loop through array structure recursively to create proper keys foreach ($rii as $name => $value) { $lastDepth = $rii->getDepth(); - + if (is_array($value)) { array_push($configKeyNames, $name); } else { @@ -242,14 +244,14 @@ $stringValues[] = $value; } } - + foreach ($stringItems as $stringItemIndex => $stringItem) { $this->removeStringItem($stringItem, $section); } - + return $this; } - + protected function _getDefaultContents() { @@ -279,5 +281,5 @@ return $contents; } - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ApplicationDirectory.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: ApplicationDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ApplicationDirectory extends Zend_Tool_Project_Context_Filesystem_Directory @@ -42,7 +42,7 @@ protected $_filesystemName = 'application'; protected $_classNamePrefix = 'Application_'; - + public function init() { if ($this->_resource->hasAttribute('classNamePrefix')) { @@ -50,7 +50,7 @@ } parent::init(); } - + /** * getPersistentAttributes * @@ -62,17 +62,17 @@ 'classNamePrefix' => $this->getClassNamePrefix() ); } - + public function getName() { return 'ApplicationDirectory'; } - + public function setClassNamePrefix($classNamePrefix) { $this->_classNamePrefix = $classNamePrefix; } - + public function getClassNamePrefix() { return $this->_classNamePrefix; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/BootstrapFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/BootstrapFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/BootstrapFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BootstrapFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_BootstrapFile extends Zend_Tool_Project_Context_Filesystem_File @@ -43,12 +43,12 @@ * @var Zend_Tool_Project_Profile_Resource */ protected $_applicationConfigFile = null; - + /** * @var Zend_Tool_Project_Profile_Resource */ protected $_applicationDirectory = null; - + /** * @var Zend_Application */ @@ -98,7 +98,7 @@ return $codeGenFile->generate(); } - + public function getApplicationInstance() { if ($this->_applicationInstance == null) { @@ -106,14 +106,14 @@ define('APPLICATION_PATH', $this->_applicationDirectory->getPath()); $applicationOptions = array(); $applicationOptions['config'] = $this->_applicationConfigFile->getPath(); - + $this->_applicationInstance = new Zend_Application( 'development', $applicationOptions ); } } - + return $this->_applicationInstance; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/CacheDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/CacheDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/CacheDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CacheDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CacheDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_CacheDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ConfigFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ConfigFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ConfigFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConfigFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ConfigFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ConfigFile extends Zend_Tool_Project_Context_Filesystem_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConfigsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ConfigsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ConfigsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ControllerFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ControllerFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ControllerFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ControllerFile.php 23204 2010-10-21 15:35:21Z ralph $ + * @version $Id: ControllerFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ControllerFile extends Zend_Tool_Project_Context_Filesystem_File @@ -43,7 +43,7 @@ * @var string */ protected $_moduleName = null; - + /** * @var string */ @@ -100,9 +100,11 @@ */ public function getContents() { - $className = ($this->_moduleName) ? ucfirst($this->_moduleName) . '_' : ''; + $filter = new Zend_Filter_Word_DashToCamelCase(); + + $className = ($this->_moduleName) ? $filter->filter(ucfirst($this->_moduleName)) . '_' : ''; $className .= ucfirst($this->_controllerName) . 'Controller'; - + $codeGenFile = new Zend_CodeGenerator_Php_File(array( 'fileName' => $this->getPath(), 'classes' => array( @@ -134,7 +136,7 @@ 'body' => <<<EOS \$errors = \$this->_getParam('error_handler'); -if (!\$errors) { +if (!\$errors || !\$errors instanceof ArrayObject) { \$this->view->message = 'You have reached the error page'; return; } @@ -143,21 +145,23 @@ case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE: case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER: case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION: - // 404 error -- controller or action not found \$this->getResponse()->setHttpResponseCode(404); + \$priority = Zend_Log::NOTICE; \$this->view->message = 'Page not found'; break; default: // application error \$this->getResponse()->setHttpResponseCode(500); + \$priority = Zend_Log::CRIT; \$this->view->message = 'Application error'; break; } // Log exception, if logger available if (\$log = \$this->getLog()) { - \$log->crit(\$this->view->message, \$errors->exception); + \$log->log(\$this->view->message, \$priority, \$errors->exception); + \$log->log('Request Parameters', \$priority, \$errors->request->getParams()); } // conditionally display exceptions diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ControllersDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ControllersDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ControllersDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ControllersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ControllersDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ControllersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/DataDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/DataDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/DataDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DataDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DataDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DataDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/DbTableDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/DbTableDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/DbTableDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTableDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DbTableDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/DbTableFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/DbTableFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/DbTableFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableFile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: DbTableFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,16 +28,16 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DbTableFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile { protected $_dbTableName = null; - + protected $_actualTableName = null; - + /** * getName() * @@ -59,7 +59,7 @@ $this->_filesystemName = ucfirst($this->_dbTableName) . '.php'; parent::init(); } - + public function getPersistentAttributes() { return array('dbTableName' => $this->_dbTableName); @@ -68,7 +68,7 @@ public function getContents() { $className = $this->getFullClassName($this->_dbTableName, 'Model_DbTable'); - + $codeGenFile = new Zend_CodeGenerator_Php_File(array( 'fileName' => $this->getPath(), 'classes' => array( @@ -82,11 +82,11 @@ 'defaultValue' => $this->_actualTableName )) ), - + )) ) )); return $codeGenFile->generate(); } - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/DocsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/DocsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/DocsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: DataDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DocsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory @@ -53,7 +53,7 @@ { return 'DocsDirectory'; } - + public function create(){ parent::create(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/FormFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/FormFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/FormFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormFile.php 23343 2010-11-15 15:33:22Z ramon $ + * @version $Id: FormFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_FormFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/FormsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/FormsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/FormsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_FormsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtaccessFile.php 20897 2010-02-04 06:31:52Z ralph $ + * @version $Id: HtaccessFile.php 25211 2013-01-10 21:10:30Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_HtaccessFile extends Zend_Tool_Project_Context_Filesystem_File @@ -64,11 +64,21 @@ $output = <<<EOS RewriteEngine On +# The following rule tells Apache that if the requested filename +# exists, simply serve it. RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d RewriteRule ^.*$ - [NC,L] -RewriteRule ^.*$ index.php [NC,L] +# The following rewrites all other queries to index.php. The +# condition ensures that if you are using Apache aliases to do +# mass virtual hosting, the base path will be prepended to +# allow proper resolution of the index.php file; it will work +# in non-aliased environments as well, providing a safe, one-size +# fits all solution. +RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$ +RewriteRule ^(.*)$ - [E=BASE:%1] +RewriteRule ^(.*)$ %{ENV:BASE}index.php [NC,L] EOS; return $output; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LayoutScriptFile.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: LayoutScriptFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LayoutScriptFile extends Zend_Tool_Project_Context_Filesystem_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LayoutScriptsDirectory.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: LayoutScriptsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LayoutScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LayoutsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LayoutsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LayoutsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/LibraryDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/LibraryDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/LibraryDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LibraryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LibraryDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/LocalesDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/LocalesDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/LocalesDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocalesDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LocalesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/LogsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/LogsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/LogsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LogsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LogsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LogsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ModelFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ModelFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ModelFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,12 +15,17 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModelFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModelFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** + * Zend_Tool_Project_Context_Zf_AbstractClassFile + */ +require_once 'Zend/Tool/Project/Context/Zf/AbstractClassFile.php'; + +/** * This class is the front most class for utilizing Zend_Tool_Project * * A profile is a hierarchical set of resources that keep track of @@ -28,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModelFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile @@ -38,12 +43,12 @@ * @var string */ protected $_modelName = 'Base'; - + /** * @var string */ protected $_filesystemName = 'modelName'; - + /** * init() * @@ -66,7 +71,7 @@ 'modelName' => $this->getModelName() ); } - + /** * getName() * @@ -81,12 +86,12 @@ { return $this->_modelName; } - + public function getContents() { - + $className = $this->getFullClassName($this->_modelName, 'Model'); - + $codeGenFile = new Zend_CodeGenerator_Php_File(array( 'fileName' => $this->getPath(), 'classes' => array( @@ -97,6 +102,6 @@ )); return $codeGenFile->generate(); } - - + + } \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ModelsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ModelsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ModelsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModelsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModelsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModelsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ModuleDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ModuleDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ModuleDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModuleDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModuleDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModuleDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ModulesDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ModulesDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ModulesDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModulesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModulesDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModulesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProviderFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProjectProviderFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ProjectProviderFile extends Zend_Tool_Project_Context_Filesystem_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/PublicDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/PublicDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/PublicDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicImagesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicImagesDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicImagesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/PublicIndexFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/PublicIndexFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/PublicIndexFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicIndexFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicIndexFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicIndexFile extends Zend_Tool_Project_Context_Filesystem_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicScriptsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicScriptsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicStylesheetsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicStylesheetsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicStylesheetsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchIndexesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchIndexesDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_SearchIndexesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ServicesDirectory.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ServicesDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,55 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: ServicesDirectory.php 24593 2012-01-05 20:35:02Z matthew $ + */ + +/** + * @see Zend_Tool_Project_Context_Filesystem_Directory + */ +require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_ServicesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory +{ + /** + * @var string + */ + protected $_filesystemName = 'services'; + + /** + * Defined by Zend_Tool_Project_Context_Interface + * + * @return string + */ + public function getName() + { + return 'ServicesDirectory'; + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/SessionsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/SessionsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/SessionsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SessionsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SessionsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_SessionsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TemporaryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TemporaryDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TemporaryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,229 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: ActionMethod.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Interface + */ +require_once 'Zend/Tool/Project/Context/Interface.php'; + +/** + * @see Zend_Reflection_File + */ +require_once 'Zend/Reflection/File.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestApplicationActionMethod implements Zend_Tool_Project_Context_Interface +{ + + /** + * @var Zend_Tool_Project_Profile_Resource + */ + protected $_resource = null; + + /** + * @var Zend_Tool_Project_Profile_Resource + */ + protected $_testApplicationControllerResource = null; + + /** + * @var string + */ + protected $_testApplicationControllerPath = ''; + + /** + * @var string + */ + protected $_forActionName = null; + + /** + * init() + * + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function init() + { + $this->_forActionName = $this->_resource->getAttribute('forActionName'); + + $this->_resource->setAppendable(false); + $this->_testApplicationControllerResource = $this->_resource->getParentResource(); + if (!$this->_testApplicationControllerResource->getContext() instanceof Zend_Tool_Project_Context_Zf_TestApplicationControllerFile) { + require_once 'Zend/Tool/Project/Context/Exception.php'; + throw new Zend_Tool_Project_Context_Exception('ActionMethod must be a sub resource of a TestApplicationControllerFile'); + } + // make the ControllerFile node appendable so we can tack on the actionMethod. + $this->_resource->getParentResource()->setAppendable(true); + + $this->_testApplicationControllerPath = $this->_testApplicationControllerResource->getContext()->getPath(); + + return $this; + } + + /** + * getPersistentAttributes + * + * @return array + */ + public function getPersistentAttributes() + { + return array( + 'forActionName' => $this->getForActionName() + ); + } + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestApplicationActionMethod'; + } + + /** + * setResource() + * + * @param Zend_Tool_Project_Profile_Resource $resource + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function setResource(Zend_Tool_Project_Profile_Resource $resource) + { + $this->_resource = $resource; + return $this; + } + + /** + * getActionName() + * + * @return string + */ + public function getForActionName() + { + return $this->_forActionName; + } + + /** + * create() + * + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function create() + { + $file = $this->_testApplicationControllerPath; + + if (!file_exists($file)) { + require_once 'Zend/Tool/Project/Context/Exception.php'; + throw new Zend_Tool_Project_Context_Exception( + 'Could not create action within test controller ' . $file + . ' with action name ' . $this->_forActionName + ); + } + + $actionParam = $this->getForActionName(); + $controllerParam = $this->_resource->getParentResource()->getForControllerName(); + //$moduleParam = null;// + + /* @var $controllerDirectoryResource Zend_Tool_Project_Profile_Resource */ + $controllerDirectoryResource = $this->_resource->getParentResource()->getParentResource(); + if ($controllerDirectoryResource->getParentResource()->getName() == 'TestApplicationModuleDirectory') { + $moduleParam = $controllerDirectoryResource->getParentResource()->getForModuleName(); + } else { + $moduleParam = 'default'; + } + + + + if ($actionParam == 'index' && $controllerParam == 'Index' && $moduleParam == 'default') { + $assert = '$this->assertQueryContentContains("div#welcome h3", "This is your project\'s main page");'; + } else { + $assert = <<<EOS +\$this->assertQueryContentContains( + 'div#view-content p', + 'View script for controller <b>' . \$params['controller'] . '</b> and script/action name <b>' . \$params['action'] . '</b>' + ); +EOS; + } + + $codeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($file, true, true); + $codeGenFile->getClass()->setMethod(array( + 'name' => 'test' . ucfirst($actionParam) . 'Action', + 'body' => <<<EOS +\$params = array('action' => '$actionParam', 'controller' => '$controllerParam', 'module' => '$moduleParam'); +\$urlParams = \$this->urlizeOptions(\$params); +\$url = \$this->url(\$urlParams); +\$this->dispatch(\$url); + +// assertions +\$this->assertModule(\$urlParams['module']); +\$this->assertController(\$urlParams['controller']); +\$this->assertAction(\$urlParams['action']); +$assert + +EOS + )); + + file_put_contents($file, $codeGenFile->generate()); + + return $this; + } + + /** + * delete() + * + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function delete() + { + // @todo do this + return $this; + } + + /** + * hasActionMethod() + * + * @param string $controllerPath + * @param string $actionName + * @return bool + */ + /* + public static function hasActionMethod($controllerPath, $actionName) + { + if (!file_exists($controllerPath)) { + return false; + } + + $controllerCodeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($controllerPath, true, true); + return $controllerCodeGenFile->getClass()->hasMethod('test' . $actionName . 'Action'); + } + */ + +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationBootstrapFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationControllerDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationControllerDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationControllerDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationControllerFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationControllerFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationControllerFile extends Zend_Tool_Project_Context_Filesystem_File @@ -68,6 +68,27 @@ } /** + * getPersistentAttributes() + * + * @return unknown + */ + public function getPersistentAttributes() + { + $attributes = array(); + + if ($this->_forControllerName) { + $attributes['forControllerName'] = $this->getForControllerName(); + } + + return $attributes; + } + + public function getForControllerName() + { + return $this->_forControllerName; + } + + /** * getContents() * * @return string @@ -78,23 +99,26 @@ $filter = new Zend_Filter_Word_DashToCamelCase(); $className = $filter->filter($this->_forControllerName) . 'ControllerTest'; - + + /* @var $controllerDirectoryResource Zend_Tool_Project_Profile_Resource */ + $controllerDirectoryResource = $this->_resource->getParentResource(); + if ($controllerDirectoryResource->getParentResource()->getName() == 'TestApplicationModuleDirectory') { + $className = $filter->filter(ucfirst($controllerDirectoryResource->getParentResource()->getForModuleName())) + . '_' . $className; + } + $codeGenFile = new Zend_CodeGenerator_Php_File(array( - 'requiredFiles' => array( - 'PHPUnit/Framework/TestCase.php' - ), 'classes' => array( new Zend_CodeGenerator_Php_Class(array( 'name' => $className, - 'extendedClass' => 'PHPUnit_Framework_TestCase', + 'extendedClass' => 'Zend_Test_PHPUnit_ControllerTestCase', 'methods' => array( new Zend_CodeGenerator_Php_Method(array( 'name' => 'setUp', - 'body' => ' /* Setup Routine */' - )), - new Zend_CodeGenerator_Php_Method(array( - 'name' => 'tearDown', - 'body' => ' /* Tear Down Routine */' + 'body' => <<<EOS +\$this->bootstrap = new Zend_Application(APPLICATION_ENV, APPLICATION_PATH . '/configs/application.ini'); +parent::setUp(); +EOS )) ) )) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,98 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: TestApplicationControllerDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Filesystem_Directory + */ +require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestApplicationModuleDirectory extends Zend_Tool_Project_Context_Filesystem_Directory +{ + + + /** + * @var string + */ + protected $_forModuleName = null; + + /** + * @var string + */ + protected $_filesystemName = 'moduleDirectory'; + + /** + * init() + * + * @return Zend_Tool_Project_Context_Zf_ControllerFile + */ + public function init() + { + $this->_filesystemName = $this->_forModuleName = $this->_resource->getAttribute('forModuleName'); + parent::init(); + return $this; + } + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestApplicationModuleDirectory'; + } + + /** + * getPersistentAttributes + * + * @return array + */ + public function getPersistentAttributes() + { + return array( + 'forModuleName' => $this->getForModuleName() + ); + } + + /** + * getModuleName() + * + * @return string + */ + public function getForModuleName() + { + return $this->_forModuleName; + } + + +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,57 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: TestApplicationControllerDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Filesystem_Directory + */ +require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestApplicationModulesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory +{ + + /** + * @var string + */ + protected $_filesystemName = 'modules'; + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestApplicationModulesDirectory'; + } + +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryBootstrapFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestLibraryFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryFile extends Zend_Tool_Project_Context_Filesystem_File diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryNamespaceDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryNamespaceDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryNamespaceDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,88 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: TestApplicationBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Filesystem_File + */ +require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestPHPUnitBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File +{ + + /** + * @var string + */ + protected $_filesystemName = 'bootstrap.php'; + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestPHPUnitBootstrapFile'; + } + + /** + * getContents() + * + * @return string + */ + public function getContents() + { + $codeGenerator = new Zend_CodeGenerator_Php_File(array( + 'body' => <<<EOS +// Define path to application directory +defined('APPLICATION_PATH') + || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application')); + +// Define application environment +defined('APPLICATION_ENV') + || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'testing')); + +// Ensure library/ is on include_path +set_include_path(implode(PATH_SEPARATOR, array( + realpath(APPLICATION_PATH . '/../library'), + get_include_path(), +))); + +require_once 'Zend/Loader/Autoloader.php'; +Zend_Loader_Autoloader::getInstance(); + +EOS + )); + return $codeGenerator->generate(); + } + +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestPHPUnitConfigFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestPHPUnitConfigFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestPHPUnitConfigFile extends Zend_Tool_Project_Context_Filesystem_File @@ -53,5 +53,29 @@ { return 'TestPHPUnitConfigFile'; } + + public function getContents() + { + return <<<EOS +<phpunit bootstrap="./bootstrap.php"> + <testsuite name="Application Test Suite"> + <directory>./application</directory> + </testsuite> + <testsuite name="Library Test Suite"> + <directory>./library</directory> + </testsuite> + + <filter> +  +  + </filter> +</phpunit> + +EOS; + } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/TestsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/TestsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/TestsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/UploadsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/UploadsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/UploadsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UploadsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UploadsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_UploadsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewControllerScriptsDirectory.php 23343 2010-11-15 15:33:22Z ramon $ + * @version $Id: ViewControllerScriptsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -49,7 +49,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewControllerScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewFiltersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewFiltersDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewFiltersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewHelpersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewHelpersDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewHelpersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewScriptFile.php 23343 2010-11-15 15:33:22Z ramon $ + * @version $Id: ViewScriptFile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -49,7 +49,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewScriptFile extends Zend_Tool_Project_Context_Filesystem_File @@ -130,6 +130,18 @@ { $contents = ''; + $controllerName = $this->_resource->getParentResource()->getAttribute('forControllerName'); + + $viewsDirectoryResource = $this->_resource + ->getParentResource() // view script + ->getParentResource() // view controller dir + ->getParentResource(); // views dir + if ($viewsDirectoryResource->getParentResource()->getName() == 'ModuleDirectory') { + $moduleName = $viewsDirectoryResource->getParentResource()->getModuleName(); + } else { + $moduleName = 'default'; + } + if ($this->_filesystemName == 'error.phtml') { // should also check that the above directory is forController=error $contents .= <<<EOS <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -143,7 +155,7 @@ <h2><?php echo \$this->message ?></h2> <?php if (isset(\$this->exception)): ?> - + <h3>Exception information:</h3> <p> <b>Message:</b> <?php echo \$this->exception->getMessage() ?> @@ -154,15 +166,16 @@ </pre> <h3>Request Parameters:</h3> - <pre><?php echo var_export(\$this->request->getParams(), true) ?> + <pre><?php echo \$this->escape(var_export(\$this->request->getParams(), true)) ?> </pre> + <?php endif ?> </body> </html> EOS; - } elseif ($this->_forActionName == 'index' && $this->_resource->getParentResource()->getAttribute('forControllerName') == 'Index') { + } elseif ($this->_forActionName == 'index' && $controllerName == 'Index' && $moduleName == 'default') { $contents =<<<EOS <style> @@ -211,8 +224,14 @@ EOS; } else { - $contents = '<br /><br /><center>View script for controller <b>' . $this->_resource->getParentResource()->getAttribute('forControllerName') . '</b>' - . ' and script/action name <b>' . $this->_forActionName . '</b></center>'; + $controllerName = $this->_resource->getParentResource()->getAttribute('forControllerName'); + $actionName = $this->_forActionName; + $contents = <<<EOS +<br /><br /> +<div id="view-content"> + <p>View script for controller <b>$controllerName</b> and script/action name <b>$actionName</b></p> +</div> +EOS; } return $contents; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewScriptsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewScriptsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ViewsDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ViewsDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ViewsDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewsDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php --- a/web/lib/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZfStandardLibraryDirectory.php 20904 2010-02-04 16:18:18Z matthew $ + * @version $Id: ZfStandardLibraryDirectory.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ZfStandardLibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Exception.php --- a/web/lib/Zend/Tool/Project/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile.php --- a/web/lib/Zend/Tool/Project/Profile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Profile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Profile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Container @@ -48,7 +48,7 @@ * @var bool */ protected static $_traverseEnabled = false; - + /** * Constructor, standard usage would allow the setting of options * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/Exception.php --- a/web/lib/Zend/Tool/Project/Profile/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Exception extends Zend_Tool_Project_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/FileParser/Interface.php --- a/web/lib/Zend/Tool/Project/Profile/FileParser/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/FileParser/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Profile_FileParser_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/FileParser/Xml.php --- a/web/lib/Zend/Tool/Project/Profile/FileParser/Xml.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/FileParser/Xml.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ */ require_once 'Zend/Tool/Project/Profile/FileParser/Interface.php'; @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_FileParser_Xml implements Zend_Tool_Project_Profile_FileParser_Interface @@ -72,11 +72,11 @@ if ($profile->hasAttribute('type')) { $xmlElement->addAttribute('type', $profile->getAttribute('type')); } - + if ($profile->hasAttribute('version')) { $xmlElement->addAttribute('version', $profile->getAttribute('version')); } - + self::_serializeRecurser($profile, $xmlElement); $doc = new DOMDocument('1.0'); @@ -111,15 +111,15 @@ if ($xmlDataIterator->getName() != 'projectProfile') { throw new Exception('Profiles must start with a projectProfile node'); } - + if (isset($xmlDataIterator['type'])) { $this->_profile->setAttribute('type', (string) $xmlDataIterator['type']); } - + if (isset($xmlDataIterator['version'])) { $this->_profile->setAttribute('version', (string) $xmlDataIterator['version']); } - + // start un-serialization of the xml doc $this->_unserializeRecurser($xmlDataIterator); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/Iterator/ContextFilter.php --- a/web/lib/Zend/Tool/Project/Profile/Iterator/ContextFilter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/Iterator/ContextFilter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContextFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContextFilter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Iterator_ContextFilter extends RecursiveFilterIterator @@ -135,7 +135,7 @@ foreach ($acceptNames as $n => $v) { $acceptNames[$n] = strtolower($v); } - + $this->_acceptNames = $acceptNames; return $this; } @@ -155,7 +155,7 @@ foreach ($denyNames as $n => $v) { $denyNames[$n] = strtolower($v); } - + $this->_denyNames = $denyNames; return $this; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php --- a/web/lib/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EnabledResourceFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EnabledResourceFilter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter extends RecursiveFilterIterator diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/Resource.php --- a/web/lib/Zend/Tool/Project/Profile/Resource.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/Resource.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Resource extends Zend_Tool_Project_Profile_Resource_Container diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/Resource/Container.php --- a/web/lib/Zend/Tool/Project/Profile/Resource/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/Resource/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Resource_Container implements RecursiveIterator, Countable @@ -50,7 +50,7 @@ * @var bool */ protected $_appendable = true; - + /** * @var array */ @@ -253,10 +253,10 @@ { return (array_key_exists($name, $this->_attributes)) ? $this->_attributes[$name] : null; } - + /** * hasAttribute() - * + * * @param string $name * @return bool */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Profile/Resource/SearchConstraints.php --- a/web/lib/Zend/Tool/Project/Profile/Resource/SearchConstraints.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Profile/Resource/SearchConstraints.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchConstraints.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchConstraints.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Resource_SearchConstraints diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Abstract.php --- a/web/lib/Zend/Tool/Project/Provider/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -50,7 +50,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Project_Provider_Abstract @@ -77,7 +77,7 @@ { // initialize the ZF Contexts (only once per php request) if (!self::$_isInitialized) { - + // load all base contexts ONCE $contextRegistry = Zend_Tool_Project_Context_Repository::getInstance(); $contextRegistry->addContextsFromDirectory( @@ -86,7 +86,7 @@ $contextRegistry->addContextsFromDirectory( dirname(dirname(__FILE__)) . '/Context/Filesystem/', 'Zend_Tool_Project_Context_Filesystem_' ); - + // determine if there are project specfic providers ONCE $profilePath = $this->_findProfileDirectory(); if ($this->_hasProjectProviderDirectory($profilePath . DIRECTORY_SEPARATOR . '.zfproject.xml')) { @@ -95,7 +95,7 @@ $ppd = $profile->search('ProjectProvidersDirectory'); $ppd->loadProviders($this->_registry); } - + self::$_isInitialized = true; } @@ -118,9 +118,9 @@ * - if an enpoint variable has been registered in teh client registry - key=workingDirectory * - if an ENV variable with the key ZFPROJECT_PATH is found * - * @param $loadProfileFlag bool Whether or not to throw an exception when no profile is found - * @param $projectDirectory string The project directory to use to search - * @param $searchParentDirectories bool Whether or not to search upper level direcotries + * @param bool $loadProfileFlag Whether or not to throw an exception when no profile is found + * @param string $projectDirectory The project directory to use to search + * @param bool $searchParentDirectories Whether or not to search upper level direcotries * @return Zend_Tool_Project_Profile */ protected function _loadProfile($loadProfileFlag = self::NO_PROFILE_THROW_EXCEPTION, $projectDirectory = null, $searchParentDirectories = true) @@ -134,14 +134,14 @@ return false; } } - + $profile = new Zend_Tool_Project_Profile(); $profile->setAttribute('projectDirectory', $foundPath); $profile->loadFromFile(); $this->_loadedProfile = $profile; return $profile; } - + protected function _findProfileDirectory($projectDirectory = null, $searchParentDirectories = true) { // use the cwd if no directory was provided @@ -166,7 +166,7 @@ unset($profile); return $projectDirectoryAssembled; } - + // break after first run if we are not to check upper directories if ($searchParentDirectories == false) { break; @@ -174,10 +174,10 @@ array_pop($parentDirectoriesArray); } - + return false; } - + /** * Load the project profile from the current working directory, if not throw exception * @@ -248,19 +248,19 @@ if (!file_exists($pathToProfileFile)) { return false; } - + $contents = file_get_contents($pathToProfileFile); if (strstr($contents, '<projectProvidersDirectory') === false) { return false; } - + if (strstr($contents, '<projectProvidersDirectory enabled="false"')) { return false; } - + return true; } - + /** * _loadContextClassesIntoRegistry() - This is called by the constructor * so that child providers can provide a list of contexts to load into the diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Action.php --- a/web/lib/Zend/Tool/Project/Provider/Action.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Action.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Action.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Action.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Action @@ -92,7 +92,7 @@ if ($controllerFile == null) { throw new Zend_Tool_Project_Provider_Exception('Controller ' . $controllerName . ' was not found.'); } - + return (($controllerFile->search(array('actionMethod' => array('actionName' => $actionName)))) instanceof Zend_Tool_Project_Profile_Resource); } @@ -131,33 +131,50 @@ $this->_loadProfile(); + // get request/response object + $request = $this->_registry->getRequest(); + $response = $this->_registry->getResponse(); + + // determine if testing is enabled in the project + require_once 'Zend/Tool/Project/Provider/Test.php'; + $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); + + if ($testingEnabled && !Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $testingEnabled = false; + $response->appendContent( + 'Note: PHPUnit is required in order to generate controller test stubs.', + array('color' => array('yellow')) + ); + } + // Check that there is not a dash or underscore, return if doesnt match regex if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Action names should be camel cased.'); } - + $originalName = $name; $originalControllerName = $controllerName; - + // ensure it is camelCase (lower first letter) $name = strtolower(substr($name, 0, 1)) . substr($name, 1); - + // ensure controller is MixedCase $controllerName = ucfirst($controllerName); - + if (self::hasResource($this->_loadedProfile, $name, $controllerName, $module)) { throw new Zend_Tool_Project_Provider_Exception('This controller (' . $controllerName . ') already has an action named (' . $name . ')'); } - - $actionMethod = self::createResource($this->_loadedProfile, $name, $controllerName, $module); + + $actionMethodResource = self::createResource($this->_loadedProfile, $name, $controllerName, $module); - // get request/response object - $request = $this->_registry->getRequest(); - $response = $this->_registry->getResponse(); - + $testActionMethodResource = null; + if ($testingEnabled) { + $testActionMethodResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $controllerName, $name, $module); + } + // alert the user about inline converted names $tense = (($request->isPretend()) ? 'would be' : 'is'); - + if ($name !== $originalName) { $response->appendContent( 'Note: The canonical action name that ' . $tense @@ -166,7 +183,7 @@ array('color' => array('yellow')) ); } - + if ($controllerName !== $originalControllerName) { $response->appendContent( 'Note: The canonical controller name that ' . $tense @@ -175,20 +192,31 @@ array('color' => array('yellow')) ); } - + unset($tense); - + if ($request->isPretend()) { $response->appendContent( 'Would create an action named ' . $name . - ' inside controller at ' . $actionMethod->getParentResource()->getContext()->getPath() + ' inside controller at ' . $actionMethodResource->getParentResource()->getContext()->getPath() ); + + if ($testActionMethodResource) { + $response->appendContent('Would create an action test in ' . $testActionMethodResource->getParentResource()->getContext()->getPath()); + } + } else { $response->appendContent( 'Creating an action named ' . $name . - ' inside controller at ' . $actionMethod->getParentResource()->getContext()->getPath() + ' inside controller at ' . $actionMethodResource->getParentResource()->getContext()->getPath() ); - $actionMethod->create(); + $actionMethodResource->create(); + + if ($testActionMethodResource) { + $response->appendContent('Creating an action test in ' . $testActionMethodResource->getParentResource()->getContext()->getPath()); + $testActionMethodResource->create(); + } + $this->_storeProfile(); } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Application.php --- a/web/lib/Zend/Tool/Project/Provider/Application.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Application.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,39 +15,39 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Application.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Application.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Project_Provider_Application +class Zend_Tool_Project_Provider_Application extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Pretendable { - + protected $_specialties = array('ClassNamePrefix'); - + /** - * - * @param $classNamePrefix Prefix of classes - * @param $force + * + * @param string $classNamePrefix Prefix of classes + * @param bool $force */ public function changeClassNamePrefix($classNamePrefix /* , $force = false */) { $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $originalClassNamePrefix = $classNamePrefix; - + if (substr($classNamePrefix, -1) != '_') { $classNamePrefix .= '_'; } - + $configFileResource = $profile->search('ApplicationConfigFile'); $zc = $configFileResource->getAsZendConfig('production'); if ($zc->appnamespace == $classNamePrefix) { @@ -57,31 +57,31 @@ // remove the old $configFileResource->removeStringItem('appnamespace', 'production'); $configFileResource->create(); - + // add the new $configFileResource->addStringItem('appnamespace', $classNamePrefix, 'production', true); $configFileResource->create(); - + // update the project profile $applicationDirectory = $profile->search('ApplicationDirectory'); $applicationDirectory->setClassNamePrefix($classNamePrefix); $response = $this->_registry->getResponse(); - + if ($originalClassNamePrefix !== $classNamePrefix) { $response->appendContent( 'Note: the name provided "' . $originalClassNamePrefix . '" was' . ' altered to "' . $classNamePrefix . '" for correctness.', array('color' => 'yellow') ); - } - + } + // note to the user $response->appendContent('Note: All existing models will need to be altered to this new namespace by hand', array('color' => 'yellow')); $response->appendContent('application.ini updated with new appnamespace ' . $classNamePrefix); - + // store profile $this->_storeProfile(); } - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Controller.php --- a/web/lib/Zend/Tool/Project/Provider/Controller.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Controller.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Controller.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Controller.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Controller @@ -57,7 +57,7 @@ } $newController = $controllersDirectory->createResource( - 'controllerFile', + 'controllerFile', array('controllerName' => $controllerName, 'moduleName' => $moduleName) ); @@ -70,7 +70,7 @@ * @param Zend_Tool_Project_Profile $profile * @param string $controllerName * @param string $moduleName - * @return Zend_Tool_Project_Profile_Resource + * @return boolean */ public static function hasResource(Zend_Tool_Project_Profile $profile, $controllerName, $moduleName = null) { @@ -79,7 +79,7 @@ } $controllersDirectory = self::_getControllersDirectoryResource($profile, $moduleName); - return (($controllersDirectory->search(array('controllerFile' => array('controllerName' => $controllerName)))) instanceof Zend_Tool_Project_Profile_Resource); + return ($controllersDirectory &&($controllersDirectory->search(array('controllerFile' => array('controllerName' => $controllerName)))) instanceof Zend_Tool_Project_Profile_Resource); } /** @@ -112,10 +112,25 @@ { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); + // get request & response + $request = $this->_registry->getRequest(); + $response = $this->_registry->getResponse(); + // determine if testing is enabled in the project require_once 'Zend/Tool/Project/Provider/Test.php'; $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); + if ($testingEnabled && !Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $testingEnabled = false; + $response->appendContent( + 'Note: PHPUnit is required in order to generate controller test stubs.', + array('color' => array('yellow')) + ); + } + + $originalName = $name; + $name = ucfirst($name); + if (self::hasResource($this->_loadedProfile, $name, $module)) { throw new Zend_Tool_Project_Provider_Exception('This project already has a controller named ' . $name); } @@ -124,14 +139,7 @@ if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Controller names should be camel cased.'); } - - $originalName = $name; - $name = ucfirst($name); - - // get request & response - $request = $this->_registry->getRequest(); - $response = $this->_registry->getResponse(); - + try { $controllerResource = self::createResource($this->_loadedProfile, $name, $module); if ($indexActionIncluded) { @@ -139,7 +147,7 @@ $indexActionViewResource = Zend_Tool_Project_Provider_View::createResource($this->_loadedProfile, 'index', $name, $module); } if ($testingEnabled) { - $testControllerResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $name, 'index', $module); + $testActionResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $name, 'index', $module); } } catch (Exception $e) { @@ -158,19 +166,19 @@ ); unset($tense); } - + // do the creation if ($request->isPretend()) { - + $response->appendContent('Would create a controller at ' . $controllerResource->getContext()->getPath()); if (isset($indexActionResource)) { $response->appendContent('Would create an index action method in controller ' . $name); $response->appendContent('Would create a view script for the index action method at ' . $indexActionViewResource->getContext()->getPath()); } - - if ($testControllerResource) { - $response->appendContent('Would create a controller test file at ' . $testControllerResource->getContext()->getPath()); + + if ($testingEnabled) { + $response->appendContent('Would create a controller test file at ' . $testActionResource->getParentResource()->getContext()->getPath()); } } else { @@ -185,9 +193,10 @@ $indexActionViewResource->create(); } - if ($testControllerResource) { - $response->appendContent('Creating a controller test file at ' . $testControllerResource->getContext()->getPath()); - $testControllerResource->create(); + if ($testingEnabled) { + $response->appendContent('Creating a controller test file at ' . $testActionResource->getParentResource()->getContext()->getPath()); + $testActionResource->getParentResource()->create(); + $testActionResource->create(); } $this->_storeProfile(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/DbAdapter.php --- a/web/lib/Zend/Tool/Project/Provider/DbAdapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/DbAdapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbAdapter.php 20852 2010-02-02 21:59:18Z ralph $ + * @version $Id: DbAdapter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,46 +33,46 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_DbAdapter extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Interactable, Zend_Tool_Framework_Provider_Pretendable { - + protected $_appConfigFilePath = null; - + protected $_config = null; - + protected $_sectionName = 'production'; - + public function configure($dsn = null, /* $interactivelyPrompt = false, */ $sectionName = 'production') { $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $appConfigFileResource = $profile->search('applicationConfigFile'); - + if ($appConfigFileResource == false) { throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.'); } - + $this->_appConfigFilePath = $appConfigFileResource->getPath(); - + $this->_config = new Zend_Config_Ini($this->_appConfigFilePath, null, array('skipExtends' => true, 'allowModifications' => true)); - + if ($sectionName != 'production') { $this->_sectionName = $sectionName; } - + if (!isset($this->_config->{$this->_sectionName})) { throw new Zend_Tool_Project_Exception('The config does not have a ' . $this->_sectionName . ' section.'); } - + if (isset($this->_config->{$this->_sectionName}->resources->db)) { throw new Zend_Tool_Project_Exception('The config already has a db resource configured in section ' . $this->_sectionName . '.'); } - + if ($dsn) { $this->_configureViaDSN($dsn); //} elseif ($interactivelyPrompt) { @@ -80,44 +80,44 @@ } else { $this->_registry->getResponse()->appendContent('Nothing to do!'); } - - + + } - + protected function _configureViaDSN($dsn) { $dsnVars = array(); - + if (strpos($dsn, '=') === false) { throw new Zend_Tool_Project_Provider_Exception('At least one name value pair is expected, typcially ' - . 'in the format of "adapter=Mysqli&username=uname&password=mypass&dbname=mydb"' + . 'in the format of "adapter=Mysqli&username=uname&password=mypass&dbname=mydb"' ); } - + parse_str($dsn, $dsnVars); // parse_str suffers when magic_quotes is enabled if (get_magic_quotes_gpc()) { array_walk_recursive($dsnVars, array($this, '_cleanMagicQuotesInValues')); } - + $dbConfigValues = array('resources' => array('db' => null)); - + if (isset($dsnVars['adapter'])) { $dbConfigValues['resources']['db']['adapter'] = $dsnVars['adapter']; unset($dsnVars['adapter']); } - + $dbConfigValues['resources']['db']['params'] = $dsnVars; - + $isPretend = $this->_registry->getRequest()->isPretend(); // get the config resource $applicationConfig = $this->_loadedProfile->search('ApplicationConfigFile'); $applicationConfig->addItem($dbConfigValues, $this->_sectionName, null); - + $response = $this->_registry->getResponse(); - + if ($isPretend) { $response->appendContent('A db configuration for the ' . $this->_sectionName . ' section would be written to the application config file with the following contents: ' @@ -130,10 +130,10 @@ ); } } - + protected function _cleanMagicQuotesInValues(&$value, $key) { $value = stripslashes($value); } - + } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/DbTable.php --- a/web/lib/Zend/Tool/Project/Provider/DbTable.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/DbTable.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,29 +15,29 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: DbTable.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Project_Provider_DbTable +class Zend_Tool_Project_Provider_DbTable extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Pretendable { - + protected $_specialties = array('FromDatabase'); - + /** * @var Zend_Filter */ protected $_nameFilter = null; - + public static function createResource(Zend_Tool_Project_Profile $profile, $dbTableName, $actualTableName, $moduleName = null) { $profileSearchParams = array(); @@ -47,25 +47,25 @@ } $profileSearchParams[] = 'modelsDirectory'; - + $modelsDirectory = $profile->search($profileSearchParams); - + if (!($modelsDirectory instanceof Zend_Tool_Project_Profile_Resource)) { throw new Zend_Tool_Project_Provider_Exception( 'A models directory was not found' . (($moduleName) ? ' for module ' . $moduleName . '.' : '.') ); } - + if (!($dbTableDirectory = $modelsDirectory->search('DbTableDirectory'))) { $dbTableDirectory = $modelsDirectory->createResource('DbTableDirectory'); } - + $dbTableFile = $dbTableDirectory->createResource('DbTableFile', array('dbTableName' => $dbTableName, 'actualTableName' => $actualTableName)); - + return $dbTableFile; } - + public static function hasResource(Zend_Tool_Project_Profile $profile, $dbTableName, $moduleName = null) { $profileSearchParams = array(); @@ -75,20 +75,20 @@ } $profileSearchParams[] = 'modelsDirectory'; - + $modelsDirectory = $profile->search($profileSearchParams); - + if (!($modelsDirectory instanceof Zend_Tool_Project_Profile_Resource) || !($dbTableDirectory = $modelsDirectory->search('DbTableDirectory'))) { return false; } - + $dbTableFile = $dbTableDirectory->search(array('DbTableFile' => array('dbTableName' => $dbTableName))); - + return ($dbTableFile instanceof Zend_Tool_Project_Profile_Resource) ? true : false; } - - + + public function create($name, $actualTableName, $module = null, $forceOverwrite = false) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); @@ -97,14 +97,14 @@ if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('DbTable names should be camel cased.'); } - + $originalName = $name; $name = ucfirst($name); - + if ($actualTableName == '') { throw new Zend_Tool_Project_Provider_Exception('You must provide both the DbTable name as well as the actual db table\'s name.'); } - + if (self::hasResource($this->_loadedProfile, $name, $module)) { throw new Zend_Tool_Project_Provider_Exception('This project already has a DbTable named ' . $name); } @@ -112,10 +112,10 @@ // get request/response object $request = $this->_registry->getRequest(); $response = $this->_registry->getResponse(); - + // alert the user about inline converted names $tense = (($request->isPretend()) ? 'would be' : 'is'); - + if ($name !== $originalName) { $response->appendContent( 'Note: The canonical model name that ' . $tense @@ -124,7 +124,7 @@ array('color' => array('yellow')) ); } - + try { $tableResource = self::createResource($this->_loadedProfile, $name, $actualTableName, $module); } catch (Exception $e) { @@ -142,38 +142,43 @@ $this->_storeProfile(); } } - + + /** + * @param string $module Module name action should be applied to. + * @param bool $forceOverwrite Whether should force overwriting previous classes generated + * @return void + */ public function createFromDatabase($module = null, $forceOverwrite = false) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $bootstrapResource = $this->_loadedProfile->search('BootstrapFile'); - + /* @var $zendApp Zend_Application */ $zendApp = $bootstrapResource->getApplicationInstance(); - + try { $zendApp->bootstrap('db'); } catch (Zend_Application_Exception $e) { throw new Zend_Tool_Project_Provider_Exception('Db resource not available, you might need to configure a DbAdapter.'); return; } - + /* @var $db Zend_Db_Adapter_Abstract */ $db = $zendApp->getBootstrap()->getResource('db'); - + $tableResources = array(); foreach ($db->listTables() as $actualTableName) { - + $dbTableName = $this->_convertTableNameToClassName($actualTableName); - + if (!$forceOverwrite && self::hasResource($this->_loadedProfile, $dbTableName, $module)) { throw new Zend_Tool_Project_Provider_Exception( 'This DbTable resource already exists, if you wish to overwrite it, ' . 'pass the "forceOverwrite" flag to this provider.' ); } - + $tableResources[] = self::createResource( $this->_loadedProfile, $dbTableName, @@ -181,11 +186,11 @@ $module ); } - + if (count($tableResources) == 0) { $this->_registry->getResponse()->appendContent('There are no tables in the selected database to write.'); } - + // do the creation if ($this->_registry->getRequest()->isPretend()) { @@ -202,10 +207,10 @@ $this->_storeProfile(); } - - + + } - + protected function _convertTableNameToClassName($tableName) { if ($this->_nameFilter == null) { @@ -213,8 +218,8 @@ $this->_nameFilter ->addFilter(new Zend_Filter_Word_UnderscoreToCamelCase()); } - + return $this->_nameFilter->filter($tableName); } - + } \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Exception.php --- a/web/lib/Zend/Tool/Project/Provider/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Exception extends Zend_Tool_Project_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Form.php --- a/web/lib/Zend/Tool/Project/Provider/Form.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Form.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 23209 2010-10-21 16:09:34Z ralph $ + * @version $Id: Form.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Form extends Zend_Tool_Project_Provider_Abstract @@ -45,7 +45,7 @@ } $newForm = $formsDirectory->createResource( - 'formFile', + 'formFile', array('formName' => $formName, 'moduleName' => $moduleName) ); @@ -69,7 +69,7 @@ $formsDirectory = self::_getFormsDirectoryResource($profile, $moduleName); return (($formsDirectory->search(array('formFile' => array('formName' => $formName)))) instanceof Zend_Tool_Project_Profile_Resource); } - + /** * _getFormsDirectoryResource() * @@ -89,7 +89,7 @@ return $profile->search($profileSearchParams); } - + public function enable($module = null) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); @@ -98,7 +98,7 @@ $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); $formDirectoryResource = self::_getFormsDirectoryResource($this->_loadedProfile, $module); - + if ($formDirectoryResource->isEnabled()) { throw new Zend_Tool_Project_Provider_Exception('This project already has forms enabled.'); } else { @@ -108,12 +108,12 @@ $this->_registry->getResponse()->appendContent('Enabling forms directory at ' . $formDirectoryResource->getContext()->getPath()); $formDirectoryResource->setEnabled(true); $formDirectoryResource->create(); - $this->_storeProfile(); + $this->_storeProfile(); } } } - + /** * Create a new form * @@ -135,9 +135,9 @@ if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Form names should be camel cased.'); } - + $name = ucwords($name); - + try { $formResource = self::createResource($this->_loadedProfile, $name, $module); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Layout.php --- a/web/lib/Zend/Tool/Project/Provider/Layout.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Layout.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Layout.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,82 +28,113 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Layout extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Pretendable { - + /** + * @var string Layout path + */ + protected $_layoutPath = 'APPLICATION_PATH "/layouts/scripts/"'; + public static function createResource(Zend_Tool_Project_Profile $profile, $layoutName = 'layout') { $applicationDirectory = $profile->search('applicationDirectory'); $layoutDirectory = $applicationDirectory->search('layoutsDirectory'); - + if ($layoutDirectory == false) { $layoutDirectory = $applicationDirectory->createResource('layoutsDirectory'); } - + $layoutScriptsDirectory = $layoutDirectory->search('layoutScriptsDirectory'); - + if ($layoutScriptsDirectory == false) { $layoutScriptsDirectory = $layoutDirectory->createResource('layoutScriptsDirectory'); } - + $layoutScriptFile = $layoutScriptsDirectory->search('layoutScriptFile', array('layoutName' => 'layout')); if ($layoutScriptFile == false) { $layoutScriptFile = $layoutScriptsDirectory->createResource('layoutScriptFile', array('layoutName' => 'layout')); } - + return $layoutScriptFile; } - + public function enable() { $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $applicationConfigResource = $profile->search('ApplicationConfigFile'); if (!$applicationConfigResource) { throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.'); } - + $zc = $applicationConfigResource->getAsZendConfig(); - - if (isset($zc->resources) && isset($zf->resources->layout)) { + + if (isset($zc->resources) && isset($zc->resources->layout)) { $this->_registry->getResponse()->appendContent('A layout resource already exists in this project\'s application configuration file.'); return; } - - $layoutPath = 'APPLICATION_PATH "/layouts/scripts/"'; - + if ($this->_registry->getRequest()->isPretend()) { $this->_registry->getResponse()->appendContent('Would add "resources.layout.layoutPath" key to the application config file.'); } else { - $applicationConfigResource->addStringItem('resources.layout.layoutPath', $layoutPath, 'production', false); - $applicationConfigResource->create(); + $applicationConfigResource->addStringItem('resources.layout.layoutPath', $this->_layoutPath, 'production', false); + $applicationConfigResource->create(); + + $this->_registry->getResponse()->appendContent('A layout entry has been added to the application config file.'); $layoutScriptFile = self::createResource($profile); - - $layoutScriptFile->create(); - - $this->_registry->getResponse()->appendContent( - 'Layouts have been enabled, and a default layout created at ' - . $layoutScriptFile->getPath() - ); - - $this->_registry->getResponse()->appendContent('A layout entry has been added to the application config file.'); + if (!$layoutScriptFile->exists()) { + $layoutScriptFile->create(); + $this->_registry->getResponse()->appendContent( + 'A default layout has been created at ' + . $layoutScriptFile->getPath() + ); + + } + + $this->_storeProfile(); } - - - } - + public function disable() { - // @todo + $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); + + $applicationConfigResource = $this->_getApplicationConfigResource($profile); + $zc = $applicationConfigResource->getAsZendConfig(); + + if (isset($zc->resources) && !isset($zc->resources->layout)) { + $this->_registry->getResponse()->appendContent('No layout configuration exists in application config file.'); + return; + } + + if ($this->_registry->getRequest()->isPretend()) { + $this->_registry->getResponse()->appendContent('Would remove "resources.layout.layoutPath" key from the application config file.'); + } else { + + // Remove the resources.layout.layoutPath directive from application config + $applicationConfigResource->removeStringItem('resources.layout.layoutPath', $this->_layoutPath, 'production', false); + $applicationConfigResource->create(); + + // Tell the user about the good work we've done + $this->_registry->getResponse()->appendContent('Layout entry has been removed from the application config file.'); + + $this->_storeProfile(); + } + } + + protected function _getApplicationConfigResource(Zend_Tool_Project_Profile $profile) + { + $applicationConfigResource = $profile->search('ApplicationConfigFile'); + if (!$applicationConfigResource) { + throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.'); + } + + return $applicationConfigResource; } - - - } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Manifest.php --- a/web/lib/Zend/Tool/Project/Provider/Manifest.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Manifest.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 22607 2010-07-17 08:39:49Z torio $ + * @version $Id: Manifest.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Manifest implements @@ -43,33 +43,33 @@ public function getProviders() { // the order here will represent what the output will look like when iterating a manifest - + return array( // top level project & profile providers 'Zend_Tool_Project_Provider_Profile', 'Zend_Tool_Project_Provider_Project', - + // app layer provider 'Zend_Tool_Project_Provider_Application', - + // MVC layer providers 'Zend_Tool_Project_Provider_Model', 'Zend_Tool_Project_Provider_View', 'Zend_Tool_Project_Provider_Controller', 'Zend_Tool_Project_Provider_Action', - + // hMVC provider 'Zend_Tool_Project_Provider_Module', - + // application problem providers 'Zend_Tool_Project_Provider_Form', 'Zend_Tool_Project_Provider_Layout', 'Zend_Tool_Project_Provider_DbAdapter', 'Zend_Tool_Project_Provider_DbTable', - + // provider within project provider 'Zend_Tool_Project_Provider_ProjectProvider', - + ); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Model.php --- a/web/lib/Zend/Tool/Project/Provider/Model.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Model.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Model.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Model.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Model extends Zend_Tool_Project_Provider_Abstract @@ -45,7 +45,7 @@ } $newModel = $modelsDirectory->createResource( - 'modelFile', + 'modelFile', array('modelName' => $modelName, 'moduleName' => $moduleName) ); @@ -67,9 +67,14 @@ } $modelsDirectory = self::_getModelsDirectoryResource($profile, $moduleName); + + if (!$modelsDirectory instanceof Zend_Tool_Project_Profile_Resource) { + return false; + } + return (($modelsDirectory->search(array('modelFile' => array('modelName' => $modelName)))) instanceof Zend_Tool_Project_Profile_Resource); } - + /** * _getModelsDirectoryResource() * @@ -89,7 +94,7 @@ return $profile->search($profileSearchParams); } - + /** * Create a new model * @@ -101,9 +106,9 @@ $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); $originalName = $name; - + $name = ucwords($name); - + // determine if testing is enabled in the project $testingEnabled = false; //Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); $testModelResource = null; @@ -112,18 +117,18 @@ if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Model names should be camel cased.'); } - + if (self::hasResource($this->_loadedProfile, $name, $module)) { throw new Zend_Tool_Project_Provider_Exception('This project already has a model named ' . $name); } - + // get request/response object $request = $this->_registry->getRequest(); $response = $this->_registry->getResponse(); - + // alert the user about inline converted names $tense = (($request->isPretend()) ? 'would be' : 'is'); - + if ($name !== $originalName) { $response->appendContent( 'Note: The canonical model name that ' . $tense @@ -132,7 +137,7 @@ array('color' => array('yellow')) ); } - + try { $modelResource = self::createResource($this->_loadedProfile, $name, $module); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Module.php --- a/web/lib/Zend/Tool/Project/Provider/Module.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Module.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Module.php 23419 2010-11-20 21:37:46Z ramon $ + * @version $Id: Module.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -43,7 +43,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Module @@ -136,6 +136,10 @@ { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); + // determine if testing is enabled in the project + require_once 'Zend/Tool/Project/Provider/Test.php'; + //$testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); + $resources = self::createResources($this->_loadedProfile, $name); $response = $this->_registry->getResponse(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Profile.php --- a/web/lib/Zend/Tool/Project/Provider/Profile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Profile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Profile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Profile.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Profile extends Zend_Tool_Project_Provider_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Project.php --- a/web/lib/Zend/Tool/Project/Provider/Project.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Project.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Project.php 20898 2010-02-04 07:03:46Z ralph $ + * @version $Id: Project.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Project @@ -91,13 +91,18 @@ $newProfile->loadFromData(); $response = $this->_registry->getResponse(); - + $response->appendContent('Creating project at ' . $path); $response->appendContent('Note: ', array('separator' => false, 'color' => 'yellow')); $response->appendContent( 'This command created a web project, ' . 'for more information setting up your VHOST, please see docs/README'); + if (!Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $response->appendContent('Testing Note: ', array('separator' => false, 'color' => 'yellow')); + $response->appendContent('PHPUnit was not found in your include_path, therefore no testing actions will be created.'); + } + foreach ($newProfile->getIterator() as $resource) { $resource->create(); } @@ -120,13 +125,19 @@ protected function _getDefaultProfile() { + $testAction = ''; + if (Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $testAction = ' <testApplicationActionMethod forActionName="index" />'; + } + + $version = Zend_Version::VERSION; + $data = <<<EOS <?xml version="1.0" encoding="UTF-8"?> -<projectProfile type="default" version="1.10"> +<projectProfile type="default" version="$version"> <projectDirectory> <projectProfileFile /> <applicationDirectory> - <apisDirectory enabled="false" /> <configsDirectory> <applicationConfigFile type="ini" /> </configsDirectory> @@ -140,6 +151,7 @@ <layoutsDirectory enabled="false" /> <modelsDirectory /> <modulesDirectory enabled="false" /> + <servicesDirectory enabled="false" /> <viewsDirectory> <viewScriptsDirectory> <viewControllerScriptsDirectory forControllerName="Index"> @@ -179,19 +191,22 @@ <temporaryDirectory enabled="false" /> <testsDirectory> <testPHPUnitConfigFile /> + <testPHPUnitBootstrapFile /> <testApplicationDirectory> - <testApplicationBootstrapFile /> - </testApplicationDirectory> - <testLibraryDirectory> - <testLibraryBootstrapFile /> - </testLibraryDirectory> + <testApplicationControllerDirectory> + <testApplicationControllerFile filesystemName="IndexControllerTest.php" forControllerName="Index"> +$testAction + </testApplicationControllerFile> + </testApplicationControllerDirectory> + </testApplicationDirectory> + <testLibraryDirectory /> </testsDirectory> </projectDirectory> </projectProfile> EOS; return $data; } - + public static function getDefaultReadmeContents($caller = null) { $projectDirResource = $caller->getResource()->getProfile()->search('projectDirectory'); @@ -201,13 +216,13 @@ } else { $path = '/path/to/public'; } - + return <<< EOS README ====== This directory should be used to place project specfic documentation including -but not limited to project notes, generated API/phpdoc documentation, or +but not limited to project notes, generated API/phpdoc documentation, or manual files generated or hand written. Ideally, this directory would remain in your development environment only and should not be deployed with your application to it's final production location. @@ -224,14 +239,14 @@ # This should be omitted in the production environment SetEnv APPLICATION_ENV development - + <Directory "$path"> Options Indexes MultiViews FollowSymLinks AllowOverride All Order allow,deny Allow from all </Directory> - + </VirtualHost> EOS; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/ProjectProvider.php --- a/web/lib/Zend/Tool/Project/Provider/ProjectProvider.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/ProjectProvider.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProvider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProjectProvider.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Tool_Project_Provider_Abstract */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_ProjectProvider extends Zend_Tool_Project_Provider_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/Test.php --- a/web/lib/Zend/Tool/Project/Provider/Test.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/Test.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Test.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Test.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Test extends Zend_Tool_Project_Provider_Abstract @@ -55,6 +55,21 @@ return $testsDirectory->isEnabled(); } + public static function isPHPUnitAvailable() + { + if (class_exists('PHPUnit_Runner_Version', false)) { + return true; + } + + $included = @include 'PHPUnit/Runner/Version.php'; + + if ($included === false) { + return false; + } else { + return true; + } + } + /** * createApplicationResource() * @@ -76,22 +91,32 @@ $testsDirectoryResource = $profile->search('testsDirectory'); - if (($testAppDirectoryResource = $testsDirectoryResource->search('testApplicationDirectory')) === false) { - $testAppDirectoryResource = $testsDirectoryResource->createResource('testApplicationDirectory'); + // parentOfController could either be application/ or a particular module folder, which is why we use this name + if (($testParentOfControllerDirectoryResource = $testsDirectoryResource->search('testApplicationDirectory')) === false) { + $testParentOfControllerDirectoryResource = $testsDirectoryResource->createResource('testApplicationDirectory'); } if ($moduleName) { - //@todo $moduleName - $moduleName = ''; + if (($testAppModulesDirectoryResource = $testParentOfControllerDirectoryResource->search('testApplicationModulesDirectory')) === false) { + $testAppModulesDirectoryResource = $testParentOfControllerDirectoryResource->createResource('testApplicationModulesDirectory'); + } + + if (($testAppModuleDirectoryResource = $testAppModulesDirectoryResource->search(array('testApplicationModuleDirectory' => array('forModuleName' => $moduleName)))) === false) { + $testAppModuleDirectoryResource = $testAppModulesDirectoryResource->createResource('testApplicationModuleDirectory', array('forModuleName' => $moduleName)); + } + + $testParentOfControllerDirectoryResource = $testAppModuleDirectoryResource; } - if (($testAppControllerDirectoryResource = $testAppDirectoryResource->search('testApplicationControllerDirectory')) === false) { - $testAppControllerDirectoryResource = $testAppDirectoryResource->createResource('testApplicationControllerDirectory'); + if (($testAppControllerDirectoryResource = $testParentOfControllerDirectoryResource->search('testApplicationControllerDirectory', 'testApplicationModuleDirectory')) === false) { + $testAppControllerDirectoryResource = $testParentOfControllerDirectoryResource->createResource('testApplicationControllerDirectory'); } - $testAppControllerFileResource = $testAppControllerDirectoryResource->createResource('testApplicationControllerFile', array('forControllerName' => $controllerName)); - - return $testAppControllerFileResource; + if (($testAppControllerFileResource = $testAppControllerDirectoryResource->search(array('testApplicationControllerFile' => array('forControllerName' => $controllerName)))) === false) { + $testAppControllerFileResource = $testAppControllerDirectoryResource->createResource('testApplicationControllerFile', array('forControllerName' => $controllerName)); + } + + return $testAppControllerFileResource->createResource('testApplicationActionMethod', array('forActionName' => $actionName)); } /** @@ -120,7 +145,6 @@ $currentDirectoryResource = $libraryDirectoryResource; } - } else { if (($libraryFileResource = $currentDirectoryResource->search(array('TestLibraryFile' => array('forClassName' => $libraryClassName)))) === false) { @@ -147,7 +171,7 @@ /** * create() * - * @param unknown_type $libraryClassName + * @param string $libraryClassName */ public function create($libraryClassName) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Tool/Project/Provider/View.php --- a/web/lib/Zend/Tool/Project/Provider/View.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Tool/Project/Provider/View.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: View.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstract @@ -90,7 +90,7 @@ * @param string $controllerName * @param string $actionNameOrSimpleName */ - public function create($controllerName, $actionNameOrSimpleName) + public function create($controllerName, $actionNameOrSimpleName, $module = null) { if ($controllerName == '' || $actionNameOrSimpleName == '') { @@ -100,7 +100,7 @@ $profile = $this->_loadProfile(); - $view = self::createResource($profile, $actionNameOrSimpleName, $controllerName); + $view = self::createResource($profile, $actionNameOrSimpleName, $controllerName, $module); if ($this->_registry->getRequest()->isPretend()) { $this->_registry->getResponse( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate.php --- a/web/lib/Zend/Translate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 22591 2010-07-16 20:58:05Z thomas $ + * @version $Id: Translate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter.php --- a/web/lib/Zend/Translate/Adapter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Translate * @subpackage Zend_Translate_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Adapter.php 22726 2010-07-30 10:52:07Z thomas $ + * @version $Id: Adapter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Translate * @subpackage Zend_Translate_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Translate_Adapter { @@ -212,6 +212,11 @@ } else if (!is_array($options)) { $options = array('content' => $options); } + + if (!isset($options['content']) || empty($options['content'])) { + require_once 'Zend/Translate/Exception.php'; + throw new Zend_Translate_Exception("Required option 'content' is missing"); + } $originate = null; if (!empty($options['locale'])) { @@ -240,9 +245,15 @@ if (is_string($options['content']) and is_dir($options['content'])) { $options['content'] = realpath($options['content']); $prev = ''; - foreach (new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($options['content'], RecursiveDirectoryIterator::KEY_AS_PATHNAME), - RecursiveIteratorIterator::SELF_FIRST) as $directory => $info) { + $iterator = new RecursiveIteratorIterator( + new RecursiveRegexIterator( + new RecursiveDirectoryIterator($options['content'], RecursiveDirectoryIterator::KEY_AS_PATHNAME), + '/^(?!.*(\.svn|\.cvs)).*$/', RecursiveRegexIterator::MATCH + ), + RecursiveIteratorIterator::SELF_FIRST + ); + + foreach ($iterator as $directory => $info) { $file = $info->getFilename(); if (is_array($options['ignore'])) { foreach ($options['ignore'] as $key => $ignore) { @@ -310,6 +321,8 @@ } } } + + unset($iterator); } else { $this->_addTranslationData($options); } @@ -464,7 +477,7 @@ /** * Returns the available languages from this adapter * - * @return array + * @return array|null */ public function getList() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Array.php --- a/web/lib/Zend/Translate/Adapter/Array.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Array.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Array extends Zend_Translate_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Csv.php --- a/web/lib/Zend/Translate/Adapter/Csv.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Csv.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Csv.php 21661 2010-03-27 20:20:27Z thomas $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Csv.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Csv extends Zend_Translate_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Gettext.php --- a/web/lib/Zend/Translate/Adapter/Gettext.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Gettext.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Gettext.php 22653 2010-07-22 18:41:39Z mabe $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Gettext.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Gettext extends Zend_Translate_Adapter { @@ -72,6 +72,7 @@ throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.'); } if (@filesize($filename) < 10) { + @fclose($this->_file); require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } @@ -83,6 +84,7 @@ } else if (strtolower(substr(dechex($input[1]), -8)) == "de120495") { $this->_bigEndian = true; } else { + @fclose($this->_file); require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } @@ -131,6 +133,8 @@ } } } + + @fclose($this->_file); $this->_data[$locale][''] = trim($this->_data[$locale]['']); if (empty($this->_data[$locale][''])) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Ini.php --- a/web/lib/Zend/Translate/Adapter/Ini.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Ini.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Ini.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Ini.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Ini extends Zend_Translate_Adapter diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Qt.php --- a/web/lib/Zend/Translate/Adapter/Qt.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Qt.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Qt.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Qt.php 24649 2012-02-26 03:37:54Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter { @@ -74,9 +74,10 @@ xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Tbx.php --- a/web/lib/Zend/Translate/Adapter/Tbx.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Tbx.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Tbx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Tbx.php 24649 2012-02-26 03:37:54Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Tbx extends Zend_Translate_Adapter { @@ -69,9 +69,10 @@ xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Tmx.php --- a/web/lib/Zend/Translate/Adapter/Tmx.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Tmx.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Tmx.php 21049 2010-02-13 22:52:52Z thomas $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Tmx.php 24649 2012-02-26 03:37:54Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Tmx extends Zend_Translate_Adapter { @@ -74,9 +74,10 @@ xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/Xliff.php --- a/web/lib/Zend/Translate/Adapter/Xliff.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/Xliff.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Xliff.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Xliff.php 24649 2012-02-26 03:37:54Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Xliff extends Zend_Translate_Adapter { @@ -81,9 +81,10 @@ xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Adapter/XmlTm.php --- a/web/lib/Zend/Translate/Adapter/XmlTm.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Adapter/XmlTm.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: XmlTm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: XmlTm.php 24649 2012-02-26 03:37:54Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_XmlTm extends Zend_Translate_Adapter { @@ -69,9 +69,10 @@ xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Exception.php --- a/web/lib/Zend/Translate/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Translate/Plural.php --- a/web/lib/Zend/Translate/Plural.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Translate/Plural.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Plural.php 22518 2010-07-04 11:05:10Z thomas $ + * @version $Id: Plural.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Plural diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Uri.php --- a/web/lib/Zend/Uri.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Uri.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uri.php 23376 2010-11-18 21:19:24Z bittarman $ + * @version $Id: Uri.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Uri diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Uri/Exception.php --- a/web/lib/Zend/Uri/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Uri/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Uri_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Uri/Http.php --- a/web/lib/Zend/Uri/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Uri/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 23409 2010-11-19 19:55:25Z bittarman $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Uri * @uses Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Uri_Http extends Zend_Uri @@ -217,24 +217,20 @@ // Additional decomposition to get username, password, host, and port $combo = isset($matches[3]) === true ? $matches[3] : ''; - $pattern = '~^(([^:@]*)(:([^@]*))?@)?([^:]+)(:(.*))?$~'; + $pattern = '~^(([^:@]*)(:([^@]*))?@)?((?(?=[[])[[][^]]+[]]|[^:]+))(:(.*))?$~'; $status = @preg_match($pattern, $combo, $matches); if ($status === false) { require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: authority decomposition failed'); } - - // Failed decomposition; no further processing needed - if ($status === false) { - return; - } - + // Save remaining URI components $this->_username = isset($matches[2]) === true ? $matches[2] : ''; $this->_password = isset($matches[4]) === true ? $matches[4] : ''; - $this->_host = isset($matches[5]) === true ? $matches[5] : ''; + $this->_host = isset($matches[5]) === true + ? preg_replace('~^\[([^]]+)\]$~', '\1', $matches[5]) // Strip wrapper [] from IPv6 literal + : ''; $this->_port = isset($matches[7]) === true ? $matches[7] : ''; - } /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate.php --- a/web/lib/Zend/Validate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Validate.php 21339 2010-03-05 15:32:25Z thomas $ + * @version $Id: Validate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate implements Zend_Validate_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Abstract.php --- a/web/lib/Zend/Validate/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22472 2010-06-20 07:36:16Z thomas $ + * @version $Id: Abstract.php 25105 2012-11-07 20:33:22Z rob $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface @@ -230,16 +230,20 @@ $value = $value->__toString(); } } else { - $value = (string)$value; + $value = implode((array) $value); } if ($this->getObscureValue()) { $value = str_repeat('*', strlen($value)); } - $message = str_replace('%value%', (string) $value, $message); + $message = str_replace('%value%', $value, $message); foreach ($this->_messageVariables as $ident => $property) { - $message = str_replace("%$ident%", (string) $this->$property, $message); + $message = str_replace( + "%$ident%", + implode(' ', (array) $this->$property), + $message + ); } $length = self::getMessageLength(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Alnum.php --- a/web/lib/Zend/Validate/Alnum.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Alnum.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Alnum.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Alnum.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Alnum extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Alpha.php --- a/web/lib/Zend/Validate/Alpha.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Alpha.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Alpha.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Alpha.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Alpha extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode.php --- a/web/lib/Zend/Validate/Barcode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Barcode.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Barcode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/AdapterAbstract.php --- a/web/lib/Zend/Validate/Barcode/AdapterAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/AdapterAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: AdapterAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/AdapterInterface.php --- a/web/lib/Zend/Validate/Barcode/AdapterInterface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/AdapterInterface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: AdapterInterface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Validate_Barcode_AdapterInterface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Code25.php --- a/web/lib/Zend/Validate/Barcode/Code25.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Code25.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code25.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code25 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Code25interleaved.php --- a/web/lib/Zend/Validate/Barcode/Code25interleaved.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Code25interleaved.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25interleaved.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code25interleaved.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code25interleaved extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Code39.php --- a/web/lib/Zend/Validate/Barcode/Code39.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Code39.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code39.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code39 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Code39ext.php --- a/web/lib/Zend/Validate/Barcode/Code39ext.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Code39ext.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39ext.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code39ext.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code39ext extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Code93.php --- a/web/lib/Zend/Validate/Barcode/Code93.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Code93.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code93.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code93.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code93 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Code93ext.php --- a/web/lib/Zend/Validate/Barcode/Code93ext.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Code93ext.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code93ext.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code93ext.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code93ext extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Ean12.php --- a/web/lib/Zend/Validate/Barcode/Ean12.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Ean12.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean12.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean12.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean12 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Ean13.php --- a/web/lib/Zend/Validate/Barcode/Ean13.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Ean13.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean13.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ean13.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean13 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Ean14.php --- a/web/lib/Zend/Validate/Barcode/Ean14.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Ean14.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean14.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean14.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean14 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Ean18.php --- a/web/lib/Zend/Validate/Barcode/Ean18.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Ean18.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean18.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean18.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean18 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Ean2.php --- a/web/lib/Zend/Validate/Barcode/Ean2.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Ean2.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean2.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean2.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean2 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Ean5.php --- a/web/lib/Zend/Validate/Barcode/Ean5.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Ean5.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean5.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean5.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean5 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Ean8.php --- a/web/lib/Zend/Validate/Barcode/Ean8.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Ean8.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean8.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean8.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean8 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Gtin12.php --- a/web/lib/Zend/Validate/Barcode/Gtin12.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Gtin12.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gtin12.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Gtin12.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Gtin12 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Gtin13.php --- a/web/lib/Zend/Validate/Barcode/Gtin13.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Gtin13.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gtin13.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Gtin13.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Gtin13 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Gtin14.php --- a/web/lib/Zend/Validate/Barcode/Gtin14.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Gtin14.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gtin14.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Gtin14.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Gtin14 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Identcode.php --- a/web/lib/Zend/Validate/Barcode/Identcode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Identcode.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identcode.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Identcode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Identcode extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Intelligentmail.php --- a/web/lib/Zend/Validate/Barcode/Intelligentmail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Intelligentmail.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Intelligentmail.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Intelligentmail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_IntelligentMail extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Issn.php --- a/web/lib/Zend/Validate/Barcode/Issn.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Issn.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Issn.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Issn.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Issn extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Itf14.php --- a/web/lib/Zend/Validate/Barcode/Itf14.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Itf14.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Itf14.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Itf14.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Itf14 extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Leitcode.php --- a/web/lib/Zend/Validate/Barcode/Leitcode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Leitcode.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Leitcode.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Leitcode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Leitcode extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Planet.php --- a/web/lib/Zend/Validate/Barcode/Planet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Planet.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Planet.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Planet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Planet extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Postnet.php --- a/web/lib/Zend/Validate/Barcode/Postnet.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Postnet.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Postnet.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Postnet.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Postnet extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Royalmail.php --- a/web/lib/Zend/Validate/Barcode/Royalmail.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Royalmail.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Royalmail.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Royalmail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Royalmail extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Sscc.php --- a/web/lib/Zend/Validate/Barcode/Sscc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Sscc.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sscc.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Sscc.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Sscc extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Upca.php --- a/web/lib/Zend/Validate/Barcode/Upca.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Upca.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upca.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Upca.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Upca extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Barcode/Upce.php --- a/web/lib/Zend/Validate/Barcode/Upce.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Barcode/Upce.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upce.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Upce.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Upce extends Zend_Validate_Barcode_AdapterAbstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Between.php --- a/web/lib/Zend/Validate/Between.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Between.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Between.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Between.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Between extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Callback.php --- a/web/lib/Zend/Validate/Callback.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Callback.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Callback.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Callback.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Callback extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Ccnum.php --- a/web/lib/Zend/Validate/Ccnum.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Ccnum.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ccnum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ccnum.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Ccnum extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/CreditCard.php --- a/web/lib/Zend/Validate/CreditCard.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/CreditCard.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreditCard.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: CreditCard.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_CreditCard extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Date.php --- a/web/lib/Zend/Validate/Date.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Date.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Date.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Date extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Db/Abstract.php --- a/web/lib/Zend/Validate/Db/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Db/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23356 2010-11-18 15:59:10Z ralph $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Validate * @uses Zend_Validate_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract @@ -276,7 +276,7 @@ /** * Sets the select object to be used by the validator - * + * * @param Zend_Db_Select $select * @return Zend_Validate_Db_Abstract */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Db/NoRecordExists.php --- a/web/lib/Zend/Validate/Db/NoRecordExists.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Db/NoRecordExists.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NoRecordExists.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NoRecordExists.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Validate * @uses Zend_Validate_Db_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Db_NoRecordExists extends Zend_Validate_Db_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Db/RecordExists.php --- a/web/lib/Zend/Validate/Db/RecordExists.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Db/RecordExists.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecordExists.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecordExists.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Validate * @uses Zend_Validate_Db_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Db_RecordExists extends Zend_Validate_Db_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Digits.php --- a/web/lib/Zend/Validate/Digits.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Digits.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Digits.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Digits.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Digits extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/EmailAddress.php --- a/web/lib/Zend/Validate/EmailAddress.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/EmailAddress.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailAddress.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: EmailAddress.php 25057 2012-11-02 20:35:40Z rob $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract @@ -52,28 +52,37 @@ */ protected $_messageTemplates = array( self::INVALID => "Invalid type given. String expected", - self::INVALID_FORMAT => "'%value%' is no valid email address in the basic format local-part@hostname", - self::INVALID_HOSTNAME => "'%hostname%' is no valid hostname for email address '%value%'", + self::INVALID_FORMAT => "'%value%' is not a valid email address in the basic format local-part@hostname", + self::INVALID_HOSTNAME => "'%hostname%' is not a valid hostname for email address '%value%'", self::INVALID_MX_RECORD => "'%hostname%' does not appear to have a valid MX record for the email address '%value%'", self::INVALID_SEGMENT => "'%hostname%' is not in a routable network segment. The email address '%value%' should not be resolved from public network", self::DOT_ATOM => "'%localPart%' can not be matched against dot-atom format", self::QUOTED_STRING => "'%localPart%' can not be matched against quoted-string format", - self::INVALID_LOCAL_PART => "'%localPart%' is no valid local part for email address '%value%'", + self::INVALID_LOCAL_PART => "'%localPart%' is not a valid local part for email address '%value%'", self::LENGTH_EXCEEDED => "'%value%' exceeds the allowed length", ); /** + * As of RFC5753 (JAN 2010), the following blocks are no logner reserved: + * - 128.0.0.0/16 + * - 191.255.0.0/16 + * - 223.255.255.0/24 + * @see http://tools.ietf.org/html/rfc5735#page-6 + * + * As of RFC6598 (APR 2012), the following blocks are now reserved: + * - 100.64.0.0/10 + * @see http://tools.ietf.org/html/rfc6598#section-7 + * * @see http://en.wikipedia.org/wiki/IPv4 * @var array */ protected $_invalidIp = array( '0' => '0.0.0.0/8', '10' => '10.0.0.0/8', + '100' => '100.64.0.0/10', '127' => '127.0.0.0/8', - '128' => '128.0.0.0/16', '169' => '169.254.0.0/16', '172' => '172.16.0.0/12', - '191' => '191.255.0.0/16', '192' => array( '192.0.0.0/24', '192.0.2.0/24', @@ -81,7 +90,6 @@ '192.168.0.0/16' ), '198' => '198.18.0.0/15', - '223' => '223.255.255.0/24', '224' => '224.0.0.0/4', '240' => '240.0.0.0/4' ); @@ -177,6 +185,8 @@ } else { $this->setHostnameValidator($options['hostname']); } + } elseif ($this->_options['hostname'] == null) { + $this->setHostnameValidator(); } if (array_key_exists('mx', $options)) { @@ -205,17 +215,17 @@ */ public function setMessage($messageString, $messageKey = null) { - $messageKeys = $messageKey; if ($messageKey === null) { - $keys = array_keys($this->_messageTemplates); - $messageKeys = current($keys); + $this->_options['hostname']->setMessage($messageString); + parent::setMessage($messageString); + return $this; } - if (!isset($this->_messageTemplates[$messageKeys])) { + if (!isset($this->_messageTemplates[$messageKey])) { $this->_options['hostname']->setMessage($messageString, $messageKey); } - $this->_messageTemplates[$messageKeys] = $messageString; + $this->_messageTemplates[$messageKey] = $messageString; return $this; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Exception.php --- a/web/lib/Zend/Validate/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Count.php --- a/web/lib/Zend/Validate/File/Count.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Count.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Count.php 21325 2010-03-04 20:26:36Z thomas $ + * @version $Id: Count.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Count extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Crc32.php --- a/web/lib/Zend/Validate/File/Crc32.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Crc32.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crc32.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Crc32.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/ExcludeExtension.php --- a/web/lib/Zend/Validate/File/ExcludeExtension.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/ExcludeExtension.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExcludeExtension.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: ExcludeExtension.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/ExcludeMimeType.php --- a/web/lib/Zend/Validate/File/ExcludeMimeType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/ExcludeMimeType.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExcludeMimeType.php 21935 2010-04-18 16:21:35Z thomas $ + * @version $Id: ExcludeMimeType.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Exists.php --- a/web/lib/Zend/Validate/File/Exists.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Exists.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exists.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: Exists.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Exists extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Extension.php --- a/web/lib/Zend/Validate/File/Extension.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Extension.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Extension.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Extension extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/FilesSize.php --- a/web/lib/Zend/Validate/File/FilesSize.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/FilesSize.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FilesSize.php 20454 2010-01-20 22:50:59Z thomas $ + * @version $Id: FilesSize.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Hash.php --- a/web/lib/Zend/Validate/File/Hash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Hash.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hash.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Hash.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Hash extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/ImageSize.php --- a/web/lib/Zend/Validate/File/ImageSize.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/ImageSize.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageSize.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: ImageSize.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/IsCompressed.php --- a/web/lib/Zend/Validate/File/IsCompressed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/IsCompressed.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IsCompressed.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: IsCompressed.php 24702 2012-03-28 20:08:40Z rob $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType @@ -94,6 +94,7 @@ 'application/x-stuffit', 'application/x-tar', 'application/zip', + 'application/x-zip', 'application/zoo', 'multipart/x-gzip', ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/IsImage.php --- a/web/lib/Zend/Validate/File/IsImage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/IsImage.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IsImage.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: IsImage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Md5.php --- a/web/lib/Zend/Validate/File/Md5.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Md5.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Md5.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Md5.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/MimeType.php --- a/web/lib/Zend/Validate/File/MimeType.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/MimeType.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MimeType.php 22832 2010-08-12 18:02:41Z thomas $ + * @version $Id: MimeType.php 25175 2012-12-22 20:47:08Z rob $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract @@ -103,6 +103,12 @@ ); /** + * Indicates whether use of $_magicFiles should be attempted. + * @var boolean + */ + protected $_tryCommonMagicFiles = true; + + /** * Option to allow header check * * @var boolean @@ -144,14 +150,22 @@ /** * Returns the actual set magicfile * + * Note that for PHP 5.3.0 or higher, we don't use $_ENV['MAGIC'] or try to + * find a magic file in a common location as PHP now has a built-in internal + * magic file. + * * @return string */ public function getMagicFile() { - if (null === $this->_magicfile) { + if (version_compare(PHP_VERSION, '5.3.0', '<') + && null === $this->_magicfile) { if (!empty($_ENV['MAGIC'])) { $this->setMagicFile($_ENV['MAGIC']); - } elseif (!(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1)) { + } elseif ( + !(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1) + && $this->shouldTryCommonMagicFiles() // @see ZF-11784 + ) { require_once 'Zend/Validate/Exception.php'; foreach ($this->_magicFiles as $file) { // supressing errors which are thrown due to openbase_dir restrictions @@ -210,6 +224,32 @@ } /** + * Enables or disables attempts to try the common magic file locations + * specified by Zend_Validate_File_MimeType::_magicFiles + * + * @param boolean $flag + * @return Zend_Validate_File_MimeType Provides fluent interface + * @see http://framework.zend.com/issues/browse/ZF-11784 + */ + public function setTryCommonMagicFilesFlag($flag = true) + { + $this->_tryCommonMagicFiles = (boolean) $flag; + + return $this; + } + + /** + * Accessor for Zend_Validate_File_MimeType::_magicFiles + * + * @return boolean + * @see http://framework.zend.com/issues/browse/ZF-11784 + */ + public function shouldTryCommonMagicFiles() + { + return $this->_tryCommonMagicFiles; + } + + /** * Returns the Header Check option * * @return boolean diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/NotExists.php --- a/web/lib/Zend/Validate/File/NotExists.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/NotExists.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NotExists.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: NotExists.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_NotExists extends Zend_Validate_File_Exists diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Sha1.php --- a/web/lib/Zend/Validate/File/Sha1.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Sha1.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sha1.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Sha1.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Size.php --- a/web/lib/Zend/Validate/File/Size.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Size.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Size.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Size.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Size extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/Upload.php --- a/web/lib/Zend/Validate/File/Upload.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/Upload.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upload.php 22398 2010-06-09 19:05:46Z thomas $ + * @version $Id: Upload.php 24959 2012-06-15 13:51:04Z adamlundrigan $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Upload extends Zend_Validate_Abstract @@ -136,6 +136,11 @@ $this->_files = $files; } + // see ZF-10738 + if (is_null($this->_files)) { + $this->_files = array(); + } + foreach($this->_files as $file => $content) { if (!isset($content['error'])) { unset($this->_files[$file]); @@ -180,40 +185,40 @@ switch($content['error']) { case 0: if (!is_uploaded_file($content['tmp_name'])) { - $this->_throw($file, self::ATTACK); + $this->_throw($content, self::ATTACK); } break; case 1: - $this->_throw($file, self::INI_SIZE); + $this->_throw($content, self::INI_SIZE); break; case 2: - $this->_throw($file, self::FORM_SIZE); + $this->_throw($content, self::FORM_SIZE); break; case 3: - $this->_throw($file, self::PARTIAL); + $this->_throw($content, self::PARTIAL); break; case 4: - $this->_throw($file, self::NO_FILE); + $this->_throw($content, self::NO_FILE); break; case 6: - $this->_throw($file, self::NO_TMP_DIR); + $this->_throw($content, self::NO_TMP_DIR); break; case 7: - $this->_throw($file, self::CANT_WRITE); + $this->_throw($content, self::CANT_WRITE); break; case 8: - $this->_throw($file, self::EXTENSION); + $this->_throw($content, self::EXTENSION); break; default: - $this->_throw($file, self::UNKNOWN); + $this->_throw($content, self::UNKNOWN); break; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/File/WordCount.php --- a/web/lib/Zend/Validate/File/WordCount.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/File/WordCount.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WordCount.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: WordCount.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Float.php --- a/web/lib/Zend/Validate/Float.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Float.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Float.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Float.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Float extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/GreaterThan.php --- a/web/lib/Zend/Validate/GreaterThan.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/GreaterThan.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GreaterThan.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: GreaterThan.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_GreaterThan extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Hex.php --- a/web/lib/Zend/Validate/Hex.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Hex.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hex.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Hex.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Hex extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Hostname.php --- a/web/lib/Zend/Validate/Hostname.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Hostname.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hostname.php 22830 2010-08-12 16:05:09Z thomas $ + * @version $Id: Hostname.php 25061 2012-11-02 21:24:09Z rob $ */ /** @@ -41,7 +41,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Hostname extends Zend_Validate_Abstract @@ -100,12 +100,12 @@ /** * Allows all types of hostnames */ - const ALLOW_ALL = 7; + const ALLOW_URI = 8; /** * Allows all types of hostnames */ - const ALLOW_URI = 8; + const ALLOW_ALL = 15; /** * Array of valid top-level-domains @@ -133,7 +133,7 @@ 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', - 'ye', 'yt', 'yu', 'za', 'zm', 'zw' + 'xxx', 'ye', 'yt', 'yu', 'za', 'zm', 'zw' ); /** @@ -205,7 +205,7 @@ 'CN' => 'Hostname/Cn.php', 'COM' => 'Zend/Validate/Hostname/Com.php', 'DE' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'), - 'DK' => array(1 => '/^[\x{002d}0-9a-zäéöü]{1,63}$/iu'), + 'DK' => array(1 => '/^[\x{002d}0-9a-zäéöüæøå]{1,63}$/iu'), 'ES' => array(1 => '/^[\x{002d}0-9a-zàáçèéíïñòóúü·]{1,63}$/iu'), 'EU' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu', 2 => '/^[\x{002d}0-9a-zāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıĵķĺļľŀłńņňŉŋōŏőœŕŗřśŝšťŧũūŭůűųŵŷźżž]{1,63}$/iu', @@ -283,6 +283,10 @@ 'SA' => array(1 => '/^[\x{002d}.0-9\x{0621}-\x{063A}\x{0641}-\x{064A}\x{0660}-\x{0669}]{1,63}$/iu'), 'SE' => array(1 => '/^[\x{002d}0-9a-zäåéöü]{1,63}$/iu'), 'SH' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'), + 'SI' => array( + 1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu', + 2 => '/^[\x{002d}0-9a-zāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıĵķĺļľŀłńņňŉŋōŏőœŕŗřśŝšťŧũūŭůűųŵŷźżž]{1,63}$/iu', + 3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu'), 'SJ' => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøüčđńŋšŧž]{1,63}$/iu'), 'TH' => array(1 => '/^[\x{002d}0-9a-z\x{0E01}-\x{0E3A}\x{0E40}-\x{0E4D}\x{0E50}-\x{0E59}]{1,63}$/iu'), 'TM' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿāăąćĉċčďđēėęěĝġģĥħīįĵķĺļľŀłńņňŋőœŕŗřśŝşšţťŧūŭůűųŵŷźżž]{1,63}$/iu'), @@ -502,7 +506,7 @@ $this->_setValue($value); // Check input against IP address schema - if (preg_match('/^[0-9.a-e:.]*$/i', $value) && + if (preg_match('/^[0-9a-f:.]*$/i', $value) && $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) { if (!($this->_options['allow'] & self::ALLOW_IP)) { $this->_error(self::IP_ADDRESS_NOT_ALLOWED); @@ -512,8 +516,36 @@ } } + // RFC3986 3.2.2 states: + // + // The rightmost domain label of a fully qualified domain name + // in DNS may be followed by a single "." and should be if it is + // necessary to distinguish between the complete domain name and + // some local domain. + // + // (see ZF-6363) + + // Local hostnames are allowed to be partitial (ending '.') + if ($this->_options['allow'] & self::ALLOW_LOCAL) { + if (substr($value, -1) === '.') { + $value = substr($value, 0, -1); + if (substr($value, -1) === '.') { + // Empty hostnames (ending '..') are not allowed + $this->_error(self::INVALID_LOCAL_NAME); + return false; + } + } + } + + $domainParts = explode('.', $value); + + // Prevent partitial IP V4 adresses (ending '.') + if ((count($domainParts) == 4) && preg_match('/^[0-9.a-e:.]*$/i', $value) && + $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) { + $this->_error(self::INVALID_LOCAL_NAME); + } + // Check input against DNS hostname schema - $domainParts = explode('.', $value); if ((count($domainParts) > 1) && (strlen($value) >= 4) && (strlen($value) <= 254)) { $status = false; @@ -634,7 +666,7 @@ } // Check input against local network name schema; last chance to pass validation - $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}){1,254}$/'; + $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}[\x2e]{0,1}){1,254}$/'; $status = @preg_match($regexLocal, $value); // If the input passes as a local network name, and local network names are allowed, then the diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Hostname/Biz.php --- a/web/lib/Zend/Validate/Hostname/Biz.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Hostname/Biz.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Biz.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Biz.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Hostname/Cn.php --- a/web/lib/Zend/Validate/Hostname/Cn.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Hostname/Cn.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cn.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cn.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Hostname/Com.php --- a/web/lib/Zend/Validate/Hostname/Com.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Hostname/Com.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Com.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Com.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Hostname/Jp.php --- a/web/lib/Zend/Validate/Hostname/Jp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Hostname/Jp.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Jp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Jp.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Iban.php --- a/web/lib/Zend/Validate/Iban.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Iban.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iban.php 22400 2010-06-09 19:25:02Z thomas $ + * @version $Id: Iban.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Iban extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Identical.php --- a/web/lib/Zend/Validate/Identical.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Identical.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identical.php 22075 2010-05-02 13:42:08Z thomas $ + * @version $Id: Identical.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Validate_Abstract */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Identical extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/InArray.php --- a/web/lib/Zend/Validate/InArray.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/InArray.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InArray.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: InArray.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_InArray extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Int.php --- a/web/lib/Zend/Validate/Int.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Int.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Int.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Int.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Int extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Interface.php --- a/web/lib/Zend/Validate/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 23262 2010-10-27 14:03:36Z matthew $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Validate_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Ip.php --- a/web/lib/Zend/Validate/Ip.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Ip.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ip.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Ip.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Ip extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Isbn.php --- a/web/lib/Zend/Validate/Isbn.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Isbn.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Isbn.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Isbn.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Isbn extends Zend_Validate_Abstract @@ -45,7 +45,7 @@ */ protected $_messageTemplates = array( self::INVALID => "Invalid type given. String or integer expected", - self::NO_ISBN => "'%value%' is no valid ISBN number", + self::NO_ISBN => "'%value%' is not a valid ISBN number", ); /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Ldap/Dn.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/lib/Zend/Validate/Ldap/Dn.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,65 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Validate + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: Abstract.php 24807 2012-05-15 12:10:42Z adamlundrigan $ + */ + +/** + * @see Zend_Validate_Interface + */ +require_once 'Zend/Validate/Abstract.php'; + +/** + * @category Zend + * @package Zend_Validate + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Validate_Ldap_Dn extends Zend_Validate_Abstract +{ + + const MALFORMED = 'malformed'; + + /** + * Validation failure message template definitions. + * + * @var array + */ + protected $_messageTemplates = array( + self::MALFORMED => 'DN is malformed', + ); + + /** + * Defined by Zend_Validate_Interface. + * + * Returns true if and only if $value is a valid DN. + * + * @param string $value The value to be validated. + * + * @return boolean + */ + public function isValid($value) + { + $valid = Zend_Ldap_Dn::checkDn($value); + if ($valid === false) { + $this->_error(self::MALFORMED); + return false; + } + return true; + } +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/LessThan.php --- a/web/lib/Zend/Validate/LessThan.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/LessThan.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LessThan.php 20182 2010-01-10 21:12:01Z thomas $ + * @version $Id: LessThan.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_LessThan extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/NotEmpty.php --- a/web/lib/Zend/Validate/NotEmpty.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/NotEmpty.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NotEmpty.php 22691 2010-07-26 19:29:14Z thomas $ + * @version $Id: NotEmpty.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/PostCode.php --- a/web/lib/Zend/Validate/PostCode.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/PostCode.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PostCode.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: PostCode.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_PostCode extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Regex.php --- a/web/lib/Zend/Validate/Regex.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Regex.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Regex.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Regex.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Regex extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Sitemap/Changefreq.php --- a/web/lib/Zend/Validate/Sitemap/Changefreq.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Sitemap/Changefreq.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Changefreq.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Changefreq.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract @@ -51,7 +51,7 @@ * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is no valid sitemap changefreq", + self::NOT_VALID => "'%value%' is not a valid sitemap changefreq", self::INVALID => "Invalid type given. String expected", ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Sitemap/Lastmod.php --- a/web/lib/Zend/Validate/Sitemap/Lastmod.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Sitemap/Lastmod.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lastmod.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Lastmod.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract @@ -57,7 +57,7 @@ * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is no valid sitemap lastmod", + self::NOT_VALID => "'%value%' is not a valid sitemap lastmod", self::INVALID => "Invalid type given. String expected", ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Sitemap/Loc.php --- a/web/lib/Zend/Validate/Sitemap/Loc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Sitemap/Loc.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Loc.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Loc.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract @@ -56,7 +56,7 @@ * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is no valid sitemap location", + self::NOT_VALID => "'%value%' is not a valid sitemap location", self::INVALID => "Invalid type given. String expected", ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/Sitemap/Priority.php --- a/web/lib/Zend/Validate/Sitemap/Priority.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/Sitemap/Priority.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Priority.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Priority.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract @@ -51,7 +51,7 @@ * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is no valid sitemap priority", + self::NOT_VALID => "'%value%' is not a valid sitemap priority", self::INVALID => "Invalid type given. Numeric string, integer or float expected", ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Validate/StringLength.php --- a/web/lib/Zend/Validate/StringLength.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Validate/StringLength.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringLength.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: StringLength.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_StringLength extends Zend_Validate_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Version.php --- a/web/lib/Zend/Version.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Version.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Version - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Version.php 23455 2010-11-29 16:24:55Z matthew $ + * @version $Id: Version.php 25289 2013-03-13 16:51:14Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Version - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Version @@ -32,14 +32,14 @@ /** * Zend Framework version identification - see compareVersion() */ - const VERSION = '1.11.1'; + const VERSION = '1.12.3'; /** * The latest stable version Zend Framework available - * + * * @var string */ - protected static $_lastestVersion; + protected static $_latestVersion; /** * Compare the specified Zend Framework version string $version @@ -60,22 +60,22 @@ /** * Fetches the version of the latest stable release - * + * * @link http://framework.zend.com/download/latest * @return string */ public static function getLatest() { - if (null === self::$_lastestVersion) { - self::$_lastestVersion = 'not available'; + if (null === self::$_latestVersion) { + self::$_latestVersion = 'not available'; - $handle = fopen('http://framework.zend.com/api/zf-version', 'r'); + $handle = fopen('http://framework.zend.com/api/zf-version', 'r'); if (false !== $handle) { - self::$_lastestVersion = stream_get_contents($handle); + self::$_latestVersion = stream_get_contents($handle); fclose($handle); } } - return self::$_lastestVersion; + return self::$_latestVersion; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View.php --- a/web/lib/Zend/View.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: View.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View extends Zend_View_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Abstract.php --- a/web/lib/Zend/View/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22446 2010-06-18 12:11:43Z matthew $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @see Zend_Loader */ @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Abstract implements Zend_View_Interface @@ -221,6 +221,14 @@ $this->setLfiProtection($config['lfiProtectionOn']); } + if (array_key_exists('assign', $config) + && is_array($config['assign']) + ) { + foreach ($config['assign'] as $key => $value) { + $this->assign($key, $value); + } + } + $this->init(); } @@ -948,7 +956,7 @@ /** * Finds a view script from the available directories. * - * @param $name string The base name of the script. + * @param string $name The base name of the script. * @return void */ protected function _script($name) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Exception.php --- a/web/lib/Zend/View/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -13,9 +13,9 @@ * to license@zend.com so we can send you a copy immediately. * * @category Zend - * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @package Zend_View + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,8 +30,8 @@ * Exception for Zend_View class. * * @category Zend - * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @package Zend_View + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Abstract.php --- a/web/lib/Zend/View/Helper/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Abstract implements Zend_View_Helper_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Action.php --- a/web/lib/Zend/View/Helper/Action.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Action.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Action.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Action.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Action extends Zend_View_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/BaseUrl.php --- a/web/lib/Zend/View/Helper/BaseUrl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/BaseUrl.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: BaseUrl.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: BaseUrl.php 25024 2012-07-30 15:08:15Z rob $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_BaseUrl extends Zend_View_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Currency.php --- a/web/lib/Zend/View/Helper/Currency.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Currency.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Currency.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Currency.php 24768 2012-05-06 03:08:09Z adamlundrigan $ */ /** Zend_View_Helper_Abstract.php */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract @@ -61,8 +61,9 @@ /** * Output a formatted currency * - * @param integer|float $value Currency value to output - * @param string|Zend_Locale|Zend_Currency $currency OPTIONAL Currency to use for this call + * @param integer|float $value Currency value to output + * @param string|Zend_Locale|array $currency OPTIONAL Currency to use for + * this call * @return string Formatted currency */ public function currency($value = null, $currency = null) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Cycle.php --- a/web/lib/Zend/View/Helper/Cycle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Cycle.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Cycle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Cycle.php 25024 2012-07-30 15:08:15Z rob $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Cycle implements Iterator @@ -92,7 +92,7 @@ /** * Sets actual name of cycle * - * @param $name + * @param string $name * @return Zend_View_Helper_Cycle */ public function setName($name = self::DEFAULT_NAME) @@ -111,7 +111,6 @@ /** * Gets actual name of cycle * - * @param $name * @return string */ public function getName() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/DeclareVars.php --- a/web/lib/Zend/View/Helper/DeclareVars.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/DeclareVars.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: DeclareVars.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: DeclareVars.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_DeclareVars extends Zend_View_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Doctype.php --- a/web/lib/Zend/View/Helper/Doctype.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Doctype.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Doctype.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Doctype.php 25101 2012-11-07 20:27:27Z rob $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract @@ -43,6 +43,8 @@ const XHTML1_STRICT = 'XHTML1_STRICT'; const XHTML1_TRANSITIONAL = 'XHTML1_TRANSITIONAL'; const XHTML1_FRAMESET = 'XHTML1_FRAMESET'; + const XHTML1_RDFA = 'XHTML1_RDFA'; + const XHTML1_RDFA11 = 'XHTML1_RDFA11'; const XHTML_BASIC1 = 'XHTML_BASIC1'; const XHTML5 = 'XHTML5'; const HTML4_STRICT = 'HTML4_STRICT'; @@ -87,6 +89,8 @@ self::XHTML1_STRICT => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">', self::XHTML1_TRANSITIONAL => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', self::XHTML1_FRAMESET => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">', + self::XHTML1_RDFA => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">', + self::XHTML1_RDFA11 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">', self::XHTML_BASIC1 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">', self::XHTML5 => '<!DOCTYPE html>', self::HTML4_STRICT => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">', @@ -117,6 +121,8 @@ case self::XHTML1_TRANSITIONAL: case self::XHTML1_FRAMESET: case self::XHTML_BASIC1: + case self::XHTML1_RDFA: + case self::XHTML1_RDFA11: case self::XHTML5: case self::HTML4_STRICT: case self::HTML4_LOOSE: @@ -186,15 +192,42 @@ { return (stristr($this->getDoctype(), 'xhtml') ? true : false); } - - /** - * Is doctype HTML5? (HeadMeta uses this for validation) - * - * @return booleean - */ - public function isHtml5() { - return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false); - } + + /** + * Is doctype strict? + * + * @return boolean + */ + public function isStrict() + { + switch ( $this->getDoctype() ) + { + case self::XHTML1_STRICT: + case self::XHTML11: + case self::HTML4_STRICT: + return true; + default: + return false; + } + } + + /** + * Is doctype HTML5? (HeadMeta uses this for validation) + * + * @return booleean + */ + public function isHtml5() { + return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false); + } + + /** + * Is doctype RDFa? + * + * @return booleean + */ + public function isRdfa() { + return (stristr($this->getDoctype(), 'rdfa') ? true : false); + } /** * String representation of doctype diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Fieldset.php --- a/web/lib/Zend/View/Helper/Fieldset.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Fieldset.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Fieldset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Fieldset.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Fieldset extends Zend_View_Helper_FormElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Form.php --- a/web/lib/Zend/View/Helper/Form.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Form.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Form.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Form extends Zend_View_Helper_FormElement @@ -55,9 +55,20 @@ if (array_key_exists('id', $attribs) && empty($attribs['id'])) { unset($attribs['id']); } + + if (!empty($name) && !($this->_isXhtml() && $this->_isStrictDoctype())) { + $name = ' name="' . $this->view->escape($name) . '"'; + } else { + $name = ''; + } + + if ( array_key_exists('name', $attribs) && empty($attribs['id'])) { + unset($attribs['id']); + } $xhtml = '<form' . $id + . $name . $this->_htmlAttribs($attribs) . '>'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormButton.php --- a/web/lib/Zend/View/Helper/FormButton.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormButton.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormButton.php 22290 2010-05-25 14:27:12Z matthew $ + * @version $Id: FormButton.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormButton extends Zend_View_Helper_FormElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormCheckbox.php --- a/web/lib/Zend/View/Helper/FormCheckbox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormCheckbox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormCheckbox.php 24825 2012-05-29 20:42:55Z rob $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormCheckbox extends Zend_View_Helper_FormElement @@ -81,17 +81,18 @@ $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; + // build the element + $xhtml = ''; + if ((!$disable && !strstr($name, '[]')) + && (empty($attribs['disableHidden']) || !$attribs['disableHidden']) + ) { + $xhtml = $this->_hidden($name, $checkedOptions['uncheckedValue']); } - // build the element - $xhtml = ''; - if (!$disable && !strstr($name, '[]')) { - $xhtml = $this->_hidden($name, $checkedOptions['uncheckedValue']); + if (array_key_exists('disableHidden', $attribs)) { + unset($attribs['disableHidden']); } + $xhtml .= '<input type="checkbox"' . ' name="' . $this->view->escape($name) . '"' . ' id="' . $this->view->escape($id) . '"' @@ -99,7 +100,7 @@ . $checkedOptions['checkedString'] . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormElement.php --- a/web/lib/Zend/View/Helper/FormElement.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormElement.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormElement.php 22290 2010-05-25 14:27:12Z matthew $ + * @version $Id: FormElement.php 24823 2012-05-29 19:52:12Z rob $ */ /** @@ -31,20 +31,20 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_FormElement extends Zend_View_Helper_HtmlElement { /** - * @var Zend_Translate + * @var Zend_Translate_Adapter|null */ protected $_translator; /** * Get translator * - * @return Zend_Translate + * @return Zend_Translate_Adapter|null */ public function getTranslator() { @@ -54,7 +54,7 @@ /** * Set translator * - * @param $translator|null Zend_Translate + * @param Zend_Translate|Zend_Translate_Adapter|null $translator * @return Zend_View_Helper_FormElement */ public function setTranslator($translator = null) @@ -115,7 +115,7 @@ } } - // If all helper options are passed as an array, attribs may have + // If all helper options are passed as an array, attribs may have // been as well if (null === $attribs) { $attribs = $info['attribs']; @@ -146,6 +146,16 @@ $info['id'] = trim(strtr($info['name'], array('[' => '-', ']' => '')), '-'); } + + // Remove NULL name attribute override + if (array_key_exists('name', $attribs) && is_null($attribs['name'])) { + unset($attribs['name']); + } + + // Override name in info if specified in attribs + if (array_key_exists('name', $attribs) && $attribs['name'] != $info['name']) { + $info['name'] = $attribs['name']; + } // Determine escaping from attributes if (array_key_exists('escape', $attribs)) { @@ -178,11 +188,9 @@ * * @access protected * - * @param $name The element name. - * - * @param $value The element value. - * - * @param $attribs Attributes for the element. + * @param string $name The element name. + * @param string $value The element value. + * @param array $attribs Attributes for the element. * * @return string A hidden element. */ diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormErrors.php --- a/web/lib/Zend/View/Helper/FormErrors.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormErrors.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormErrors.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormErrors.php 25207 2013-01-10 11:36:54Z frosch $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormErrors extends Zend_View_Helper_FormElement @@ -69,6 +69,16 @@ $options['class'] = 'errors'; } + if (isset($options['elementStart'])) { + $this->setElementStart($options['elementStart']); + } + if (isset($options['elementEnd'])) { + $this->setElementEnd($options['elementEnd']); + } + if (isset($options['elementSeparator'])) { + $this->setElementSeparator($options['elementSeparator']); + } + $start = $this->getElementStart(); if (strstr($start, '%s')) { $attribs = $this->_htmlAttribs($options); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormFile.php --- a/web/lib/Zend/View/Helper/FormFile.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormFile.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormFile.php 24750 2012-05-05 01:24:21Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormFile extends Zend_View_Helper_FormElement @@ -62,19 +62,13 @@ $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // build the element $xhtml = '<input type="file"' . ' name="' . $this->view->escape($name) . '"' . ' id="' . $this->view->escape($id) . '"' . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormHidden.php --- a/web/lib/Zend/View/Helper/FormHidden.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormHidden.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormHidden.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormHidden.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormHidden extends Zend_View_Helper_FormElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormImage.php --- a/web/lib/Zend/View/Helper/FormImage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormImage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormImage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormImage.php 24750 2012-05-05 01:24:21Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormImage extends Zend_View_Helper_FormElement @@ -80,12 +80,6 @@ $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // build the element $xhtml = '<input type="image"' . ' name="' . $this->view->escape($name) . '"' @@ -94,7 +88,7 @@ . $value . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormLabel.php --- a/web/lib/Zend/View/Helper/FormLabel.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormLabel.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormLabel.php 22290 2010-05-25 14:27:12Z matthew $ + * @version $Id: FormLabel.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_View_Helper_FormElement **/ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormLabel extends Zend_View_Helper_FormElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormMultiCheckbox.php --- a/web/lib/Zend/View/Helper/FormMultiCheckbox.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormMultiCheckbox.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormMultiCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormMultiCheckbox.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormMultiCheckbox extends Zend_View_Helper_FormRadio diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormNote.php --- a/web/lib/Zend/View/Helper/FormNote.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormNote.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormNote.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormNote.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormNote extends Zend_View_Helper_FormElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormPassword.php --- a/web/lib/Zend/View/Helper/FormPassword.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormPassword.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormPassword.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormPassword.php 24750 2012-05-05 01:24:21Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormPassword extends Zend_View_Helper_FormElement @@ -74,12 +74,6 @@ unset($attribs['renderPassword']); } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // render the element $xhtml = '<input type="password"' . ' name="' . $this->view->escape($name) . '"' @@ -87,7 +81,7 @@ . $valueString . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormRadio.php --- a/web/lib/Zend/View/Helper/FormRadio.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormRadio.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormRadio.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormRadio.php 24865 2012-06-02 01:02:32Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormRadio extends Zend_View_Helper_FormElement @@ -123,15 +123,14 @@ // ensure value is an array to allow matching multiple times $value = (array) $value; - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - + // Set up the filter - Alnum + hyphen + underscore + require_once 'Zend/Filter/PregReplace.php'; + $pattern = @preg_match('/\pL/u', 'a') + ? '/[^\p{L}\p{N}\-\_]/u' // Unicode + : '/[^a-zA-Z0-9\-\_]/'; // No Unicode + $filter = new Zend_Filter_PregReplace($pattern, ""); + // add radio buttons to the list. - require_once 'Zend/Filter/Alnum.php'; - $filter = new Zend_Filter_Alnum(); foreach ($options as $opt_value => $opt_label) { // Should the label be escaped? @@ -158,7 +157,7 @@ // Wrap the radios in labels $radio = '<label' - . $this->_htmlAttribs($label_attribs) . ' for="' . $optId . '">' + . $this->_htmlAttribs($label_attribs) . '>' . (('prepend' == $labelPlacement) ? $opt_label : '') . '<input type="' . $this->_inputType . '"' . ' name="' . $name . '"' @@ -167,13 +166,18 @@ . $checked . $disabled . $this->_htmlAttribs($attribs) - . $endTag + . $this->getClosingBracket() . (('append' == $labelPlacement) ? $opt_label : '') . '</label>'; // add to the array of radio buttons $list[] = $radio; } + + // XHTML or HTML for standard list separator? + if (!$this->_isXhtml() && false !== strpos($listsep, '<br />')) { + $listsep = str_replace('<br />', '<br>', $listsep); + } // done! $xhtml .= implode($listsep, $list); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormReset.php --- a/web/lib/Zend/View/Helper/FormReset.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormReset.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormReset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormReset.php 24750 2012-05-05 01:24:21Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormReset extends Zend_View_Helper_FormElement @@ -64,12 +64,6 @@ $disabled = ' disabled="disabled"'; } - // get closing tag - $endTag = '>'; - if ($this->view->doctype()->isXhtml()) { - $endTag = ' />'; - } - // Render button $xhtml = '<input type="reset"' . ' name="' . $this->view->escape($name) . '"' @@ -82,7 +76,7 @@ } // add attributes, close, and return - $xhtml .= $this->_htmlAttribs($attribs) . $endTag; + $xhtml .= $this->_htmlAttribs($attribs) . $this->getClosingBracket(); return $xhtml; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormSelect.php --- a/web/lib/Zend/View/Helper/FormSelect.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormSelect.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormSelect.php 25187 2013-01-08 08:21:00Z frosch $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormSelect extends Zend_View_Helper_FormElement @@ -52,6 +52,9 @@ * multiple-select elements). * * @param array|string $attribs Attributes added to the 'select' tag. + * the optional 'optionClasses' attribute is used to add a class to + * the options within the select (associative array linking the option + * value to the desired class) * * @param array $options An array of key-value pairs where the array * key is the radio value, and the array value is the radio text. @@ -96,6 +99,13 @@ unset($attribs['multiple']); } + // handle the options classes + $optionClasses = array(); + if (isset($attribs['optionClasses'])) { + $optionClasses = $attribs['optionClasses']; + unset($attribs['optionClasses']); + } + // now start building the XHTML. $disabled = ''; if (true === $disable) { @@ -123,15 +133,18 @@ if (null !== $translator) { $opt_value = $translator->translate($opt_value); } + $opt_id = ' id="' . $this->view->escape($id) . '-optgroup-' + . $this->view->escape($opt_value) . '"'; $list[] = '<optgroup' . $opt_disable + . $opt_id . ' label="' . $this->view->escape($opt_value) .'">'; foreach ($opt_label as $val => $lab) { - $list[] = $this->_build($val, $lab, $value, $disable); + $list[] = $this->_build($val, $lab, $value, $disable, $optionClasses); } $list[] = '</optgroup>'; } else { - $list[] = $this->_build($opt_value, $opt_label, $value, $disable); + $list[] = $this->_build($opt_value, $opt_label, $value, $disable, $optionClasses); } } @@ -148,18 +161,27 @@ * @param string $label Options Label * @param array $selected The option value(s) to mark as 'selected' * @param array|bool $disable Whether the select is disabled, or individual options are + * @param array $optionClasses The classes to associate with each option value * @return string Option Tag XHTML */ - protected function _build($value, $label, $selected, $disable) + protected function _build($value, $label, $selected, $disable, $optionClasses = array()) { if (is_bool($disable)) { $disable = array(); } + $class = null; + if (array_key_exists($value, $optionClasses)) { + $class = $optionClasses[$value]; + } + + $opt = '<option' - . ' value="' . $this->view->escape($value) . '"' - . ' label="' . $this->view->escape($label) . '"'; + . ' value="' . $this->view->escape($value) . '"'; + if ($class) { + $opt .= ' class="' . $class . '"'; + } // selected? if (in_array((string) $value, $selected)) { $opt .= ' selected="selected"'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormSubmit.php --- a/web/lib/Zend/View/Helper/FormSubmit.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormSubmit.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormSubmit.php 23403 2010-11-19 19:23:29Z bittarman $ + * @version $Id: FormSubmit.php 24750 2012-05-05 01:24:21Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormSubmit extends Zend_View_Helper_FormElement @@ -67,12 +67,6 @@ $id = ' id="' . $this->view->escape($id) . '"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // Render the button. $xhtml = '<input type="submit"' . ' name="' . $this->view->escape($name) . '"' @@ -80,7 +74,7 @@ . ' value="' . $this->view->escape($value) . '"' . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormText.php --- a/web/lib/Zend/View/Helper/FormText.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormText.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormText.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormText.php 24750 2012-05-05 01:24:21Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormText extends Zend_View_Helper_FormElement @@ -65,19 +65,13 @@ $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - $xhtml = '<input type="text"' . ' name="' . $this->view->escape($name) . '"' . ' id="' . $this->view->escape($id) . '"' . ' value="' . $this->view->escape($value) . '"' . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/FormTextarea.php --- a/web/lib/Zend/View/Helper/FormTextarea.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/FormTextarea.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormTextarea.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormTextarea extends Zend_View_Helper_FormElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Gravatar.php --- a/web/lib/Zend/View/Helper/Gravatar.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Gravatar.php Sun Apr 21 21:54:24 2013 +0200 @@ -67,9 +67,9 @@ * @var array */ protected $_options = array( - 'img_size' => 80, - 'default_img' => self::DEFAULT_MM, - 'rating' => self::RATING_G, + 'img_size' => 80, + 'default_img' => self::DEFAULT_MM, + 'rating' => self::RATING_G, 'secure' => null, ); @@ -113,8 +113,8 @@ /** * Configure state - * - * @param array $options + * + * @param array $options * @return Zend_View_Helper_Gravatar */ public function setOptions(array $options) @@ -188,8 +188,8 @@ { switch ($rating) { case self::RATING_G: - case self::RATING_PG: - case self::RATING_R: + case self::RATING_PG: + case self::RATING_R: case self::RATING_X: $this->_options['rating'] = $rating; break; @@ -244,7 +244,7 @@ public function setSecure($flag) { $this->_options['secure'] = ($flag === null) ? null : (bool) $flag; - return $this; + return $this; } /** @@ -264,8 +264,8 @@ * Get attribs of image * * Warning! - * If you set src attrib, you get it, but this value will be overwritten in - * protected method _setSrcAttribForImg(). And finally your get other src + * If you set src attrib, you get it, but this value will be overwritten in + * protected method _setSrcAttribForImg(). And finally your get other src * value! * * @return array @@ -303,7 +303,7 @@ /** * Get avatar url (including size, rating and default image oprions) - * + * * @return string */ protected function _getAvatarUrl() @@ -336,9 +336,9 @@ } /** - * Return valid image tag + * Return valid image tag * - * @return string + * @return string */ public function getImgTag() { @@ -349,7 +349,7 @@ return $html; } - + /** * Return valid image tag * diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HeadLink.php --- a/web/lib/Zend/View/Helper/HeadLink.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HeadLink.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadLink.php 23249 2010-10-26 12:46:47Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadLink.php 24858 2012-06-01 01:24:17Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_Standalone @@ -40,7 +40,19 @@ * * @var array */ - protected $_itemKeys = array('charset', 'href', 'hreflang', 'id', 'media', 'rel', 'rev', 'type', 'title', 'extras'); + protected $_itemKeys = array( + 'charset', + 'href', + 'hreflang', + 'id', + 'media', + 'rel', + 'rev', + 'type', + 'title', + 'extras', + 'sizes', + ); /** * @var string registry key @@ -379,7 +391,7 @@ } $attributes = compact('rel', 'type', 'href', 'media', 'conditionalStylesheet', 'extras'); - return $this->createData($attributes); + return $this->createData($this->_applyExtras($attributes)); } /** @@ -432,6 +444,24 @@ $title = (string) $title; $attributes = compact('rel', 'href', 'type', 'title', 'extras'); - return $this->createData($attributes); + return $this->createData($this->_applyExtras($attributes)); + } + + /** + * Apply any overrides specified in the 'extras' array + * @param array $attributes + * @return array + */ + protected function _applyExtras($attributes) + { + if (isset($attributes['extras'])) { + foreach ($attributes['extras'] as $eKey=>$eVal) { + if (isset($attributes[$eKey])) { + $attributes[$eKey] = $eVal; + unset($attributes['extras'][$eKey]); + } + } + } + return $attributes; } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HeadMeta.php --- a/web/lib/Zend/View/Helper/HeadMeta.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HeadMeta.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadMeta.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadMeta.php 24776 2012-05-08 18:36:40Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_Standalone @@ -39,7 +39,7 @@ * Types of attributes * @var array */ - protected $_typeKeys = array('name', 'http-equiv', 'charset'); + protected $_typeKeys = array('name', 'http-equiv', 'charset', 'property'); protected $_requiredKeys = array('content'); protected $_modifierKeys = array('lang', 'scheme'); @@ -98,6 +98,8 @@ return 'name'; case 'HttpEquiv': return 'http-equiv'; + case 'Property': + return 'property'; default: require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid type "%s" passed to _normalizeType', $type)); @@ -118,6 +120,10 @@ * - offsetGetHttpEquiv($index, $keyValue, $content, $modifers = array()) * - prependHttpEquiv($keyValue, $content, $modifiers = array()) * - setHttpEquiv($keyValue, $content, $modifiers = array()) + * - appendProperty($keyValue, $content, $modifiers = array()) + * - offsetGetProperty($index, $keyValue, $content, $modifiers = array()) + * - prependProperty($keyValue, $content, $modifiers = array()) + * - setProperty($keyValue, $content, $modifiers = array()) * * @param string $method * @param array $args @@ -125,7 +131,7 @@ */ public function __call($method, $args) { - if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv)$/', $method, $matches)) { + if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property)$/', $method, $matches)) { $action = $matches['action']; $type = $this->_normalizeType($matches['type']); $argc = count($args); @@ -162,14 +168,14 @@ return parent::__call($method, $args); } - /** - * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8"> - * - * Not valid in a non-HTML5 doctype - * - * @param string $charset - * @return Zend_View_Helper_HeadMeta Provides a fluent interface - */ + /** + * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8"> + * + * Not valid in a non-HTML5 doctype + * + * @param string $charset + * @return Zend_View_Helper_HeadMeta Provides a fluent interface + */ public function setCharset($charset) { $item = new stdClass; @@ -196,9 +202,16 @@ return false; } + $isHtml5 = is_null($this->view) ? false : $this->view->doctype()->isHtml5(); + if (!isset($item->content) - && (! $this->view->doctype()->isHtml5() - || (! $this->view->doctype()->isHtml5() && $item->type !== 'charset'))) { + && (! $isHtml5 || (! $isHtml5 && $item->type !== 'charset'))) { + return false; + } + + // <meta property= ... /> is only supported with doctype RDFa + if ( !is_null($this->view) && !$this->view->doctype()->isRdfa() + && $item->type === 'property') { return false; } @@ -329,7 +342,7 @@ $modifiersString = ''; foreach ($item->modifiers as $key => $value) { - if ($this->view->doctype()->isHtml5() + if (!is_null($this->view) && $this->view->doctype()->isHtml5() && $key == 'scheme') { require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception('Invalid modifier ' @@ -344,9 +357,9 @@ if ($this->view instanceof Zend_View_Abstract) { if ($this->view->doctype()->isHtml5() && $type == 'charset') { - $tpl = ($this->view->doctype()->isXhtml()) - ? '<meta %s="%s"/>' - : '<meta %s="%s">'; + $tpl = ($this->view->doctype()->isXhtml()) + ? '<meta %s="%s"/>' + : '<meta %s="%s">'; } elseif ($this->view->doctype()->isXhtml()) { $tpl = '<meta %s="%s" content="%s" %s/>'; } else { @@ -363,6 +376,14 @@ $this->_escape($item->content), $modifiersString ); + + if (isset($item->modifiers['conditional']) + && !empty($item->modifiers['conditional']) + && is_string($item->modifiers['conditional'])) + { + $meta = ''; + } + return $meta; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HeadScript.php --- a/web/lib/Zend/View/Helper/HeadScript.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HeadScript.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadScript.php 20363 2010-01-17 22:55:25Z mabe $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadScript.php 24960 2012-06-15 14:09:34Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container_Standalone @@ -245,7 +245,7 @@ break; case 'file': default: - if (!$this->_isDuplicate($content)) { + if (!$this->_isDuplicate($content) || $action=='set') { $attrs['src'] = $content; $item = $this->createData($type, $attrs); if ('offsetSet' == $action) { @@ -371,7 +371,6 @@ throw $e; } - $this->_isValid($value); return $this->getContainer()->offsetSet($index, $value); } @@ -411,8 +410,8 @@ $attrString = ''; if (!empty($item->attributes)) { foreach ($item->attributes as $key => $value) { - if (!$this->arbitraryAttributesAllowed() - && !in_array($key, $this->_optionalAttributes)) + if ((!$this->arbitraryAttributesAllowed() && !in_array($key, $this->_optionalAttributes)) + || in_array($key, array('conditional', 'noescape'))) { continue; } @@ -423,10 +422,24 @@ } } + $addScriptEscape = !(isset($item->attributes['noescape']) && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN)); + $type = ($this->_autoEscape) ? $this->_escape($item->type) : $item->type; $html = '<script type="' . $type . '"' . $attrString . '>'; if (!empty($item->source)) { - $html .= PHP_EOL . $indent . ' ' . $escapeStart . PHP_EOL . $item->source . $indent . ' ' . $escapeEnd . PHP_EOL . $indent; + $html .= PHP_EOL ; + + if ($addScriptEscape) { + $html .= $indent . ' ' . $escapeStart . PHP_EOL; + } + + $html .= $indent . ' ' . $item->source; + + if ($addScriptEscape) { + $html .= $indent . ' ' . $escapeEnd . PHP_EOL; + } + + $html .= $indent; } $html .= '</script>'; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HeadStyle.php --- a/web/lib/Zend/View/Helper/HeadStyle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HeadStyle.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadStyle.php 20104 2010-01-06 21:26:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadStyle.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_Standalone @@ -355,14 +355,21 @@ } } + $escapeStart = $indent . ''. PHP_EOL; + if (isset($item->attributes['conditional']) + && !empty($item->attributes['conditional']) + && is_string($item->attributes['conditional']) + ) { + $escapeStart = null; + $escapeEnd = null; + } + $html = '<style type="text/css"' . $attrString . '>' . PHP_EOL - . $indent . '' . PHP_EOL + . $escapeStart . $indent . $item->content . PHP_EOL . $escapeEnd . '</style>'; - if (isset($item->attributes['conditional']) - && !empty($item->attributes['conditional']) - && is_string($item->attributes['conditional'])) - { + if (null == $escapeStart && null == $escapeEnd) { $html = ''; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HeadTitle.php --- a/web/lib/Zend/View/Helper/HeadTitle.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HeadTitle.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadTitle.php 23388 2010-11-19 00:37:55Z ramon $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadTitle.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_Standalone @@ -69,10 +69,10 @@ */ public function headTitle($title = null, $setType = null) { - if ($setType === null && $this->getDefaultAttachOrder() === null) { - $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND; - } elseif ($setType === null && $this->getDefaultAttachOrder() !== null) { - $setType = $this->getDefaultAttachOrder(); + if (null === $setType) { + $setType = (null === $this->getDefaultAttachOrder()) + ? Zend_View_Helper_Placeholder_Container_Abstract::APPEND + : $this->getDefaultAttachOrder(); } $title = (string) $title; if ($title !== '') { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HtmlElement.php --- a/web/lib/Zend/View/Helper/HtmlElement.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HtmlElement.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlElement.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlElement.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_HtmlElement extends Zend_View_Helper_Abstract @@ -76,6 +76,17 @@ } /** + * Is doctype strict? + * + * @return boolean + */ + protected function _isStrictDoctype() + { + $doctype = $this->view->doctype(); + return $doctype->isStrict(); + } + + /** * Converts an associative array to a string of tag attributes. * * @access public @@ -98,7 +109,11 @@ require_once 'Zend/Json.php'; $val = Zend_Json::encode($val); } - $val = preg_replace('/"([^"]*)":/', '$1:', $val); + // Escape single quotes inside event attribute values. + // This will create html, where the attribute value has + // single quotes around it, and escaped single quotes or + // non-escaped double quotes inside of it + $val = str_replace('\'', ''', $val); } else { if (is_array($val)) { $val = implode(' ', $val); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HtmlFlash.php --- a/web/lib/Zend/View/Helper/HtmlFlash.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HtmlFlash.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlFlash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlFlash.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlFlash extends Zend_View_Helper_HtmlObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HtmlList.php --- a/web/lib/Zend/View/Helper/HtmlList.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HtmlList.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlList.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlList extends Zend_View_Helper_FormElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HtmlObject.php --- a/web/lib/Zend/View/Helper/HtmlObject.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HtmlObject.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlObject.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlObject.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlObject extends Zend_View_Helper_HtmlElement diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HtmlPage.php --- a/web/lib/Zend/View/Helper/HtmlPage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HtmlPage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlPage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlPage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlPage extends Zend_View_Helper_HtmlObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/HtmlQuicktime.php --- a/web/lib/Zend/View/Helper/HtmlQuicktime.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/HtmlQuicktime.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlQuicktime.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlQuicktime.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlQuicktime extends Zend_View_Helper_HtmlObject diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/InlineScript.php --- a/web/lib/Zend/View/Helper/InlineScript.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/InlineScript.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: InlineScript.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: InlineScript.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @uses Zend_View_Helper_Head_Script * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_InlineScript extends Zend_View_Helper_HeadScript diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Interface.php --- a/web/lib/Zend/View/Helper/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_View_Helper_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Json.php --- a/web/lib/Zend/View/Helper/Json.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Json.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Json.php 23451 2010-11-28 13:10:03Z ramon $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Json.php 25091 2012-11-07 19:58:48Z rob $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Json extends Zend_View_Helper_Abstract @@ -43,28 +43,38 @@ * Encode data as JSON, disable layouts, and set response header * * If $keepLayouts is true, does not disable layouts. + * If $encodeJson is false, does not JSON-encode $data * * @param mixed $data * @param bool $keepLayouts * NOTE: if boolean, establish $keepLayouts to true|false * if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false - * this array can contains a 'keepLayout'=>true|false + * this array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false * that will not be passed to Zend_Json::encode method but will be used here + * @param bool $encodeData * @return string|void */ - public function json($data, $keepLayouts = false) + public function json($data, $keepLayouts = false, $encodeData = true) { $options = array(); - if (is_array($keepLayouts)) - { - $options = $keepLayouts; - $keepLayouts = (array_key_exists('keepLayouts', $keepLayouts)) - ? $keepLayouts['keepLayouts'] - : false; - unset($options['keepLayouts']); + if (is_array($keepLayouts)) { + $options = $keepLayouts; + + $keepLayouts = false; + if (array_key_exists('keepLayouts', $options)) { + $keepLayouts = $options['keepLayouts']; + unset($options['keepLayouts']); + } + + if (array_key_exists('encodeData', $options)) { + $encodeData = $options['encodeData']; + unset($options['encodeData']); + } } - $data = Zend_Json::encode($data, null, $options); + if ($encodeData) { + $data = Zend_Json::encode($data, null, $options); + } if (!$keepLayouts) { require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Layout.php --- a/web/lib/Zend/View/Helper/Layout.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Layout.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Layout.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Layout extends Zend_View_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Navigation.php --- a/web/lib/Zend/View/Helper/Navigation.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Navigation.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Navigation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Navigation.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation @@ -157,9 +157,17 @@ } if (!$this->view->getPluginLoader('helper')->getPaths(self::NS)) { + // Add navigation helper path at the beginning + $paths = $this->view->getHelperPaths(); + $this->view->setHelperPath(null); + $this->view->addHelperPath( str_replace('_', '/', self::NS), self::NS); + + foreach ($paths as $ns => $path) { + $this->view->addHelperPath($path, $ns); + } } if ($strict) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Navigation/Breadcrumbs.php --- a/web/lib/Zend/View/Helper/Navigation/Breadcrumbs.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Navigation/Breadcrumbs.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Breadcrumbs.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Breadcrumbs.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Breadcrumbs @@ -293,8 +293,8 @@ if (count($partial) != 2) { require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( - 'Unable to render menu: A view partial supplied as ' - . 'an array must contain two values: partial view ' + 'Unable to render menu: A view partial supplied as ' + . 'an array must contain two values: partial view ' . 'script and module where script can be found' ); $e->setView($this->view); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Navigation/Helper.php --- a/web/lib/Zend/View/Helper/Navigation/Helper.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Navigation/Helper.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Helper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Helper.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_View_Helper_Navigation_Helper diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Navigation/HelperAbstract.php --- a/web/lib/Zend/View/Helper/Navigation/HelperAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Navigation/HelperAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelperAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelperAbstract.php 25239 2013-01-22 09:45:01Z frosch $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Navigation_HelperAbstract @@ -72,6 +72,27 @@ protected $_indent = ''; /** + * Whether HTML/XML output should be formatted + * + * @var bool + */ + protected $_formatOutput = true; + + /** + * Prefix for IDs when they are normalized + * + * @var string|null + */ + protected $_prefixForId = null; + + /** + * Skip current prefix for IDs when they are normalized (flag) + * + * @var bool + */ + protected $_skipPrefixForId = false; + + /** * Translator * * @var Zend_Translate_Adapter @@ -264,16 +285,108 @@ } /** - * Returns indentation + * Returns indentation (format output is respected) * - * @return string + * @return string indentation string or an empty string */ public function getIndent() { + if (false === $this->getFormatOutput()) { + return ''; + } + return $this->_indent; } /** + * Returns the EOL character (format output is respected) + * + * @see self::EOL + * @see getFormatOutput() + * + * @return string standard EOL charater or an empty string + */ + public function getEOL() + { + if (false === $this->getFormatOutput()) { + return ''; + } + + return self::EOL; + } + + /** + * Sets whether HTML/XML output should be formatted + * + * @param bool $formatOutput [optional] whether output + * should be formatted. Default + * is true. + * + * @return Zend_View_Helper_Navigation_Sitemap fluent interface, returns + * self + */ + public function setFormatOutput($formatOutput = true) + { + $this->_formatOutput = (bool)$formatOutput; + + return $this; + } + + /** + * Returns whether HTML/XML output should be formatted + * + * @return bool whether HTML/XML output should be formatted + */ + public function getFormatOutput() + { + return $this->_formatOutput; + } + + /** + * Sets prefix for IDs when they are normalized + * + * @param string $prefix Prefix for IDs + * @return Zend_View_Helper_Navigation_HelperAbstract fluent interface, returns self + */ + public function setPrefixForId($prefix) + { + if (is_string($prefix)) { + $this->_prefixForId = trim($prefix); + } + + return $this; + } + + /** + * Returns prefix for IDs when they are normalized + * + * @return string Prefix for + */ + public function getPrefixForId() + { + if (null === $this->_prefixForId) { + $prefix = get_class($this); + $this->_prefixForId = strtolower( + trim(substr($prefix, strrpos($prefix, '_')), '_') + ) . '-'; + } + + return $this->_prefixForId; + } + + /** + * Skip the current prefix for IDs when they are normalized + * + * @param bool $flag + * @return Zend_View_Helper_Navigation_HelperAbstract fluent interface, returns self + */ + public function skipPrefixForId($flag = true) + { + $this->_skipPrefixForId = (bool) $flag; + return $this; + } + + /** * Sets translator to use in helper * * Implements {@link Zend_View_Helper_Navigation_Helper::setTranslator()}. @@ -377,7 +490,7 @@ } else { require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( - '$role must be a string, null, or an instance of ' + '$role must be a string, null, or an instance of ' . 'Zend_Acl_Role_Interface; %s given', gettype($role) )); @@ -669,12 +782,15 @@ } // get attribs for anchor element - $attribs = array( - 'id' => $page->getId(), - 'title' => $title, - 'class' => $page->getClass(), - 'href' => $page->getHref(), - 'target' => $page->getTarget() + $attribs = array_merge( + array( + 'id' => $page->getId(), + 'title' => $title, + 'class' => $page->getClass(), + 'href' => $page->getHref(), + 'target' => $page->getTarget() + ), + $page->getCustomHtmlAttribs() ); return '<a' . $this->_htmlAttribs($attribs) . '>' @@ -800,17 +916,22 @@ /** * Normalize an ID * - * Overrides {@link Zend_View_Helper_HtmlElement::_normalizeId()}. + * Extends {@link Zend_View_Helper_HtmlElement::_normalizeId()}. * - * @param string $value - * @return string + * @param string $value ID + * @return string Normalized ID */ protected function _normalizeId($value) - { - $prefix = get_class($this); - $prefix = strtolower(trim(substr($prefix, strrpos($prefix, '_')), '_')); + { + if (false === $this->_skipPrefixForId) { + $prefix = $this->getPrefixForId(); - return $prefix . '-' . $value; + if (strlen($prefix)) { + return $prefix . $value; + } + } + + return parent::_normalizeId($value); } // Static methods: diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Navigation/Links.php --- a/web/lib/Zend/View/Helper/Navigation/Links.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Navigation/Links.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Links.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Links.php 25239 2013-01-22 09:45:01Z frosch $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Links @@ -769,7 +769,7 @@ foreach ($types as $relation => $pages) { foreach ($pages as $page) { if ($r = $this->renderLink($page, $attrib, $relation)) { - $output .= $indent . $r . self::EOL; + $output .= $indent . $r . $this->getEOL(); } } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Navigation/Menu.php --- a/web/lib/Zend/View/Helper/Navigation/Menu.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Navigation/Menu.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Menu.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Menu.php 25239 2013-01-22 09:45:01Z frosch $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Menu @@ -45,6 +45,34 @@ protected $_ulClass = 'navigation'; /** + * Unique identifier (id) for the ul element + * + * @var string + */ + protected $_ulId = null; + + /** + * CSS class to use for the active elements + * + * @var string + */ + protected $_activeClass = 'active'; + + /** + * CSS class to use for the parent li element + * + * @var string + */ + protected $_parentClass = 'menu-parent'; + + /** + * Whether parent li elements should be rendered with parent class + * + * @var bool + */ + protected $_renderParentClass = false; + + /** * Whether only active branch should be rendered * * @var bool @@ -66,6 +94,27 @@ protected $_partial = null; /** + * Expand all sibling nodes of active branch nodes + * + * @var bool + */ + protected $_expandSiblingNodesOfActiveBranch = false; + + /** + * Adds CSS class from page to li element + * + * @var bool + */ + protected $_addPageClassToLi = false; + + /** + * Inner indentation string + * + * @var string + */ + protected $_innerIndent = ' '; + + /** * View helper entry point: * Retrieves helper and optionally sets container to operate on * @@ -111,6 +160,107 @@ } /** + * Sets unique identifier (id) to use for the first 'ul' element when + * rendering + * + * @param string|null $ulId Unique identifier (id) to set + * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self + */ + public function setUlId($ulId) + { + if (is_string($ulId)) { + $this->_ulId = $ulId; + } + + return $this; + } + + /** + * Returns unique identifier (id) to use for the first 'ul' element when + * rendering + * + * @return string|null Unique identifier (id); Default is 'null' + */ + public function getUlId() + { + return $this->_ulId; + } + + /** + * Sets CSS class to use for the active elements when rendering + * + * @param string $activeClass CSS class to set + * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self + */ + public function setActiveClass($activeClass) + { + if (is_string($activeClass)) { + $this->_activeClass = $activeClass; + } + + return $this; + } + + /** + * Returns CSS class to use for the active elements when rendering + * + * @return string CSS class + */ + public function getActiveClass() + { + return $this->_activeClass; + } + + /** + * Sets CSS class to use for the parent li elements when rendering + * + * @param string $parentClass CSS class to set to parents + * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self + */ + public function setParentClass($parentClass) + { + if (is_string($parentClass)) { + $this->_parentClass = $parentClass; + } + + return $this; + } + + /** + * Returns CSS class to use for the parent lie elements when rendering + * + * @return string CSS class + */ + public function getParentClass() + { + return $this->_parentClass; + } + + /** + * Enables/disables rendering of parent class to the li element + * + * @param bool $flag [optional] render with parent + * class. Default is true. + * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self + */ + public function setRenderParentClass($flag = true) + { + $this->_renderParentClass = (bool) $flag; + return $this; + } + + /** + * Returns flag indicating whether parent class should be rendered to the li + * element + * + * @return bool whether parent class should be rendered + */ + public function getRenderParentClass() + { + return $this->_renderParentClass; + } + + /** * Sets a flag indicating whether only active branch should be rendered * * @param bool $flag [optional] render only active @@ -135,8 +285,34 @@ { return $this->_onlyActiveBranch; } + + /** + * Sets a flag indicating whether to expand all sibling nodes of the active branch + * + * @param bool $flag [optional] expand all siblings of + * nodes in the active branch. Default is true. + * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self + */ + public function setExpandSiblingNodesOfActiveBranch($flag = true) + { + $this->_expandSiblingNodesOfActiveBranch = (bool) $flag; + return $this; + } /** + * Returns a flag indicating whether to expand all sibling nodes of the active branch + * + * By default, this value is false, meaning the entire menu will be + * be rendered. + * + * @return bool whether siblings of nodes in the active branch should be expanded + */ + public function getExpandSiblingNodesOfActiveBranch() + { + return $this->_expandSiblingNodesOfActiveBranch; + } + + /** * Enables/disables rendering of parents when only rendering active branch * * See {@link setOnlyActiveBranch()} for more information. @@ -195,6 +371,78 @@ return $this->_partial; } + /** + * Adds CSS class from page to li element + * + * Before: + * <code> + * <li> + * <a href="#" class="foo">Bar</a> + * </li> + * </code> + * + * After: + * <code> + * <li class="foo"> + * <a href="#">Bar</a> + * </li> + * </code> + * + * @param bool $flag [optional] adds CSS class from + * page to li element + * + * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self + */ + public function addPageClassToLi($flag = true) + { + $this->_addPageClassToLi = (bool) $flag; + + return $this; + } + + /** + * Returns a flag indicating whether the CSS class from page to be added to + * li element + * + * @return bool + */ + public function getAddPageClassToLi() + { + return $this->_addPageClassToLi; + } + + /** + * Set the inner indentation string for using in {@link render()}, optionally + * a number of spaces to indent with + * + * @param string|int $indent indentation string or + * number of spaces + * @return Zend_View_Helper_Navigation_HelperAbstract fluent interface, + * returns self + */ + public function setInnerIndent($indent) + { + $this->_innerIndent = $this->_getWhitespace($indent); + + return $this; + } + + /** + * Returns inner indentation (format output is respected) + * + * @see getFormatOutput() + * + * @return string indentation string or an empty string + */ + public function getInnerIndent() + { + if (false === $this->getFormatOutput()) { + return ''; + } + + return $this->_innerIndent; + } + // Public methods: /** @@ -226,18 +474,25 @@ $attribs = array( 'id' => $page->getId(), 'title' => $title, - 'class' => $page->getClass() ); + if (false === $this->getAddPageClassToLi()) { + $attribs['class'] = $page->getClass(); + } + // does page have a href? if ($href = $page->getHref()) { - $element = 'a'; - $attribs['href'] = $href; - $attribs['target'] = $page->getTarget(); + $element = 'a'; + $attribs['href'] = $href; + $attribs['target'] = $page->getTarget(); + $attribs['accesskey'] = $page->getAccessKey(); } else { $element = 'span'; } + // Add custom HTML attributes + $attribs = array_merge($attribs, $page->getCustomHtmlAttribs()); + return '<' . $element . $this->_htmlAttribs($attribs) . '>' . $this->view->escape($label) . '</' . $element . '>'; @@ -251,18 +506,51 @@ */ protected function _normalizeOptions(array $options = array()) { + // Ident if (isset($options['indent'])) { $options['indent'] = $this->_getWhitespace($options['indent']); } else { $options['indent'] = $this->getIndent(); } + // Inner ident + if (isset($options['innerIndent'])) { + $options['innerIndent'] = + $this->_getWhitespace($options['innerIndent']); + } else { + $options['innerIndent'] = $this->getInnerIndent(); + } + + // UL class if (isset($options['ulClass']) && $options['ulClass'] !== null) { $options['ulClass'] = (string) $options['ulClass']; } else { $options['ulClass'] = $this->getUlClass(); } + // UL id + if (isset($options['ulId']) && $options['ulId'] !== null) { + $options['ulId'] = (string) $options['ulId']; + } else { + $options['ulId'] = $this->getUlId(); + } + + // Active class + if (isset($options['activeClass']) && $options['activeClass'] !== null + ) { + $options['activeClass'] = (string) $options['activeClass']; + } else { + $options['activeClass'] = $this->getActiveClass(); + } + + // Parent class + if (isset($options['parentClass']) && $options['parentClass'] !== null) { + $options['parentClass'] = (string) $options['parentClass']; + } else { + $options['parentClass'] = $this->getParentClass(); + } + + // Minimum depth if (array_key_exists('minDepth', $options)) { if (null !== $options['minDepth']) { $options['minDepth'] = (int) $options['minDepth']; @@ -275,6 +563,7 @@ $options['minDepth'] = 0; } + // Maximum depth if (array_key_exists('maxDepth', $options)) { if (null !== $options['maxDepth']) { $options['maxDepth'] = (int) $options['maxDepth']; @@ -283,14 +572,31 @@ $options['maxDepth'] = $this->getMaxDepth(); } + // Only active branch if (!isset($options['onlyActiveBranch'])) { $options['onlyActiveBranch'] = $this->getOnlyActiveBranch(); } + // Expand sibling nodes of active branch + if (!isset($options['expandSiblingNodesOfActiveBranch'])) { + $options['expandSiblingNodesOfActiveBranch'] = $this->getExpandSiblingNodesOfActiveBranch(); + } + + // Render parents? if (!isset($options['renderParents'])) { $options['renderParents'] = $this->getRenderParents(); } + // Render parent class? + if (!isset($options['renderParentClass'])) { + $options['renderParentClass'] = $this->getRenderParentClass(); + } + + // Add page CSS class to LI element + if (!isset($options['addPageClassToLi'])) { + $options['addPageClassToLi'] = $this->getAddPageClassToLi(); + } + return $options; } @@ -300,19 +606,34 @@ * Renders the deepest active menu within [$minDepth, $maxDeth], (called * from {@link renderMenu()}) * - * @param Zend_Navigation_Container $container container to render - * @param array $active active page and depth - * @param string $ulClass CSS class for first UL - * @param string $indent initial indentation - * @param int|null $minDepth minimum depth - * @param int|null $maxDepth maximum depth - * @return string rendered menu + * @param Zend_Navigation_Container $container container to render + * @param string $ulClass CSS class for first UL + * @param string $indent initial indentation + * @param string $innerIndent inner indentation + * @param int|null $minDepth minimum depth + * @param int|null $maxDepth maximum depth + * @param string|null $ulId unique identifier (id) + * for first UL + * @param bool $addPageClassToLi adds CSS class from + * page to li element + * @param string|null $activeClass CSS class for active + * element + * @param string $parentClass CSS class for parent + * li's + * @param bool $renderParentClass Render parent class? + * @return string rendered menu (HTML) */ protected function _renderDeepestMenu(Zend_Navigation_Container $container, $ulClass, $indent, + $innerIndent, $minDepth, - $maxDepth) + $maxDepth, + $ulId, + $addPageClassToLi, + $activeClass, + $parentClass, + $renderParentClass) { if (!$active = $this->findActive($container, $minDepth - 1, $maxDepth)) { return ''; @@ -326,22 +647,49 @@ } else if (!$active['page']->hasPages()) { // found pages has no children; render siblings $active['page'] = $active['page']->getParent(); - } else if (is_int($maxDepth) && $active['depth'] +1 > $maxDepth) { + } else if (is_int($maxDepth) && $active['depth'] + 1 > $maxDepth) { // children are below max depth; render siblings $active['page'] = $active['page']->getParent(); } - $ulClass = $ulClass ? ' class="' . $ulClass . '"' : ''; - $html = $indent . '<ul' . $ulClass . '>' . self::EOL; + $attribs = array( + 'class' => $ulClass, + 'id' => $ulId, + ); + + // We don't need a prefix for the menu ID (backup) + $skipValue = $this->_skipPrefixForId; + $this->skipPrefixForId(); + + $html = $indent . '<ul' + . $this->_htmlAttribs($attribs) + . '>' + . $this->getEOL(); + + // Reset prefix for IDs + $this->_skipPrefixForId = $skipValue; foreach ($active['page'] as $subPage) { if (!$this->accept($subPage)) { continue; } - $liClass = $subPage->isActive(true) ? ' class="active"' : ''; - $html .= $indent . ' <li' . $liClass . '>' . self::EOL; - $html .= $indent . ' ' . $this->htmlify($subPage) . self::EOL; - $html .= $indent . ' </li>' . self::EOL; + + $liClass = ''; + if ($subPage->isActive(true) && $addPageClassToLi) { + $liClass = $this->_htmlAttribs( + array('class' => $activeClass . ' ' . $subPage->getClass()) + ); + } else if ($subPage->isActive(true)) { + $liClass = $this->_htmlAttribs(array('class' => $activeClass)); + } else if ($addPageClassToLi) { + $liClass = $this->_htmlAttribs( + array('class' => $subPage->getClass()) + ); + } + $html .= $indent . $innerIndent . '<li' . $liClass . '>' . $this->getEOL(); + $html .= $indent . str_repeat($innerIndent, 2) . $this->htmlify($subPage) + . $this->getEOL(); + $html .= $indent . $innerIndent . '</li>' . $this->getEOL(); } $html .= $indent . '</ul>'; @@ -352,20 +700,39 @@ /** * Renders a normal menu (called from {@link renderMenu()}) * - * @param Zend_Navigation_Container $container container to render - * @param string $ulClass CSS class for first UL - * @param string $indent initial indentation - * @param int|null $minDepth minimum depth - * @param int|null $maxDepth maximum depth - * @param bool $onlyActive render only active branch? - * @return string + * @param Zend_Navigation_Container $container container to render + * @param string $ulClass CSS class for first UL + * @param string $indent initial indentation + * @param string $innerIndent inner indentation + * @param int|null $minDepth minimum depth + * @param int|null $maxDepth maximum depth + * @param bool $onlyActive render only active branch? + * @param bool $expandSibs render siblings of active + * branch nodes? + * @param string|null $ulId unique identifier (id) + * for first UL + * @param bool $addPageClassToLi adds CSS class from + * page to li element + * @param string|null $activeClass CSS class for active + * element + * @param string $parentClass CSS class for parent + * li's + * @param bool $renderParentClass Render parent class? + * @return string rendered menu (HTML) */ protected function _renderMenu(Zend_Navigation_Container $container, $ulClass, $indent, + $innerIndent, $minDepth, $maxDepth, - $onlyActive) + $onlyActive, + $expandSibs, + $ulId, + $addPageClassToLi, + $activeClass, + $parentClass, + $renderParentClass) { $html = ''; @@ -392,6 +759,21 @@ if ($depth < $minDepth || !$this->accept($page)) { // page is below minDepth or not accepted by acl/visibilty continue; + } else if ($expandSibs && $depth > $minDepth) { + // page is not active itself, but might be in the active branch + $accept = false; + if ($foundPage) { + if ($foundPage->hasPage($page)) { + // accept if page is a direct child of the active page + $accept = true; + } else if ($page->getParent()->isActive(true)) { + // page is a sibling of the active branch... + $accept = true; + } + } + if (!$isActive && !$accept) { + continue; + } } else if ($onlyActive && !$isActive) { // page is not active itself, but might be in the active branch $accept = false; @@ -416,35 +798,71 @@ } // make sure indentation is correct - $depth -= $minDepth; - $myIndent = $indent . str_repeat(' ', $depth); + $depth -= $minDepth; + $myIndent = $indent . str_repeat($innerIndent, $depth * 2); if ($depth > $prevDepth) { + $attribs = array(); + // start new ul tag - if ($ulClass && $depth == 0) { - $ulClass = ' class="' . $ulClass . '"'; - } else { - $ulClass = ''; + if (0 == $depth) { + $attribs = array( + 'class' => $ulClass, + 'id' => $ulId, + ); } - $html .= $myIndent . '<ul' . $ulClass . '>' . self::EOL; + + // We don't need a prefix for the menu ID (backup) + $skipValue = $this->_skipPrefixForId; + $this->skipPrefixForId(); + + $html .= $myIndent . '<ul' + . $this->_htmlAttribs($attribs) + . '>' + . $this->getEOL(); + + // Reset prefix for IDs + $this->_skipPrefixForId = $skipValue; } else if ($prevDepth > $depth) { // close li/ul tags until we're at current depth for ($i = $prevDepth; $i > $depth; $i--) { - $ind = $indent . str_repeat(' ', $i); - $html .= $ind . ' </li>' . self::EOL; - $html .= $ind . '</ul>' . self::EOL; + $ind = $indent . str_repeat($innerIndent, $i * 2); + $html .= $ind . $innerIndent . '</li>' . $this->getEOL(); + $html .= $ind . '</ul>' . $this->getEOL(); } // close previous li tag - $html .= $myIndent . ' </li>' . self::EOL; + $html .= $myIndent . $innerIndent . '</li>' . $this->getEOL(); } else { // close previous li tag - $html .= $myIndent . ' </li>' . self::EOL; + $html .= $myIndent . $innerIndent . '</li>' . $this->getEOL(); } // render li tag and page - $liClass = $isActive ? ' class="active"' : ''; - $html .= $myIndent . ' <li' . $liClass . '>' . self::EOL - . $myIndent . ' ' . $this->htmlify($page) . self::EOL; + $liClasses = array(); + // Is page active? + if ($isActive) { + $liClasses[] = $activeClass; + } + // Add CSS class from page to LI? + if ($addPageClassToLi) { + $liClasses[] = $page->getClass(); + } + // Add CSS class for parents to LI? + if ($renderParentClass && $page->hasChildren()) { + // Check max depth + if ((is_int($maxDepth) && ($depth + 1 < $maxDepth)) + || !is_int($maxDepth) + ) { + $liClasses[] = $parentClass; + } + } + + $html .= $myIndent . $innerIndent . '<li' + . $this->_htmlAttribs(array('class' => implode(' ', $liClasses))) + . '>' . $this->getEOL() + . $myIndent . str_repeat($innerIndent, 2) + . $this->htmlify($page) + . $this->getEOL(); // store as previous depth for next iteration $prevDepth = $depth; @@ -453,11 +871,11 @@ if ($html) { // done iterating container; close open ul/li tags for ($i = $prevDepth+1; $i > 0; $i--) { - $myIndent = $indent . str_repeat(' ', $i-1); - $html .= $myIndent . ' </li>' . self::EOL - . $myIndent . '</ul>' . self::EOL; + $myIndent = $indent . str_repeat($innerIndent . $innerIndent, $i - 1); + $html .= $myIndent . $innerIndent . '</li>' . $this->getEOL() + . $myIndent . '</ul>' . $this->getEOL(); } - $html = rtrim($html, self::EOL); + $html = rtrim($html, $this->getEOL()); } return $html; @@ -491,18 +909,35 @@ $options = $this->_normalizeOptions($options); if ($options['onlyActiveBranch'] && !$options['renderParents']) { - $html = $this->_renderDeepestMenu($container, - $options['ulClass'], - $options['indent'], - $options['minDepth'], - $options['maxDepth']); + $html = $this->_renderDeepestMenu( + $container, + $options['ulClass'], + $options['indent'], + $options['innerIndent'], + $options['minDepth'], + $options['maxDepth'], + $options['ulId'], + $options['addPageClassToLi'], + $options['activeClass'], + $options['parentClass'], + $options['renderParentClass'] + ); } else { - $html = $this->_renderMenu($container, - $options['ulClass'], - $options['indent'], - $options['minDepth'], - $options['maxDepth'], - $options['onlyActiveBranch']); + $html = $this->_renderMenu( + $container, + $options['ulClass'], + $options['indent'], + $options['innerIndent'], + $options['minDepth'], + $options['maxDepth'], + $options['onlyActiveBranch'], + $options['expandSiblingNodesOfActiveBranch'], + $options['ulId'], + $options['addPageClassToLi'], + $options['activeClass'], + $options['parentClass'], + $options['renderParentClass'] + ); } return $html; @@ -527,7 +962,7 @@ * render. Default is to render * the container registered in * the helper. - * @param string $ulClass [optional] CSS class to + * @param string|null $ulClass [optional] CSS class to * use for UL element. Default * is to use the value from * {@link getUlClass()}. @@ -536,19 +971,34 @@ * spaces. Default is to use * the value retrieved from * {@link getIndent()}. - * @return string rendered content + * @param string|null $ulId [optional] Unique identifier + * (id) use for UL element + * @param bool $addPageClassToLi adds CSS class from + * page to li element + * @param string|int $innerIndent [optional] inner + * indentation as a string + * or number of spaces. + * Default is to use the + * {@link getInnerIndent()}. + * @return string rendered content */ public function renderSubMenu(Zend_Navigation_Container $container = null, $ulClass = null, - $indent = null) + $indent = null, + $ulId = null, + $addPageClassToLi = false, + $innerIndent = null) { return $this->renderMenu($container, array( 'indent' => $indent, + 'innerIndent' => $innerIndent, 'ulClass' => $ulClass, 'minDepth' => null, 'maxDepth' => null, 'onlyActiveBranch' => true, - 'renderParents' => false + 'renderParents' => false, + 'ulId' => $ulId, + 'addPageClassToLi' => $addPageClassToLi, )); } @@ -573,6 +1023,8 @@ * and the module where the * script can be found. * @return string helper output + * + * @throws Zend_View_Exception When no partial script is set */ public function renderPartial(Zend_Navigation_Container $container = null, $partial = null) @@ -602,8 +1054,8 @@ if (count($partial) != 2) { require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( - 'Unable to render menu: A view partial supplied as ' - . 'an array must contain two values: partial view ' + 'Unable to render menu: A view partial supplied as ' + . 'an array must contain two values: partial view ' . 'script and module where script can be found' ); $e->setView($this->view); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Navigation/Sitemap.php --- a/web/lib/Zend/View/Helper/Navigation/Sitemap.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Navigation/Sitemap.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sitemap.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: Sitemap.php 25239 2013-01-22 09:45:01Z frosch $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Sitemap @@ -54,13 +54,6 @@ const SITEMAP_XSD = 'http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd'; /** - * Whether XML output should be formatted - * - * @var bool - */ - protected $_formatOutput = false; - - /** * Whether the XML declaration should be included in XML output * * @var bool @@ -109,31 +102,6 @@ // Accessors: /** - * Sets whether XML output should be formatted - * - * @param bool $formatOutput [optional] whether output - * should be formatted. Default - * is true. - * @return Zend_View_Helper_Navigation_Sitemap fluent interface, returns - * self - */ - public function setFormatOutput($formatOutput = true) - { - $this->_formatOutput = (bool) $formatOutput; - return $this; - } - - /** - * Returns whether XML output should be formatted - * - * @return bool whether XML output should be formatted - */ - public function getFormatOutput() - { - return $this->_formatOutput; - } - - /** * Sets whether the XML declaration should be used in output * * @param bool $useXmlDecl whether XML delcaration @@ -269,15 +237,8 @@ $enc = $this->view->getEncoding(); } - // TODO: remove check when minimum PHP version is >= 5.2.3 - if (version_compare(PHP_VERSION, '5.2.3', '>=')) { - // do not encode existing HTML entities - return htmlspecialchars($string, ENT_QUOTES, $enc, false); - } else { - $string = preg_replace('/&(?!(?:#\d++|[a-z]++);)/ui', '&', $string); - $string = str_replace(array('<', '>', '\'', '"'), array('<', '>', ''', '"'), $string); - return $string; - } + // do not encode existing HTML entities + return htmlspecialchars($string, ENT_QUOTES, $enc, false); } // Public methods: @@ -478,6 +439,6 @@ $dom->saveXML() : $dom->saveXML($dom->documentElement); - return rtrim($xml, PHP_EOL); + return rtrim($xml, self::EOL); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/PaginationControl.php --- a/web/lib/Zend/View/Helper/PaginationControl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/PaginationControl.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PaginationControl.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PaginationControl.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_PaginationControl diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Partial.php --- a/web/lib/Zend/View/Helper/Partial.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Partial.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Partial.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Partial.php 25203 2013-01-10 11:02:17Z frosch $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Partial extends Zend_View_Helper_Abstract @@ -71,6 +71,10 @@ if (isset($this->partialCounter)) { $view->partialCounter = $this->partialCounter; } + if (isset($this->partialTotalCount)) { + $view->partialTotalCount = $this->partialTotalCount; + } + if ((null !== $module) && is_string($module)) { require_once 'Zend/Controller/Front.php'; $moduleDir = Zend_Controller_Front::getInstance()->getControllerDirectory($module); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Partial/Exception.php --- a/web/lib/Zend/View/Helper/Partial/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Partial/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Partial_Exception extends Zend_View_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/PartialLoop.php --- a/web/lib/Zend/View/Helper/PartialLoop.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/PartialLoop.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: PartialLoop.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: PartialLoop.php 25203 2013-01-10 11:02:17Z frosch $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_PartialLoop extends Zend_View_Helper_Partial @@ -85,7 +85,9 @@ $content = ''; // reset the counter if it's call again - $this->partialCounter = 0; + $this->partialCounter = 0; + $this->partialTotalCount = count($model); + foreach ($model as $item) { // increment the counter variable $this->partialCounter++; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Placeholder.php --- a/web/lib/Zend/View/Helper/Placeholder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Placeholder.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Placeholder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Placeholder.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder extends Zend_View_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Placeholder/Container.php --- a/web/lib/Zend/View/Helper/Placeholder/Container.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Placeholder/Container.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Container extends Zend_View_Helper_Placeholder_Container_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Placeholder/Container/Abstract.php --- a/web/lib/Zend/View/Helper/Placeholder/Container/Abstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Placeholder/Container/Abstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Abstract.php 25255 2013-02-13 15:25:39Z frosch $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObject @@ -93,7 +93,7 @@ /** * Constructor - This is needed so that we can attach a class member as the ArrayObject container * - * @return void + * @return \Zend_View_Helper_Placeholder_Container_Abstract */ public function __construct() { @@ -252,9 +252,10 @@ /** * Start capturing content to push into placeholder * - * @param int $type How to capture content into placeholder; append, prepend, or set + * @param int|string $type How to capture content into placeholder; append, prepend, or set + * @param null $key + * @throws Zend_View_Helper_Placeholder_Container_Exception * @return void - * @throws Zend_View_Helper_Placeholder_Exception if nested captures detected */ public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $key = null) { @@ -349,10 +350,16 @@ /** * Render the placeholder * + * @param null $indent * @return string */ public function toString($indent = null) { + // Check items + if (0 === $this->count()) { + return ''; + } + $indent = ($indent !== null) ? $this->getWhitespace($indent) : $this->getIndent(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Placeholder/Container/Exception.php --- a/web/lib/Zend/View/Helper/Placeholder/Container/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Placeholder/Container/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Container_Exception extends Zend_View_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Placeholder/Container/Standalone.php --- a/web/lib/Zend/View/Helper/Placeholder/Container/Standalone.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Placeholder/Container/Standalone.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Standalone.php 20143 2010-01-08 15:17:11Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Standalone.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Placeholder_Container_Standalone extends Zend_View_Helper_Abstract implements IteratorAggregate, Countable, ArrayAccess diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Placeholder/Registry.php --- a/web/lib/Zend/View/Helper/Placeholder/Registry.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Placeholder/Registry.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Registry.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Registry @@ -85,7 +85,7 @@ { $key = (string) $key; - $this->_items[$key] = new $this->_containerClass(array()); + $this->_items[$key] = new $this->_containerClass($value); return $this->_items[$key]; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Placeholder/Registry/Exception.php --- a/web/lib/Zend/View/Helper/Placeholder/Registry/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Placeholder/Registry/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Registry_Exception extends Zend_View_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/RenderToPlaceholder.php --- a/web/lib/Zend/View/Helper/RenderToPlaceholder.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/RenderToPlaceholder.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: RenderToPlaceholder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: RenderToPlaceholder.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -40,8 +40,8 @@ * Renders a template and stores the rendered output as a placeholder * variable for later use. * - * @param $script The template script to render - * @param $placeholder The placeholder variable name in which to store the rendered output + * @param string $script The template script to render + * @param string $placeholder The placeholder variable name in which to store the rendered output * @return void */ public function renderToPlaceholder($script, $placeholder) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/ServerUrl.php --- a/web/lib/Zend/View/Helper/ServerUrl.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/ServerUrl.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServerUrl.php 23371 2010-11-18 20:49:55Z bittarman $ + * @version $Id: ServerUrl.php 25024 2012-07-30 15:08:15Z rob $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_ServerUrl @@ -59,7 +59,7 @@ $scheme = 'https'; break; default: - $scheme = 'http'; + $scheme = 'http'; } $this->setScheme($scheme); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/TinySrc.php --- a/web/lib/Zend/View/Helper/TinySrc.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/TinySrc.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,31 +25,31 @@ /** * Helper for generating urls and/or image tags for use with tinysrc.net * - * tinysrc.net provides an API for generating scaled, browser device-specific + * tinysrc.net provides an API for generating scaled, browser device-specific * images. In essence, you pass the API the URL to an image on your own server, * and tinysrc.net then provides the appropriate image based on the device that * accesses it. * - * Additionally, tinysrc.net allows you to specify additional configuration via + * Additionally, tinysrc.net allows you to specify additional configuration via * the API: * * - image size. You may define this as: * - explicit size * - subtractive size (size of screen minus specified number of pixels) * - percentage size (percentage of screen size)) - * - image format. This will convert the image to the given format; allowed + * - image format. This will convert the image to the given format; allowed * values are "png" or "jpeg". By default, gif images are converted to png. * * This helper allows you to specify all configuration options, as well as: * * - whether or not to generate the full image tag (or just the URL) - * - base url to images (which should include the protocol, server, and + * - base url to images (which should include the protocol, server, and * optionally port and base path) * * @see http://tinysrc.net/ * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_TinySrc extends Zend_View_Helper_HtmlElement @@ -74,9 +74,9 @@ /** * Default options * - * Used when determining what options were passed, and needing to merge + * Used when determining what options were passed, and needing to merge * them with default options. - * + * * @var array */ protected $_defaultOptions = array( @@ -94,9 +94,9 @@ /** * Generate a link or image tag pointing to tinysrc.net - * - * @param mixed $image - * @param array $options + * + * @param mixed $image + * @param array $options * @return void */ public function tinySrc($image = null, array $options = array()) @@ -111,8 +111,8 @@ $url = '/' . $this->_mergeBaseUrl($options) . ltrim($image, '/'); - $src = self::TINYSRC_BASE - . $this->_mergeFormat($options) + $src = self::TINYSRC_BASE + . $this->_mergeFormat($options) . $this->_mergeDimensions($options) . $url; @@ -142,8 +142,8 @@ /** * Set base URL for images - * - * @param string $url + * + * @param string $url * @return Zend_View_Helper_TinySrc */ public function setBaseUrl($url) @@ -157,7 +157,7 @@ * * If none already set, uses the ServerUrl and BaseUrl view helpers to * determine the base URL to images. - * + * * @return string */ public function getBaseUrl() @@ -172,8 +172,8 @@ * Set default image format * * If set, this will set the default format to use on all images. - * - * @param null|string $format + * + * @param null|string $format * @return Zend_View_Helper_TinySrc * @throws Zend_View_Exception */ @@ -196,12 +196,12 @@ /** * Set default dimensions * - * If null is specified for width, default dimensions will be cleared. If + * If null is specified for width, default dimensions will be cleared. If * only width is specified, only width will be used. If either dimension * fails validation, an exception is raised. - * - * @param null|int|string $width - * @param null|int|string $height + * + * @param null|int|string $width + * @param null|int|string $height * @return Zend_View_Helper_TinySrc * @throws Zend_View_Exception */ @@ -232,8 +232,8 @@ /** * Set state of "create tag" flag - * - * @param bool $flag + * + * @param bool $flag * @return Zend_View_Helper_TinySrc */ public function setCreateTag($flag) @@ -244,7 +244,7 @@ /** * Should the helper create an image tag? - * + * * @return bool */ public function createTag() @@ -256,8 +256,8 @@ * Validate a dimension * * Dimensions may be integers, optionally preceded by '-' or 'x'. - * - * @param string $dim + * + * @param string $dim * @return bool */ protected function _validateDimension($dim) @@ -270,8 +270,8 @@ /** * Determine whether to use default base URL, or base URL from options - * - * @param array $options + * + * @param array $options * @return string */ protected function _mergeBaseUrl(array $options) @@ -284,11 +284,11 @@ /** * Determine whether to use default format or format provided in options. - * - * @param array $options + * + * @param array $options * @return string */ - protected function _mergeFormat(array $options) + protected function _mergeFormat(array $options) { if (in_array($options['format'], array('png', 'jpeg'))) { return '/' . $options['format']; @@ -298,8 +298,8 @@ /** * Determine whether to use default dimensions, or those passed in options. - * - * @param array $options + * + * @param array $options * @return string */ protected function _mergeDimensions(array $options) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Translate.php --- a/web/lib/Zend/View/Helper/Translate.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Translate.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 20140 2010-01-08 05:21:04Z thomas $ + * @version $Id: Translate.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Locale */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/Url.php --- a/web/lib/Zend/View/Helper/Url.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/Url.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Url.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Url.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Url extends Zend_View_Helper_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Helper/UserAgent.php --- a/web/lib/Zend/View/Helper/UserAgent.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Helper/UserAgent.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,15 +27,22 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_UserAgent extends Zend_View_Helper_Abstract { /** + * UserAgent instance + * + * @var Zend_Http_UserAgent + */ + protected $_userAgent = null; + + /** * Helper method: retrieve or set UserAgent instance - * - * @param null|Zend_Http_UserAgent $userAgent + * + * @param null|Zend_Http_UserAgent $userAgent * @return Zend_Http_UserAgent */ public function userAgent(Zend_Http_UserAgent $userAgent = null) @@ -48,8 +55,8 @@ /** * Set UserAgent instance - * - * @param Zend_Http_UserAgent $userAgent + * + * @param Zend_Http_UserAgent $userAgent * @return Zend_View_Helper_UserAgent */ public function setUserAgent(Zend_Http_UserAgent $userAgent) @@ -62,7 +69,7 @@ * Retrieve UserAgent instance * * If none set, instantiates one using no configuration - * + * * @return Zend_Http_UserAgent */ public function getUserAgent() diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Interface.php --- a/web/lib/Zend/View/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20210 2010-01-12 02:06:34Z yoshida@zend.co.jp $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_View_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/View/Stream.php --- a/web/lib/Zend/View/Stream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/View/Stream.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Stream diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Channel/HttpHeaders.php --- a/web/lib/Zend/Wildfire/Channel/HttpHeaders.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Channel/HttpHeaders.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Channel - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpHeaders.php 23096 2010-10-12 20:36:15Z cadorn $ + * @version $Id: HttpHeaders.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Wildfire_Channel_Interface */ @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Channel - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract implements Zend_Wildfire_Channel_Interface @@ -115,7 +115,7 @@ /** * Get or create singleton instance * - * @param $skipCreate boolean True if an instance should not be created + * @param bool $skipCreate True if an instance should not be created * @return Zend_Wildfire_Channel_HttpHeaders */ public static function getInstance($skipCreate=false) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Channel/Interface.php --- a/web/lib/Zend/Wildfire/Channel/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Channel/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Wildfire_Channel_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Exception.php --- a/web/lib/Zend/Wildfire/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Plugin/FirePhp.php --- a/web/lib/Zend/Wildfire/Plugin/FirePhp.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Plugin/FirePhp.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FirePhp.php 23066 2010-10-09 23:29:20Z cadorn $ + * @version $Id: FirePhp.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Controller_Request_Abstract */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface @@ -214,7 +214,7 @@ /** * Get or create singleton instance * - * @param $skipCreate boolean True if an instance should not be created + * @param bool $skipCreate True if an instance should not be created * @return Zend_Wildfire_Plugin_FirePhp */ public static function getInstance($skipCreate=false) @@ -323,11 +323,12 @@ * Starts a group in the Firebug Console * * @param string $title The title of the group + * @param array $options OPTIONAL Setting 'Collapsed' to true will initialize group collapsed instead of expanded * @return TRUE if the group instruction was added to the response headers or buffered. */ - public static function group($title) + public static function group($title, $options=array()) { - return self::send(null, $title, self::GROUP_START); + return self::send(null, $title, self::GROUP_START, $options); } /** @@ -488,6 +489,12 @@ unset($meta['Line']); } + if ($meta['Type'] == self::GROUP_START) { + if (isset($options['Collapsed'])) { + $meta['Collapsed'] = ($options['Collapsed'])?'true':'false'; + } + } + if ($meta['Type'] == self::DUMP) { return $firephp->_recordMessage(self::STRUCTURE_URI_DUMP, @@ -515,7 +522,7 @@ $trace = debug_backtrace(); $trace = array_splice($trace, $options['traceOffset']); - + if (!count($trace)) { return $trace; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Plugin/FirePhp/Message.php --- a/web/lib/Zend/Wildfire/Plugin/FirePhp/Message.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Plugin/FirePhp/Message.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Plugin_FirePhp_Message diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Plugin/FirePhp/TableMessage.php --- a/web/lib/Zend/Wildfire/Plugin/FirePhp/TableMessage.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Plugin/FirePhp/TableMessage.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TableMessage.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Wildfire_Plugin_FirePhp */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Plugin_FirePhp_TableMessage extends Zend_Wildfire_Plugin_FirePhp_Message diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Plugin/Interface.php --- a/web/lib/Zend/Wildfire/Plugin/Interface.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Plugin/Interface.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ */ /** * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Wildfire_Plugin_Interface diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Wildfire/Protocol/JsonStream.php --- a/web/lib/Zend/Wildfire/Protocol/JsonStream.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Wildfire/Protocol/JsonStream.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JsonStream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JsonStream.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Wildfire_Plugin_Interface */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Protocol_JsonStream diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Client.php --- a/web/lib/Zend/XmlRpc/Client.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Client.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -71,7 +71,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client @@ -211,7 +211,7 @@ /** * Returns a proxy object for more convenient method calls * - * @param $namespace Namespace to proxy or empty string for none + * @param string $namespace Namespace to proxy or empty string for none * @return Zend_XmlRpc_Client_ServerProxy */ public function getProxy($namespace = '') @@ -294,7 +294,7 @@ $response = new Zend_XmlRpc_Response(); } $this->_lastResponse = $response; - $this->_lastResponse->loadXml($httpResponse->getBody()); + $this->_lastResponse->loadXml(trim($httpResponse->getBody())); } /** @@ -333,22 +333,33 @@ if (!is_array($params)) { $params = array($params); } - foreach ($params as $key => $param) { + foreach ($params as $key => $param) + { if ($param instanceof Zend_XmlRpc_Value) { continue; } - $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE; - foreach ($signatures as $signature) { - if (!is_array($signature)) { - continue; + if (count($signatures) > 1) { + $type = Zend_XmlRpc_Value::getXmlRpcTypeByValue($param); + foreach ($signatures as $signature) { + if (!is_array($signature)) { + continue; + } + if (isset($signature['parameters'][$key])) { + if ($signature['parameters'][$key] == $type) { + break; + } + } } + } elseif (isset($signatures[0]['parameters'][$key])) { + $type = $signatures[0]['parameters'][$key]; + } else { + $type = null; + } - if (isset($signature['parameters'][$key])) { - $type = $signature['parameters'][$key]; - $type = in_array($type, $validTypes) ? $type : Zend_XmlRpc_Value::AUTO_DETECT_TYPE; - } + if (empty($type) || !in_array($type, $validTypes)) { + $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE; } $params[$key] = Zend_XmlRpc_Value::getXmlRpcValue($param, $type); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Client/Exception.php --- a/web/lib/Zend/XmlRpc/Client/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Client/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_Exception extends Zend_XmlRpc_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Client/FaultException.php --- a/web/lib/Zend/XmlRpc/Client/FaultException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Client/FaultException.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FaultException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FaultException.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_FaultException extends Zend_XmlRpc_Client_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Client/HttpException.php --- a/web/lib/Zend/XmlRpc/Client/HttpException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Client/HttpException.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpException.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_HttpException extends Zend_XmlRpc_Client_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Client/IntrospectException.php --- a/web/lib/Zend/XmlRpc/Client/IntrospectException.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Client/IntrospectException.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IntrospectException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: IntrospectException.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_IntrospectException extends Zend_XmlRpc_Client_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Client/ServerIntrospection.php --- a/web/lib/Zend/XmlRpc/Client/ServerIntrospection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Client/ServerIntrospection.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServerIntrospection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ServerIntrospection.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_ServerIntrospection diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Client/ServerProxy.php --- a/web/lib/Zend/XmlRpc/Client/ServerProxy.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Client/ServerProxy.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServerProxy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ServerProxy.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_ServerProxy diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Exception.php --- a/web/lib/Zend/XmlRpc/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Exception extends Zend_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Fault.php --- a/web/lib/Zend/XmlRpc/Fault.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Fault.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,9 +14,9 @@ * * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fault.php 20208 2010-01-11 22:37:37Z lars $ + * @version $Id: Fault.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -36,7 +36,7 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Fault diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Generator/DomDocument.php --- a/web/lib/Zend/XmlRpc/Generator/DomDocument.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Generator/DomDocument.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Generator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DomDocument.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: DomDocument.php 24593 2012-01-05 20:35:02Z matthew $ */ /** diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Generator/GeneratorAbstract.php --- a/web/lib/Zend/XmlRpc/Generator/GeneratorAbstract.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Generator/GeneratorAbstract.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Generator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GeneratorAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: GeneratorAbstract.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -47,7 +47,7 @@ * Start XML element * * Method opens a new XML element with an element name and an optional value - * + * * @param string $name XML tag name * @param string $value Optional value of the XML tag * @return Zend_XmlRpc_Generator_Abstract Fluent interface @@ -86,7 +86,7 @@ /** * Return encoding - * + * * @return string */ public function getEncoding() @@ -143,7 +143,7 @@ /** * End XML element - * + * * @param string $name */ abstract protected function _closeElement($name); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Generator/XmlWriter.php --- a/web/lib/Zend/XmlRpc/Generator/XmlWriter.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Generator/XmlWriter.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Generator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlWriter.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: XmlWriter.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -87,6 +87,7 @@ public function saveXml() { - return $this->_xmlWriter->flush(false); + $xml = $this->_xmlWriter->flush(false); + return $xml; } -} \ No newline at end of file +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Request.php --- a/web/lib/Zend/XmlRpc/Request.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Request.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,9 +41,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20208 2010-01-11 22:37:37Z lars $ + * @version $Id: Request.php 25033 2012-08-17 19:50:08Z matthew $ */ class Zend_XmlRpc_Request { @@ -303,12 +303,26 @@ return false; } + // @see ZF-12293 - disable external entities for security purposes + $loadEntities = libxml_disable_entity_loader(true); try { - $xml = new SimpleXMLElement($request); + $dom = new DOMDocument; + $dom->loadXML($request); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/XmlRpc/Exception.php'; + throw new Zend_XmlRpc_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + $xml = simplexml_import_dom($dom); + libxml_disable_entity_loader($loadEntities); } catch (Exception $e) { // Not valid XML $this->_fault = new Zend_XmlRpc_Fault(631); $this->_fault->setEncoding($this->getEncoding()); + libxml_disable_entity_loader($loadEntities); return false; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Request/Http.php --- a/web/lib/Zend/XmlRpc/Request/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Request/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_XmlRpc_Request_Http extends Zend_XmlRpc_Request { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Request/Stdin.php --- a/web/lib/Zend/XmlRpc/Request/Stdin.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Request/Stdin.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stdin.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stdin.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_XmlRpc_Request_Stdin extends Zend_XmlRpc_Request { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Response.php --- a/web/lib/Zend/XmlRpc/Response.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Response.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 21359 2010-03-07 00:54:02Z lars $ + * @version $Id: Response.php 25033 2012-08-17 19:50:08Z matthew $ */ class Zend_XmlRpc_Response { @@ -176,11 +176,27 @@ return false; } + // @see ZF-12293 - disable external entities for security purposes + $loadEntities = libxml_disable_entity_loader(true); + $useInternalXmlErrors = libxml_use_internal_errors(true); try { - $useInternalXmlErrors = libxml_use_internal_errors(true); + $dom = new DOMDocument; + $dom->loadXML($response); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + require_once 'Zend/XmlRpc/Exception.php'; + throw new Zend_XmlRpc_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + // TODO: Locate why this passes tests but a simplexml import doesn't + // $xml = simplexml_import_dom($dom); $xml = new SimpleXMLElement($response); + libxml_disable_entity_loader($loadEntities); libxml_use_internal_errors($useInternalXmlErrors); } catch (Exception $e) { + libxml_disable_entity_loader($loadEntities); libxml_use_internal_errors($useInternalXmlErrors); // Not valid XML $this->_fault = new Zend_XmlRpc_Fault(651); @@ -205,6 +221,7 @@ try { if (!isset($xml->params) || !isset($xml->params->param) || !isset($xml->params->param->value)) { + require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Missing XML-RPC value in XML'); } $valueXml = $xml->params->param->value->asXML(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Response/Http.php --- a/web/lib/Zend/XmlRpc/Response/Http.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Response/Http.php Sun Apr 21 21:54:24 2013 +0200 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_XmlRpc_Response * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_XmlRpc_Response_Http extends Zend_XmlRpc_Response { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Server.php --- a/web/lib/Zend/XmlRpc/Server.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Server.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Server.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -111,7 +111,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server extends Zend_Server_Abstract diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Server/Cache.php --- a/web/lib/Zend/XmlRpc/Server/Cache.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Server/Cache.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cache.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Server_Cache */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Cache extends Zend_Server_Cache diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Server/Exception.php --- a/web/lib/Zend/XmlRpc/Server/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Server/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Exception extends Zend_XmlRpc_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Server/Fault.php --- a/web/lib/Zend/XmlRpc/Server/Fault.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Server/Fault.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fault.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fault.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -44,7 +44,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Fault extends Zend_XmlRpc_Fault diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Server/System.php --- a/web/lib/Zend/XmlRpc/Server/System.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Server/System.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: System.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: System.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_System diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value.php --- a/web/lib/Zend/XmlRpc/Value.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Value.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Value.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -31,7 +31,7 @@ * from PHP variables, XML string or by specifing the exact XML-RPC natvie type * * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value @@ -252,6 +252,43 @@ } } + /** + * Get XML-RPC type for a PHP native variable + * + * @static + * @param mixed $value + * @return string + */ + public static function getXmlRpcTypeByValue($value) + { + if (is_object($value)) { + if ($value instanceof Zend_XmlRpc_Value) { + return $value->getType(); + } elseif (($value instanceof Zend_Date) || ($value instanceof DateTime)) { + return self::XMLRPC_TYPE_DATETIME; + } + return self::getXmlRpcTypeByValue(get_object_vars($value)); + } elseif (is_array($value)) { + if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) { + return self::XMLRPC_TYPE_STRUCT; + } + return self::XMLRPC_TYPE_ARRAY; + } elseif (is_int($value)) { + return ($value > PHP_INT_MAX) ? self::XMLRPC_TYPE_I8 : self::XMLRPC_TYPE_INTEGER; + } elseif (is_double($value)) { + return self::XMLRPC_TYPE_DOUBLE; + } elseif (is_bool($value)) { + return self::XMLRPC_TYPE_BOOLEAN; + } elseif (is_null($value)) { + return self::XMLRPC_TYPE_NIL; + } elseif (is_string($value)) { + return self::XMLRPC_TYPE_STRING; + } + throw new Zend_XmlRpc_Value_Exception(sprintf( + 'No matching XMLRPC type found for php type %s.', + gettype($value) + )); + } /** * Transform a PHP native variable into a XML-RPC native value @@ -263,56 +300,52 @@ */ protected static function _phpVarToNativeXmlRpc($value) { - switch (gettype($value)) { - case 'object': - // Check to see if it's an XmlRpc value - if ($value instanceof Zend_XmlRpc_Value) { - return $value; - } - - if ($value instanceof Zend_Crypt_Math_BigInteger) { - require_once 'Zend/XmlRpc/Value/BigInteger.php'; - return new Zend_XmlRpc_Value_BigInteger($value); - } - - if ($value instanceof Zend_Date or $value instanceof DateTime) { - require_once 'Zend/XmlRpc/Value/DateTime.php'; - return new Zend_XmlRpc_Value_DateTime($value); - } + // @see http://framework.zend.com/issues/browse/ZF-8623 + if (is_object($value)) { + if ($value instanceof Zend_XmlRpc_Value) { + return $value; + } + if ($value instanceof Zend_Crypt_Math_BigInteger) { + require_once 'Zend/XmlRpc/Value/Exception.php'; + throw new Zend_XmlRpc_Value_Exception( + 'Using Zend_Crypt_Math_BigInteger to get an ' . + 'instance of Zend_XmlRpc_Value_BigInteger is not ' . + 'available anymore.' + ); + } + } - // Otherwise, we convert the object into a struct - $value = get_object_vars($value); - // Break intentionally omitted - case 'array': - // Default native type for a PHP array (a simple numeric array) is 'array' - require_once 'Zend/XmlRpc/Value/Array.php'; - $obj = 'Zend_XmlRpc_Value_Array'; + switch (self::getXmlRpcTypeByValue($value)) + { + case self::XMLRPC_TYPE_DATETIME: + require_once 'Zend/XmlRpc/Value/DateTime.php'; + return new Zend_XmlRpc_Value_DateTime($value); - // Determine if this is an associative array - if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) { - require_once 'Zend/XmlRpc/Value/Struct.php'; - $obj = 'Zend_XmlRpc_Value_Struct'; - } - return new $obj($value); + case self::XMLRPC_TYPE_ARRAY: + require_once 'Zend/XmlRpc/Value/Array.php'; + return new Zend_XmlRpc_Value_Array($value); - case 'integer': + case self::XMLRPC_TYPE_STRUCT: + require_once 'Zend/XmlRpc/Value/Struct.php'; + return new Zend_XmlRpc_Value_Struct($value); + + case self::XMLRPC_TYPE_INTEGER: require_once 'Zend/XmlRpc/Value/Integer.php'; return new Zend_XmlRpc_Value_Integer($value); - case 'double': + case self::XMLRPC_TYPE_DOUBLE: require_once 'Zend/XmlRpc/Value/Double.php'; return new Zend_XmlRpc_Value_Double($value); - case 'boolean': + case self::XMLRPC_TYPE_BOOLEAN: require_once 'Zend/XmlRpc/Value/Boolean.php'; return new Zend_XmlRpc_Value_Boolean($value); - case 'NULL': - case 'null': + case self::XMLRPC_TYPE_NIL: require_once 'Zend/XmlRpc/Value/Nil.php'; - return new Zend_XmlRpc_Value_Nil(); + return new Zend_XmlRpc_Value_Nil; - case 'string': + case self::XMLRPC_TYPE_STRING: // Fall through to the next case default: // If type isn't identified (or identified as string), it treated as string @@ -474,7 +507,7 @@ } /** - * @param $xml + * @param string $xml * @return void */ protected function _setXML($xml) diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Array.php --- a/web/lib/Zend/XmlRpc/Value/Array.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Array.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Array extends Zend_XmlRpc_Value_Collection diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Base64.php --- a/web/lib/Zend/XmlRpc/Value/Base64.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Base64.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base64.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base64.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/BigInteger.php --- a/web/lib/Zend/XmlRpc/Value/BigInteger.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/BigInteger.php Sun Apr 21 21:54:24 2013 +0200 @@ -1,4 +1,5 @@ <?php + /** * Zend Framework * @@ -15,51 +16,43 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BigInteger.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: BigInteger.php 24593 2012-01-05 20:35:02Z matthew $ */ - /** * Zend_XmlRpc_Value_Integer */ require_once 'Zend/XmlRpc/Value/Integer.php'; - /** * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_BigInteger extends Zend_XmlRpc_Value_Integer { /** - * @var Zend_Crypt_Math_BigInteger - */ - protected $_integer; - - /** * @param mixed $value */ public function __construct($value) { require_once 'Zend/Crypt/Math/BigInteger.php'; - $this->_integer = new Zend_Crypt_Math_BigInteger(); - $this->_value = $this->_integer->init($this->_value); - + $integer = new Zend_Crypt_Math_BigInteger; + $this->_value = $integer->init($value); $this->_type = self::XMLRPC_TYPE_I8; } /** - * Return bigint value object + * Return bigint value * - * @return Zend_Crypt_Math_BigInteger + * @return string */ public function getValue() { - return $this->_integer; + return $this->_value; } -} +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Boolean.php --- a/web/lib/Zend/XmlRpc/Value/Boolean.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Boolean.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Boolean extends Zend_XmlRpc_Value_Scalar diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Collection.php --- a/web/lib/Zend/XmlRpc/Value/Collection.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Collection.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Collection.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value_Collection extends Zend_XmlRpc_Value diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/DateTime.php --- a/web/lib/Zend/XmlRpc/Value/DateTime.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/DateTime.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DateTime.php 20278 2010-01-14 14:48:59Z ralph $ + * @version $Id: DateTime.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar @@ -48,7 +48,7 @@ * * @var string */ - protected $_isoFormatString = 'YYYYMMddTHH:mm:ss'; + protected $_isoFormatString = 'yyyyMMddTHH:mm:ss'; /** * Set the value of a dateTime.iso8601 native type @@ -69,13 +69,13 @@ } elseif (is_numeric($value)) { // The value is numeric, we make sure it is an integer $this->_value = date($this->_phpFormatString, (int)$value); } else { - $timestamp = strtotime($value); - if ($timestamp === false || $timestamp == -1) { // cannot convert the value to a timestamp + $timestamp = new DateTime($value); + if ($timestamp === false) { // cannot convert the value to a timestamp require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Cannot convert given value \''. $value .'\' to a timestamp'); } - $this->_value = date($this->_phpFormatString, $timestamp); // Convert the timestamp to iso8601 format + $this->_value = $timestamp->format($this->_phpFormatString); // Convert the timestamp to iso8601 format } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Double.php --- a/web/lib/Zend/XmlRpc/Value/Double.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Double.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Double.php 21158 2010-02-23 17:56:23Z matthew $ + * @version $Id: Double.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Double extends Zend_XmlRpc_Value_Scalar diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Exception.php --- a/web/lib/Zend/XmlRpc/Value/Exception.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Exception.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Exception extends Zend_XmlRpc_Exception diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Integer.php --- a/web/lib/Zend/XmlRpc/Value/Integer.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Integer.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Integer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Integer.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Integer extends Zend_XmlRpc_Value_Scalar diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Nil.php --- a/web/lib/Zend/XmlRpc/Value/Nil.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Nil.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nil.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nil.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Nil extends Zend_XmlRpc_Value_Scalar diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Scalar.php --- a/web/lib/Zend/XmlRpc/Value/Scalar.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Scalar.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Scalar.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Scalar.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value_Scalar extends Zend_XmlRpc_Value diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/String.php --- a/web/lib/Zend/XmlRpc/Value/String.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/String.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: String.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -29,7 +29,7 @@ /** * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_String extends Zend_XmlRpc_Value_Scalar diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/XmlRpc/Value/Struct.php --- a/web/lib/Zend/XmlRpc/Value/Struct.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/XmlRpc/Value/Struct.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Struct.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Struct.php 24593 2012-01-05 20:35:02Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Struct extends Zend_XmlRpc_Value_Collection diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-03-techniques-humanites/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-03-techniques-humanites/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,61 @@ +<?php +$config = array( + 'hashtag' => '#museoweb', + + 'title' => "Muséologie, muséographie et nouvelles formes d’adresse au public<br />Les enjeux de la contribution", + + 'abstract' => "« <b>La technique à la rencontre des humanités :<br />plus qu’un objet, un défi pour les Digital Humanities ?</b> » <br/> 15/01/2013 à 17h00 au Centre Pompidou (Paris)", + + 'description'=> "<p><b>La technique à la rencontre des humanités :<br />plus qu’un objet, un défi pour les Digital Humanities ?</b> (le 15/01/2013)</p> +<ul> + <li> + <p><b>Whitney Trettien</b>, Duke University.</p> + <p>« Circuit-Bending History: Rewiring the Digital Humanities »</p> + </li> + <li> + <p><b>Alexandre Gefen</b>, CNRS.</p> + <p>« Les humanités numériques et le tournant empirique de la critique »</p> + </li> + <li> + <p><b>Aurélien Bénel</b>, Université de Technologie de Troyes.</p> + <p>« Quelle interdisciplinarité pour les humanités numériques ? »</p> + </li> + <li> + <p><b>Aurélien Berra</b>, Université Paris Ouest Nanterre La Défense.</p> + <p>« Le nom des humanités numériques »</p> + </li> + <li> + <p><b>Pierre Mounier</b>, EHESS, Centre pour l'édition électronique ouverte (Cléo).</p> + <p>« Les humanités numériques et le patrimoine culturel : entre public et communautés »</p> + </li> +</ul> +", + + 'link' => 'http://www.iri.centrepompidou.fr/evenement/museologie-museographie-et-nouvelles-formes-dadresse-au-public/?lang=fr_fr', + + 'islive' => true, + + 'keywords' => 'muséographie, muséologie, contribution, numérique, défis', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "<a href='http://www.culture.gouv.fr/' +class='footerLink' target='_blank'> Ministère de la Culture et de la Communication </a> +| <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'> +IRI </a>", + + 'client_visual' => "images/client_visual.jpg", // 480 x 320 pixels + + 'head_logo' => 'images/head_logo.gif', // 171 × 63 pixels + + 'slide_background' => "images/slide_background.jpg", // 606 × 282 pixels + + 'archive_img' => "images/archive_img.jpg", // 270 × 150 pixels + + 'archive_title' => "Muséologie 2012-2013 - La technique à la rencontre des humanités : plus qu’un objet, un défi pour les Digital Humanities ?", + + 'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mardi 15 janvier 2013 | 17:00", + + // After the event + 'metadata' => "1d1e91c8-71d4-11e1-99d6-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-03-techniques-humanites/images/archive_img.jpg Binary file web/museo-1213-03-techniques-humanites/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-03-techniques-humanites/images/client_visual.jpg Binary file web/museo-1213-03-techniques-humanites/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-03-techniques-humanites/images/head_logo.gif Binary file web/museo-1213-03-techniques-humanites/images/head_logo.gif has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-03-techniques-humanites/images/slide_background.jpg Binary file web/museo-1213-03-techniques-humanites/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-03-techniques-humanites/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-03-techniques-humanites/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ +<?php +// Permanent redirection +header("HTTP/1.1 301 Moved Permanently"); +header("Location: client.php"); +exit(); +?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-04-web-ingenierie-philosophie/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-04-web-ingenierie-philosophie/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,50 @@ +<?php +$config = array( + 'hashtag' => '#museoweb', + + 'title' => "Muséologie, muséographie et nouvelles formes d’adresse au public<br />Les enjeux de la contribution", + + 'abstract' => "« <b>Web, ingénierie des connaissances, Philosophie du Web :<br />les connaissances transformées par les nouveaux supports.</b> » <br/> 12/02/2013 à 17h00 au Centre Pompidou (Paris)", + + 'description'=> "<p><b>Web, ingénierie des connaissances, Philosophie du Web :<br />les connaissances transformées par les nouveaux supports.</b> (le 12/02/2013)</p> +<ul> + <li> + <p><b>Bruno Bachimont</b>, Université de Technologie de Compiègne.</p> + </li> + <li> + <p><b>Alexandre Monnin</b>, IRI, Université Paris-1 Panthéon-Sorbonne, Inria.</p> + </li> + <li> + <p><b>Yannick Prié</b>, Université de Nantes.</p> + </li> +</ul> +", + + 'link' => 'http://www.iri.centrepompidou.fr/evenement/museologie-museographie-et-nouvelles-formes-dadresse-au-public/?lang=fr_fr', + + 'islive' => true, + + 'keywords' => 'muséographie, muséologie, contribution, numérique, défis', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "<a href='http://www.culture.gouv.fr/' +class='footerLink' target='_blank'> Ministère de la Culture et de la Communication </a> +| <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'> +IRI </a>", + + 'client_visual' => "images/client_visual.jpg", // 480 x 320 pixels + + 'head_logo' => 'images/head_logo.gif', // 171 × 63 pixels + + 'slide_background' => "images/slide_background.jpg", // 606 × 282 pixels + + 'archive_img' => "images/archive_img.jpg", // 270 × 150 pixels + + 'archive_title' => "Muséologie 2012-2013 - Web, ingénierie des connaissances, Philosophie du Web : les connaissances transformées par les nouveaux supports.", + + 'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mardi 12 février 2013 | 17:00", + + // After the event + 'metadata' => "1d1e91c8-71d4-11e1-99d6-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-04-web-ingenierie-philosophie/images/archive_img.jpg Binary file web/museo-1213-04-web-ingenierie-philosophie/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-04-web-ingenierie-philosophie/images/client_visual.jpg Binary file web/museo-1213-04-web-ingenierie-philosophie/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-04-web-ingenierie-philosophie/images/head_logo.gif Binary file web/museo-1213-04-web-ingenierie-philosophie/images/head_logo.gif has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-04-web-ingenierie-philosophie/images/slide_background.jpg Binary file web/museo-1213-04-web-ingenierie-philosophie/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-04-web-ingenierie-philosophie/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-04-web-ingenierie-philosophie/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ +<?php +// Permanent redirection +header("HTTP/1.1 301 Moved Permanently"); +header("Location: client.php"); +exit(); +?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-05-jeu/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-05-jeu/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,50 @@ +<?php +$config = array( + 'hashtag' => '#museoweb', + + 'title' => "Muséologie, muséographie et nouvelles formes d’adresse au public<br />Les enjeux de la contribution", + + 'abstract' => "« <b>Le jeu pour apprendre, pour jouer,<br />pour penser, pour travailler.</b> » <br/> 20/03/2013 à 17h00 au Centre Pompidou (Paris)", + + 'description'=> "<p><b>Le jeu pour apprendre, pour jouer,<br />pour penser, pour travailler.</b> (le 20/03/2013)</p> +<ul> + <li> + <p><b>Olivier Mauco</b>, Université Paris-1 Panthéon-Sorbonne, Antidox.</p> + </li> + <li> + <p><b>Matthieu Triclot</b>, Université de Technologie de Belfort-Montbéliard.</p> + </li> + <li> + <p><b>Yann Minh</b> et <b>Étienne Armand Amato</b></p> + </li> +</ul> +", + + 'link' => 'http://www.iri.centrepompidou.fr/evenement/museologie-museographie-et-nouvelles-formes-dadresse-au-public/?lang=fr_fr', + + 'islive' => true, + + 'keywords' => 'muséographie, muséologie, contribution, numérique, défis', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "<a href='http://www.culture.gouv.fr/' +class='footerLink' target='_blank'> Ministère de la Culture et de la Communication </a> +| <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'> +IRI </a>", + + 'client_visual' => "images/client_visual.jpg", // 480 x 320 pixels + + 'head_logo' => 'images/head_logo.gif', // 171 × 63 pixels + + 'slide_background' => "images/slide_background.jpg", // 606 × 282 pixels + + 'archive_img' => "images/archive_img.jpg", // 270 × 150 pixels + + 'archive_title' => "Muséologie 2012-2013 - Le jeu pour apprendre, pour jouer, pour penser, pour travailler.", + + 'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mercredi 20 mars 2013 | 17:00", + + // After the event + 'metadata' => "1d1e91c8-71d4-11e1-99d6-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-05-jeu/images/archive_img.jpg Binary file web/museo-1213-05-jeu/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-05-jeu/images/client_visual.jpg Binary file web/museo-1213-05-jeu/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-05-jeu/images/head_logo.gif Binary file web/museo-1213-05-jeu/images/head_logo.gif has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-05-jeu/images/slide_background.jpg Binary file web/museo-1213-05-jeu/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-05-jeu/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-05-jeu/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ +<?php +// Permanent redirection +header("HTTP/1.1 301 Moved Permanently"); +header("Location: client.php"); +exit(); +?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-06-science-collaborative/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-06-science-collaborative/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,50 @@ +<?php +$config = array( + 'hashtag' => '#museoweb', + + 'title' => "Muséologie, muséographie et nouvelles formes d’adresse au public<br />Les enjeux de la contribution", + + 'abstract' => "« <b>La science collaborative</b> » <br/>23/04/2013 à 17h00 dans la classe numérique <br />à la Cité des Sciences et de l'Industrie (Paris)", + + 'description'=> "<p><b>La science collaborative.</b> (le 23/04/2013)</p> + <p>La classe numérique se trouve dans le Carrefour Numérique, Cité des sciences et de l'industrie, Niveau -1, 30 avenue Corentin Cariou, 75019 Paris (M° Porte de la Villette).</p> +<ul> + <li> + <p><b>Olivier Las Vergnas</b>, Universcience.</p> + </li> + <li> + <p><b>Romain Julliard</b>, Muséum National d'Histoire Naturelle, Vigie-Nature.</p> + </li> + <li> + <p><b>Manuel Zacklad</b>, Conservatoire National des Arts et Métiers, Dicen-IDF (Dispositifs d'Information et Communication à l'Ère Numérique).</p> + </li> +</ul> +", + + 'link' => 'http://www.iri.centrepompidou.fr/evenement/museologie-museographie-et-nouvelles-formes-dadresse-au-public/?lang=fr_fr', + + + 'keywords' => 'muséographie, muséologie, collaboration, sciences, science collaborative', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "<a href='http://www.culture.gouv.fr/' +class='footerLink' target='_blank'> Ministère de la Culture et de la Communication </a> +| <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'> +IRI </a>", + + 'client_visual' => "images/client_visual.jpg", // 480 x 320 pixels + + 'head_logo' => 'images/head_logo.gif', // 171 × 63 pixels + + 'slide_background' => "images/slide_background.jpg", // 606 × 282 pixels + + 'archive_img' => "images/archive_img.jpg", // 270 × 150 pixels + + 'archive_title' => "Muséologie 2012-2013 - La science collaborative.", + + 'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> à la Cité des Sciences et de l'Industrie<br/> le mardi 23 avril 2013 | 17:00", + + // After the event + 'metadata' => "1d1e91c8-71d4-11e1-99d6-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-06-science-collaborative/images/archive_img.jpg Binary file web/museo-1213-06-science-collaborative/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-06-science-collaborative/images/client_visual.jpg Binary file web/museo-1213-06-science-collaborative/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-06-science-collaborative/images/head_logo.gif Binary file web/museo-1213-06-science-collaborative/images/head_logo.gif has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-06-science-collaborative/images/slide_background.jpg Binary file web/museo-1213-06-science-collaborative/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo-1213-06-science-collaborative/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo-1213-06-science-collaborative/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ +<?php +// Permanent redirection +header("HTTP/1.1 301 Moved Permanently"); +header("Location: client.php"); +exit(); +?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo/config.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo/config.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,53 @@ +<?php +$config = array( + + 'event_list' => array( + 'museo-1213-05-jeu', + 'museo-1213-04-web-ingenierie-philosophie', + 'museo-1213-03-techniques-humanites', + 'museo-1213-02-vecteurs-numerique', + 'museo-1213-01-inaugurale', + "2011-2012-museo-audiovisuel", + "2011-2012-museo-ingenierie", + "2011-2012-museo-contribution", + "2011-2012-museo-structured-data", + "2011-2012-museo-desir", + "2011-2012-museo-ouverture", + ), + + 'hashtag' => '#museoweb', + + 'title' => "Muséologie, muséographie et nouvelles formes d’adresse au public", + + 'abstract' => "« <b>Digital Studies : La culture face aux défis du numérique</b> » <br/> 13/11/2012 de 17h00 à 20h00 au Centre Pompidou (Paris)", + + 'description'=> "", + + 'link' => 'http://www.iri.centrepompidou.fr/evenement/museologie-museographie-et-nouvelles-formes-dadresse-au-public/?lang=fr_fr', + + 'islive' => true, + + 'keywords' => 'muséographie, muséologie, contribution, numérique, défis', + + 'rep' => basename(__DIR__), + + 'partenaires'=> "<a href='http://www.culture.gouv.fr/' +class='footerLink' target='_blank'> Ministère de la Culture et communication </a> +| <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'> +IRI </a>", + + 'client_visual' => "images/client_visual.jpg", // 480 x 320 pixels + + 'head_logo' => 'images/head_logo.gif', // 171 × 63 pixels + + 'slide_background' => "images/slide_background.jpg", // 606 × 282 pixels + + 'archive_img' => "images/archive_img.jpg", // 270 × 150 pixels + + 'archive_title' => "Muséologie, Muséographie et nouvelles formes d’adresse au public", + + 'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mardi 13 novembre 2012 | 17:00 - 20:00", + + // After the event + 'metadata' => "1d1e91c8-71d4-11e1-99d6-00145ea4a2be" +); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo/images/archive_img.jpg Binary file web/museo/images/archive_img.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo/images/client_visual.jpg Binary file web/museo/images/client_visual.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo/images/head_logo.gif Binary file web/museo/images/head_logo.gif has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo/images/slide_background.jpg Binary file web/museo/images/slide_background.jpg has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo/index.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo/index.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ +<?php +// Permanent redirection +header("HTTP/1.1 301 Moved Permanently"); +header("Location: select.php"); +exit(); +?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/museo/polemicaltimeline.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/museo/polemicaltimeline.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,6 @@ +<?php +// Permanent redirection +header("HTTP/1.1 301 Moved Permanently"); +header("Location: select.php"); +exit(); +?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/player_embed.php --- a/web/player_embed.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/player_embed.php Sun Apr 21 21:54:24 2013 +0200 @@ -69,6 +69,11 @@ height: 300, provider: "rtmp" }, + { type: "Slider" }, + { + type: "Controller", + disable_annotate_btn: true + }, <?php if ($protocol_level > 1): ?> { type: "Polemic" @@ -78,11 +83,6 @@ <?php endif; ?> }, <?php endif; ?> - { type: "Slider" }, - { - type: "Controller", - disable_annotate_btn: true - }, { type: "MultiSegments" }, diff -r 2251fb41dbc7 -r 1e110b03ae96 web/polemicaltimeline.php --- a/web/polemicaltimeline.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/polemicaltimeline.php Sun Apr 21 21:54:24 2013 +0200 @@ -108,19 +108,16 @@ _cookiematches = document.cookie.match(/PHPSESSID=([A-Za-z0-9]+)/), _cookie = (_cookiematches && _cookiematches.length > 1 ? _cookiematches[1] : undefined); -<?php if ($use_protocol): ?> var _tracer = tracemanager.init_trace("test", { - url: "http://traces.advene.org:5000/", + url: "http://trail.dev.fabelier.org/", requestmode: "GET", syncmode: "sync", default_subject: "PolemicTweet" }); _tracer.trace("Pt_LoadPage", { - url: document.location.href, - protocol_level: <?php echo $protocol_level; ?>, - cookie: _cookie + cookie: _cookie, + url: document.location.href }); -<?php endif; ?> IriSP.libFiles.defaultDir = "<?php echo(registry_url('libdir','js'));?>"; IriSP.widgetsDir = "<?php echo(registry_url('ldtwidgets','js'));?>"; @@ -148,6 +145,11 @@ provider: "rtmp", autostart: true }, + { type: "Slider" }, + { + type: "Controller", + disable_annotate_btn: true + }, <?php if ($protocol_level > 1): ?> { type: "Polemic" @@ -157,17 +159,16 @@ <?php endif; ?> }, <?php endif; ?> - { type: "Slider" }, - { - type: "Controller", - disable_annotate_btn: true - }, <?php if ($protocol_level > 1): ?> { - type: "MultiSegments" + type: "Segments", + annotation_type: "chap" + }, + { + type: "Annotation", + annotation_type: "chap" }, { type: "Tweet" }, -<?php if (!$use_protocol): ?> { type: "Tagcloud", container: "TagcloudContainer", @@ -181,19 +182,16 @@ container: "AnnotationsListContainer" }, <?php endif; ?> -<?php endif; ?> { type: "Mediafragment"}, -<?php if ($use_protocol): ?> { type: "Trace", tracer: _tracer, extend: { cookie: _cookie, - protocol_level: _protocol_level + url: document.location.href }, - js_console: true + js_console: false } -<?php endif; ?> ] }; @@ -367,6 +365,7 @@  <div id="mdpgauche"> <ul class="accordeon"> + <div id="Slideshare"></div> <li class="acctitre"> <h3><?php echo($translate->_('config__title')); ?></h3> </li> diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/css/tweetcast.css --- a/web/res/css/tweetcast.css Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/css/tweetcast.css Sun Apr 21 21:54:24 2013 +0200 @@ -414,7 +414,7 @@ } .full p.tweet_text { - font-size: 12px; margin: 5px 0 5px 58px; height: 108px; width: 207px; color: #000000; + font-size: 11px; margin: 0 0 0 58px; color: #000000; } .half p.tweet_text { @@ -426,7 +426,7 @@ } .full .profile_image { - margin: 5px 5px 0 5px; width: 48px; height: 48px; + margin: 5px 5px 0; width: 48px; height: 48px; } .half .profile_image { @@ -441,7 +441,7 @@ font-size: 12px; text-align: center; font-style: italic; color: #999999; width: 58px; overflow: hidden; } -.annotations { +.annotations, .twmain { position: absolute; margin: 0; padding: 0; top: 0; left: 0; width: 100%; height: 100%; } @@ -453,10 +453,6 @@ float: left; height: 100%; } -div.twmain { - position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 2; overflow: hidden; -} - div.tweet_actions { position: absolute; bottom : 2px; right: 4px; font-size: 11px; } @@ -738,6 +734,10 @@ float: left; width: 270px; padding: 12px; border: 1px solid #999; background: #f0f0f0; margin: 12px; font-size: 15px; } +.archivesVideoBox:nth-child(3n+1) { + clear: left; +} + .archivesVideoBox:hover { background: #e0e0e0; } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/js/jquery-ui.css --- a/web/res/js/jquery-ui.css Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/js/jquery-ui.css Sun Apr 21 21:54:24 2013 +0200 @@ -1,379 +1,969 @@ -/* - * jQuery UI CSS Framework @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - */ - +/*! jQuery UI - v1.10.2 - 2013-03-14 +* http://jqueryui.com +* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css +* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */ /* Layout helpers ----------------------------------*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-clearfix { + min-height: 0; /* support: IE7 */ +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); +} + +.ui-front { + z-index: 100; +} /* Interaction Cues ----------------------------------*/ -.ui-state-disabled { cursor: default !important; } +.ui-state-disabled { + cursor: default !important; +} /* Icons ----------------------------------*/ /* states and images */ -.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; +} /* Misc visuals ----------------------------------*/ /* Overlays */ -.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } -/* - * jQuery UI Accordion @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Accordion#theming - */ -/* IE/Win - Fix animation bug - #4615 */ -.ui-accordion { width: 100%; } -.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } -.ui-accordion .ui-accordion-li-fix { display: inline; } -.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } -.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } -.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; } -.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } -.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } -.ui-accordion .ui-accordion-content-active { display: block; }/* - * jQuery UI Autocomplete @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Autocomplete#theming - */ -.ui-autocomplete { position: absolute; cursor: default; } +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + +.ui-accordion .ui-accordion-header { + display: block; + cursor: pointer; + position: relative; + margin-top: 2px; + padding: .5em .5em .5em .7em; + min-height: 0; /* support: IE7 */ +} +.ui-accordion .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-noicons { + padding-left: .7em; +} +.ui-accordion .ui-accordion-icons .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-header .ui-accordion-header-icon { + position: absolute; + left: .5em; + top: 50%; + margin-top: -8px; +} +.ui-accordion .ui-accordion-content { + padding: 1em 2.2em; + border-top: 0; + overflow: auto; +} + +.ui-autocomplete { + position: absolute; + top: 0; + left: 0; + cursor: default; +} + +.ui-button { + display: inline-block; + position: relative; + padding: 0; + line-height: normal; + margin-right: .1em; + cursor: pointer; + vertical-align: middle; + text-align: center; + overflow: visible; /* removes extra width in IE */ +} +.ui-button, +.ui-button:link, +.ui-button:visited, +.ui-button:hover, +.ui-button:active { + text-decoration: none; +} +/* to make room for the icon, a width needs to be set here */ +.ui-button-icon-only { + width: 2.2em; +} +/* button elements seem to need a little more width */ +button.ui-button-icon-only { + width: 2.4em; +} +.ui-button-icons-only { + width: 3.4em; +} +button.ui-button-icons-only { + width: 3.7em; +} + +/* button text element */ +.ui-button .ui-button-text { + display: block; + line-height: normal; +} +.ui-button-text-only .ui-button-text { + padding: .4em 1em; +} +.ui-button-icon-only .ui-button-text, +.ui-button-icons-only .ui-button-text { + padding: .4em; + text-indent: -9999999px; +} +.ui-button-text-icon-primary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 1em .4em 2.1em; +} +.ui-button-text-icon-secondary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 2.1em .4em 1em; +} +.ui-button-text-icons .ui-button-text { + padding-left: 2.1em; + padding-right: 2.1em; +} +/* no icon support for input elements, provide padding by default */ +input.ui-button { + padding: .4em 1em; +} + +/* button icon element(s) */ +.ui-button-icon-only .ui-icon, +.ui-button-text-icon-primary .ui-icon, +.ui-button-text-icon-secondary .ui-icon, +.ui-button-text-icons .ui-icon, +.ui-button-icons-only .ui-icon { + position: absolute; + top: 50%; + margin-top: -8px; +} +.ui-button-icon-only .ui-icon { + left: 50%; + margin-left: -8px; +} +.ui-button-text-icon-primary .ui-button-icon-primary, +.ui-button-text-icons .ui-button-icon-primary, +.ui-button-icons-only .ui-button-icon-primary { + left: .5em; +} +.ui-button-text-icon-secondary .ui-button-icon-secondary, +.ui-button-text-icons .ui-button-icon-secondary, +.ui-button-icons-only .ui-button-icon-secondary { + right: .5em; +} + +/* button sets */ +.ui-buttonset { + margin-right: 7px; +} +.ui-buttonset .ui-button { + margin-left: 0; + margin-right: -.3em; +} /* workarounds */ -* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ +/* reset extra padding in Firefox, see h5bp.com/l */ +input.ui-button::-moz-focus-inner, +button.ui-button::-moz-focus-inner { + border: 0; + padding: 0; +} + +.ui-datepicker { + width: 17em; + padding: .2em .2em 0; + display: none; +} +.ui-datepicker .ui-datepicker-header { + position: relative; + padding: .2em 0; +} +.ui-datepicker .ui-datepicker-prev, +.ui-datepicker .ui-datepicker-next { + position: absolute; + top: 2px; + width: 1.8em; + height: 1.8em; +} +.ui-datepicker .ui-datepicker-prev-hover, +.ui-datepicker .ui-datepicker-next-hover { + top: 1px; +} +.ui-datepicker .ui-datepicker-prev { + left: 2px; +} +.ui-datepicker .ui-datepicker-next { + right: 2px; +} +.ui-datepicker .ui-datepicker-prev-hover { + left: 1px; +} +.ui-datepicker .ui-datepicker-next-hover { + right: 1px; +} +.ui-datepicker .ui-datepicker-prev span, +.ui-datepicker .ui-datepicker-next span { + display: block; + position: absolute; + left: 50%; + margin-left: -8px; + top: 50%; + margin-top: -8px; +} +.ui-datepicker .ui-datepicker-title { + margin: 0 2.3em; + line-height: 1.8em; + text-align: center; +} +.ui-datepicker .ui-datepicker-title select { + font-size: 1em; + margin: 1px 0; +} +.ui-datepicker select.ui-datepicker-month-year { + width: 100%; +} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { + width: 49%; +} +.ui-datepicker table { + width: 100%; + font-size: .9em; + border-collapse: collapse; + margin: 0 0 .4em; +} +.ui-datepicker th { + padding: .7em .3em; + text-align: center; + font-weight: bold; + border: 0; +} +.ui-datepicker td { + border: 0; + padding: 1px; +} +.ui-datepicker td span, +.ui-datepicker td a { + display: block; + padding: .2em; + text-align: right; + text-decoration: none; +} +.ui-datepicker .ui-datepicker-buttonpane { + background-image: none; + margin: .7em 0 0 0; + padding: 0 .2em; + border-left: 0; + border-right: 0; + border-bottom: 0; +} +.ui-datepicker .ui-datepicker-buttonpane button { + float: right; + margin: .5em .2em .4em; + cursor: pointer; + padding: .2em .6em .3em .6em; + width: auto; + overflow: visible; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { + float: left; +} -/* - * jQuery UI Menu @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Menu#theming - */ +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { + width: auto; +} +.ui-datepicker-multi .ui-datepicker-group { + float: left; +} +.ui-datepicker-multi .ui-datepicker-group table { + width: 95%; + margin: 0 auto .4em; +} +.ui-datepicker-multi-2 .ui-datepicker-group { + width: 50%; +} +.ui-datepicker-multi-3 .ui-datepicker-group { + width: 33.3%; +} +.ui-datepicker-multi-4 .ui-datepicker-group { + width: 25%; +} +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { + border-left-width: 0; +} +.ui-datepicker-multi .ui-datepicker-buttonpane { + clear: left; +} +.ui-datepicker-row-break { + clear: both; + width: 100%; + font-size: 0; +} + +/* RTL support */ +.ui-datepicker-rtl { + direction: rtl; +} +.ui-datepicker-rtl .ui-datepicker-prev { + right: 2px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next { + left: 2px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-prev:hover { + right: 1px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next:hover { + left: 1px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane { + clear: right; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button { + float: left; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, +.ui-datepicker-rtl .ui-datepicker-group { + float: right; +} +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { + border-right-width: 0; + border-left-width: 1px; +} + +.ui-dialog { + position: absolute; + top: 0; + left: 0; + padding: .2em; + outline: 0; +} +.ui-dialog .ui-dialog-titlebar { + padding: .4em 1em; + position: relative; +} +.ui-dialog .ui-dialog-title { + float: left; + margin: .1em 0; + white-space: nowrap; + width: 90%; + overflow: hidden; + text-overflow: ellipsis; +} +.ui-dialog .ui-dialog-titlebar-close { + position: absolute; + right: .3em; + top: 50%; + width: 21px; + margin: -10px 0 0 0; + padding: 1px; + height: 20px; +} +.ui-dialog .ui-dialog-content { + position: relative; + border: 0; + padding: .5em 1em; + background: none; + overflow: auto; +} +.ui-dialog .ui-dialog-buttonpane { + text-align: left; + border-width: 1px 0 0 0; + background-image: none; + margin-top: .5em; + padding: .3em 1em .5em .4em; +} +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { + float: right; +} +.ui-dialog .ui-dialog-buttonpane button { + margin: .5em .4em .5em 0; + cursor: pointer; +} +.ui-dialog .ui-resizable-se { + width: 12px; + height: 12px; + right: -5px; + bottom: -5px; + background-position: 16px 16px; +} +.ui-draggable .ui-dialog-titlebar { + cursor: move; +} + .ui-menu { - list-style:none; + list-style: none; padding: 2px; margin: 0; - display:block; - float: left; + display: block; + outline: none; } .ui-menu .ui-menu { margin-top: -3px; + position: absolute; } .ui-menu .ui-menu-item { - margin:0; + margin: 0; padding: 0; - zoom: 1; - float: left; - clear: left; width: 100%; } +.ui-menu .ui-menu-divider { + margin: 5px -2px 5px -2px; + height: 0; + font-size: 0; + line-height: 0; + border-width: 1px 0 0 0; +} .ui-menu .ui-menu-item a { - text-decoration:none; - display:block; - padding:.2em .4em; - line-height:1.5; - zoom:1; + text-decoration: none; + display: block; + padding: 2px .4em; + line-height: 1.5; + min-height: 0; /* support: IE7 */ + font-weight: normal; } -.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-focus, .ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; } -/* - * jQuery UI Button @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Button#theming - */ -.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ -.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ -button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ -.ui-button-icons-only { width: 3.4em; } -button.ui-button-icons-only { width: 3.7em; } + +.ui-menu .ui-state-disabled { + font-weight: normal; + margin: .4em 0 .2em; + line-height: 1.5; +} +.ui-menu .ui-state-disabled a { + cursor: default; +} + +/* icon support */ +.ui-menu-icons { + position: relative; +} +.ui-menu-icons .ui-menu-item a { + position: relative; + padding-left: 2em; +} -/*button text element */ -.ui-button .ui-button-text { display: block; line-height: 1.4; } -.ui-button-text-only .ui-button-text { padding: .4em 1em; } -.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } -.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } -.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } -.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } -/* no icon support for input elements, provide padding by default */ -input.ui-button { padding: .4em 1em; } +/* left-aligned */ +.ui-menu .ui-icon { + position: absolute; + top: .2em; + left: .2em; +} + +/* right-aligned */ +.ui-menu .ui-menu-icon { + position: static; + float: right; +} -/*button icon element(s) */ -.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } -.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } -.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } -.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } -.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } - -/*button sets*/ -.ui-buttonset { margin-right: 7px; } -.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } +.ui-progressbar { + height: 2em; + text-align: left; + overflow: hidden; +} +.ui-progressbar .ui-progressbar-value { + margin: -1px; + height: 100%; +} +.ui-progressbar .ui-progressbar-overlay { + background: url("images/animated-overlay.gif"); + height: 100%; + filter: alpha(opacity=25); + opacity: 0.25; +} +.ui-progressbar-indeterminate .ui-progressbar-value { + background-image: none; +} -/* workarounds */ -button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ -/* - * jQuery UI Datepicker @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Datepicker#theming - */ -.ui-datepicker { width: 17em; padding: .2em .2em 0; } -.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } -.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } -.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } -.ui-datepicker .ui-datepicker-prev { left:2px; } -.ui-datepicker .ui-datepicker-next { right:2px; } -.ui-datepicker .ui-datepicker-prev-hover { left:1px; } -.ui-datepicker .ui-datepicker-next-hover { right:1px; } -.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } -.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } -.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } -.ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { width: 49%;} -.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } -.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } -.ui-datepicker td { border: 0; padding: 1px; } -.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } -.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } -.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { width:auto; } -.ui-datepicker-multi .ui-datepicker-group { float:left; } -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; } +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} -/* RTL support */ -.ui-datepicker-rtl { direction: rtl; } -.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } -.ui-datepicker-rtl .ui-datepicker-group { float:right; } -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-slider { + position: relative; + text-align: left; +} +.ui-slider .ui-slider-handle { + position: absolute; + z-index: 2; + width: 1.2em; + height: 1.2em; + cursor: default; +} +.ui-slider .ui-slider-range { + position: absolute; + z-index: 1; + font-size: .7em; + display: block; + border: 0; + background-position: 0 0; +} -/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ -.ui-datepicker-cover { - display: none; /*sorry for IE5*/ - display/**/: block; /*sorry for IE5*/ - position: absolute; /*must have*/ - z-index: -1; /*must have*/ - filter: mask(); /*must have*/ - top: -4px; /*must have*/ - left: -4px; /*must have*/ - width: 200px; /*must have*/ - height: 200px; /*must have*/ -}/* - * jQuery UI Dialog @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Dialog#theming - */ -.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } -.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; } -.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } -.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } -.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } -.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } -.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } -.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } -.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } -.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } -.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } -.ui-draggable .ui-dialog-titlebar { cursor: move; } -/* - * jQuery UI Progressbar @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Progressbar#theming - */ -.ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* - * jQuery UI Resizable @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Resizable#theming - */ -.ui-resizable { position: relative;} -.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } -.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } -.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } -.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } -.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } -.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } -.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } -.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } -.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* - * jQuery UI Selectable @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Selectable#theming - */ -.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } -/* - * jQuery UI Slider @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Slider#theming - */ -.ui-slider { position: relative; text-align: left; } -.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } -.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } +/* For IE8 - See #6727 */ +.ui-slider.ui-state-disabled .ui-slider-handle, +.ui-slider.ui-state-disabled .ui-slider-range { + filter: inherit; +} + +.ui-slider-horizontal { + height: .8em; +} +.ui-slider-horizontal .ui-slider-handle { + top: -.3em; + margin-left: -.6em; +} +.ui-slider-horizontal .ui-slider-range { + top: 0; + height: 100%; +} +.ui-slider-horizontal .ui-slider-range-min { + left: 0; +} +.ui-slider-horizontal .ui-slider-range-max { + right: 0; +} + +.ui-slider-vertical { + width: .8em; + height: 100px; +} +.ui-slider-vertical .ui-slider-handle { + left: -.3em; + margin-left: 0; + margin-bottom: -.6em; +} +.ui-slider-vertical .ui-slider-range { + left: 0; + width: 100%; +} +.ui-slider-vertical .ui-slider-range-min { + bottom: 0; +} +.ui-slider-vertical .ui-slider-range-max { + top: 0; +} -.ui-slider-horizontal { height: .8em; } -.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } -.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } -.ui-slider-horizontal .ui-slider-range-min { left: 0; } -.ui-slider-horizontal .ui-slider-range-max { right: 0; } +.ui-spinner { + position: relative; + display: inline-block; + overflow: hidden; + padding: 0; + vertical-align: middle; +} +.ui-spinner-input { + border: none; + background: none; + color: inherit; + padding: 0; + margin: .2em 0; + vertical-align: middle; + margin-left: .4em; + margin-right: 22px; +} +.ui-spinner-button { + width: 16px; + height: 50%; + font-size: .5em; + padding: 0; + margin: 0; + text-align: center; + position: absolute; + cursor: default; + display: block; + overflow: hidden; + right: 0; +} +/* more specificity required here to overide default borders */ +.ui-spinner a.ui-spinner-button { + border-top: none; + border-bottom: none; + border-right: none; +} +/* vertical centre icon */ +.ui-spinner .ui-icon { + position: absolute; + margin-top: -8px; + top: 50%; + left: 0; +} +.ui-spinner-up { + top: 0; +} +.ui-spinner-down { + bottom: 0; +} -.ui-slider-vertical { width: .8em; height: 100px; } -.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } -.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } -.ui-slider-vertical .ui-slider-range-min { bottom: 0; } -.ui-slider-vertical .ui-slider-range-max { top: 0; }/* - * jQuery UI Tabs @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Tabs#theming - */ -.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ -.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } -.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; } -.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } -.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } -.ui-tabs .ui-tabs-hide { display: none !important; } -/* - * jQuery UI CSS Framework @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - * - * To view and modify this theme, visit http://jqueryui.com/themeroller/ - */ +/* TR overrides */ +.ui-spinner .ui-icon-triangle-1-s { + /* need to fix icons sprite */ + background-position: -65px -16px; +} +.ui-tabs { + position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ + padding: .2em; +} +.ui-tabs .ui-tabs-nav { + margin: 0; + padding: .2em .2em 0; +} +.ui-tabs .ui-tabs-nav li { + list-style: none; + float: left; + position: relative; + top: 0; + margin: 1px .2em 0 0; + border-bottom-width: 0; + padding: 0; + white-space: nowrap; +} +.ui-tabs .ui-tabs-nav li a { + float: left; + padding: .5em 1em; + text-decoration: none; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active { + margin-bottom: -1px; + padding-bottom: 1px; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active a, +.ui-tabs .ui-tabs-nav li.ui-state-disabled a, +.ui-tabs .ui-tabs-nav li.ui-tabs-loading a { + cursor: text; +} +.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { + cursor: pointer; +} +.ui-tabs .ui-tabs-panel { + display: block; + border-width: 0; + padding: 1em 1.4em; + background: none; +} + +.ui-tooltip { + padding: 8px; + position: absolute; + z-index: 9999; + max-width: 300px; + -webkit-box-shadow: 0 0 5px #aaa; + box-shadow: 0 0 5px #aaa; +} +body .ui-tooltip { + border-width: 2px; +} /* Component containers ----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; } -.ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; } -.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; } -.ui-widget-content a { color: #222222/*{fcContent}*/; } -.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; } -.ui-widget-header a { color: #222222/*{fcHeader}*/; } +.ui-widget { + font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; + font-size: 1.1em/*{fsDefault}*/; +} +.ui-widget .ui-widget { + font-size: 1em; +} +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; + font-size: 1em; +} +.ui-widget-content { + border: 1px solid #aaaaaa/*{borderColorContent}*/; + background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; + color: #222222/*{fcContent}*/; +} +.ui-widget-content a { + color: #222222/*{fcContent}*/; +} +.ui-widget-header { + border: 1px solid #aaaaaa/*{borderColorHeader}*/; + background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; + color: #222222/*{fcHeader}*/; + font-weight: bold; +} +.ui-widget-header a { + color: #222222/*{fcHeader}*/; +} /* Interaction states ----------------------------------*/ -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; } -.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; } -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; } -.ui-state-hover a, .ui-state-hover a:hover { color: #212121/*{fcHover}*/; text-decoration: none; } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; } -.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; } -.ui-widget :active { outline: none; } +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { + border: 1px solid #d3d3d3/*{borderColorDefault}*/; + background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #555555/*{fcDefault}*/; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited { + color: #555555/*{fcDefault}*/; + text-decoration: none; +} +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus { + border: 1px solid #999999/*{borderColorHover}*/; + background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #212121/*{fcHover}*/; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited { + color: #212121/*{fcHover}*/; + text-decoration: none; +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { + border: 1px solid #aaaaaa/*{borderColorActive}*/; + background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #212121/*{fcActive}*/; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #212121/*{fcActive}*/; + text-decoration: none; +} /* Interaction Cues ----------------------------------*/ -.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; } -.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; } -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; } -.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; } -.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; } -.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } -.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } -.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #fcefa1/*{borderColorHighlight}*/; + background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; + color: #363636/*{fcHighlight}*/; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #363636/*{fcHighlight}*/; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #cd0a0a/*{borderColorError}*/; + background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; + color: #cd0a0a/*{fcError}*/; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #cd0a0a/*{fcError}*/; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #cd0a0a/*{fcError}*/; +} +.ui-priority-primary, +.ui-widget-content .ui-priority-primary, +.ui-widget-header .ui-priority-primary { + font-weight: bold; +} +.ui-priority-secondary, +.ui-widget-content .ui-priority-secondary, +.ui-widget-header .ui-priority-secondary { + opacity: .7; + filter:Alpha(Opacity=70); + font-weight: normal; +} +.ui-state-disabled, +.ui-widget-content .ui-state-disabled, +.ui-widget-header .ui-state-disabled { + opacity: .35; + filter:Alpha(Opacity=35); + background-image: none; +} +.ui-state-disabled .ui-icon { + filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ +} /* Icons ----------------------------------*/ /* states and images */ -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; } -.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; } -.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; } -.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; } +.ui-icon { + width: 16px; + height: 16px; +} +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; +} +.ui-widget-header .ui-icon { + background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; +} +.ui-state-default .ui-icon { + background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon { + background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; +} +.ui-state-active .ui-icon { + background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; +} +.ui-state-highlight .ui-icon { + background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; +} /* positioning */ +.ui-icon-blank { background-position: 16px 16px; } .ui-icon-carat-1-n { background-position: 0 0; } .ui-icon-carat-1-ne { background-position: -16px 0; } .ui-icon-carat-1-e { background-position: -32px 0; } @@ -500,8 +1090,8 @@ .ui-icon-help { background-position: -48px -144px; } .ui-icon-check { background-position: -64px -144px; } .ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-off { background-position: -96px -144px; } -.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-radio-on { background-position: -96px -144px; } +.ui-icon-radio-off { background-position: -112px -144px; } .ui-icon-pin-w { background-position: -128px -144px; } .ui-icon-pin-s { background-position: -144px -144px; } .ui-icon-play { background-position: 0 -160px; } @@ -555,16 +1145,42 @@ ----------------------------------*/ /* Corner radius */ -.ui-corner-tl { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-top { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-bottom { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-right { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-left { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-all { -moz-border-radius: 4px/*{cornerRadius}*/; -webkit-border-radius: 4px/*{cornerRadius}*/; border-radius: 4px/*{cornerRadius}*/; } +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + border-top-left-radius: 4px/*{cornerRadius}*/; +} +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + border-top-right-radius: 4px/*{cornerRadius}*/; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + border-bottom-left-radius: 4px/*{cornerRadius}*/; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + border-bottom-right-radius: 4px/*{cornerRadius}*/; +} /* Overlays */ -.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; } -.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; } \ No newline at end of file +.ui-widget-overlay { + background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; + opacity: .3/*{opacityOverlay}*/; + filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; +} +.ui-widget-shadow { + margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; + padding: 8px/*{thicknessShadow}*/; + background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; + opacity: .3/*{opacityShadow}*/; + filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; + border-radius: 8px/*{cornerRadiusShadow}*/; +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/js/jquery-ui.min.js --- a/web/res/js/jquery-ui.min.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/js/jquery-ui.min.js Sun Apr 21 21:54:24 2013 +0200 @@ -1,784 +1,12 @@ -/*! - * jQuery UI 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI - */ -(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.13", -keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus(); -b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this, -"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection", -function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth, -outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b); -return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e= -0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery); -;/*! - * jQuery UI Widget 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Widget - */ -(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h, -a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h; -e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options, -this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")}, -widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this}, -enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery); -;/*! - * jQuery UI Mouse 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Mouse - * - * Depends: - * jquery.ui.widget.js - */ -(function(b){var d=false;b(document).mousedown(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+ -this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"?b(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted= -this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&& -!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted= -false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery); -;/* - * jQuery UI Position 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Position - */ -(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY, -left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+= -k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-= -m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left= -d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+= -a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b), -g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery); -;/* - * jQuery UI Draggable 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Draggables - * - * Depends: - * jquery.ui.core.js - * jquery.ui.mouse.js - * jquery.ui.widget.js - */ -(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper== -"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b= -this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;this.helper= -this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}); -this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a); -this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b= -d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop", -a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this== -a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a= -{left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&& -d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a= -this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions= -{width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[(a.containment=="document"?0:d(window).scrollLeft())-this.offset.relative.left-this.offset.parent.left,(a.containment=="document"?0:d(window).scrollTop())-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+ -d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!="hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"), -10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height- -this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&& -d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0], -this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top; -if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1];h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=this.originalPageX+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left< -g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"); -this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.13"}); -d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver= -0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs= -c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a, -true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver= -0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor= -a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable"); -if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop= -f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed); -else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b, -a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top, -o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top; -if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top= -c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&& -c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}}); -d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery); -;/* - * jQuery UI Droppable 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Droppables - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - * jquery.ui.mouse.js - * jquery.ui.draggable.js - */ -(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this); -a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&& -this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass); -this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g= -d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop", -a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.13"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height; -switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>= -i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!= -"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem|| -a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e= -d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})}}})(jQuery); -;/* - * jQuery UI Resizable 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Resizables - * - * Depends: - * jquery.ui.core.js - * jquery.ui.mouse.js - * jquery.ui.widget.js - */ -(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element, -_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(), -top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle= -this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne", -nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor== -String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection(); -this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy(); -var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a= -false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"}); -this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff= -{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis]; -if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing= -false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height); -c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size, -d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width= -a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b= -this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)|| -c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left- -c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this, -arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement, -element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.13"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})}; -if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"), -p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options, -c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName), -g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"), -10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0, -top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h; -g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left: -0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position")); -if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&& -!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost== -"string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid; -var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b, -10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery); -;/* - * jQuery UI Selectable 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Selectables - * - * Depends: - * jquery.ui.core.js - * jquery.ui.mouse.js - * jquery.ui.widget.js - */ -(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"), -selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX, -c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting", -c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d= -this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting"); -a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&& -!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d= -e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.13"})})(jQuery); -;/* - * jQuery UI Sortable 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Sortables - * - * Depends: - * jquery.ui.core.js - * jquery.ui.mouse.js - * jquery.ui.widget.js - */ -(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable"); -this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a=== -"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&& -!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top, -left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]}; -this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!= -document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a); -return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top< -b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()- -b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this, -a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0], -e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset(); -c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"): -this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null, -dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")}, -toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers|| -this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection(); -var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)}, -_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith(); -if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), -this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element), -this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&& -this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b= -this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f= -d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")|| -0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out", -a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h- -f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b= -this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width== -""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top= -this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a= -{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"), -10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"? -document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"), -10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b= -this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&& -this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset(); -var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g- -this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g- -this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0], -this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]= -"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove", -f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this, -this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop", -a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()}, -_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.13"})})(jQuery); -;/* - * jQuery UI Accordion 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Accordion - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix"); -a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom"); -if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion", -function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a= -this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex"); -this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons(); -b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target); -a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+ -c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options; -if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header); -if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(), -e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight|| -e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false", -"aria-selected":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.13", -animations:{slide:function(a,b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/); -f[i]={value:j[1],unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide", -paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery); -;/* - * jQuery UI Autocomplete 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Autocomplete - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - * jquery.ui.position.js - */ -(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.attr("readonly"))){g= -false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!= -a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)}; -this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&& -a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu"); -d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&& -b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source==="string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source= -this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},_search:function(a){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close(); -this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label|| -b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new d.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var g=this; -d.each(b,function(c,f){g._renderItem(a,f)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, -"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery); -(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex", --1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.scrollTop(),c=this.element.height();if(b<0)this.element.scrollTop(g+b);else b>=c&&this.element.scrollTop(g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id"); -this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b, -this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active|| -this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active|| -this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[d.fn.prop?"prop":"attr"]("scrollHeight")},select:function(e){this._trigger("selected",e,{item:this.active})}})})(jQuery); -;/* - * jQuery UI Button 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Button - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function(a){var g,i=function(b){a(":ui-button",b.target.form).each(function(){var c=a(this).data("button");setTimeout(function(){c.refresh()},1)})},h=function(b){var c=b.name,d=b.form,f=a([]);if(c)f=d?a(d).find("[name='"+c+"']"):a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form});return f};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button", -i);if(typeof this.options.disabled!=="boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,c=this.options,d=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!d?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button", -function(){if(!c.disabled){a(this).addClass("ui-state-hover");this===g&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||a(this).removeClass(f)}).bind("focus.button",function(){a(this).addClass("ui-state-focus")}).bind("blur.button",function(){a(this).removeClass("ui-state-focus")}).bind("click.button",function(e){c.disabled&&e.stopImmediatePropagation()});d&&this.element.bind("change.button",function(){b.refresh()});if(this.type==="checkbox")this.buttonElement.bind("click.button", -function(){if(c.disabled)return false;a(this).toggleClass("ui-state-active");b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed",true);var e=b.element[0];h(e).not(e).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button", -function(){if(c.disabled)return false;a(this).addClass("ui-state-active");g=this;a(document).one("mouseup",function(){g=null})}).bind("mouseup.button",function(){if(c.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(e){if(c.disabled)return false;if(e.keyCode==a.ui.keyCode.SPACE||e.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(e){e.keyCode=== -a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",c.disabled)},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type==="radio"){var b=this.element.parents().filter(":last"),c="label[for="+this.element.attr("id")+"]";this.buttonElement=b.find(c);if(!this.buttonElement.length){b=b.length?b.siblings():this.element.siblings();this.buttonElement=b.filter(c); -if(!this.buttonElement.length)this.buttonElement=b.find(c)}this.element.addClass("ui-helper-hidden-accessible");(b=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()); -this.hasTitle||this.buttonElement.removeAttr("title");a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")c?this.element.attr("disabled",true):this.element.removeAttr("disabled");this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")h(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed", -true):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"), -c=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,f=d.primary&&d.secondary,e=[];if(d.primary||d.secondary){if(this.options.text)e.push("ui-button-text-icon"+(f?"s":d.primary?"-primary":"-secondary"));d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>");d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>");if(!this.options.text){e.push(f?"ui-button-icons-only": -"ui-button-icon-only");this.hasTitle||b.attr("title",c)}}else e.push("ui-button-text-only");b.addClass(e.join(" "))}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end()}, -destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");a.Widget.prototype.destroy.call(this)}})})(jQuery); -;/* - * jQuery UI Dialog 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Dialog - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - * jquery.ui.button.js - * jquery.ui.draggable.js - * jquery.ui.mouse.js - * jquery.ui.position.js - * jquery.ui.resizable.js - */ -(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false, -position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||" ",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+ -b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g), -h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id", -e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"); -a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!== -b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+= -1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target=== -f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a, -function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('<button type="button"></button>').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close", -handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition, -originalSize:f.originalSize,position:f.position,size:f.size}}a=a===l?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize", -f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "): -[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f); -if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"): -e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||" "));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a= -this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height- -b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.13",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "), -create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(), -height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight); -b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances, -function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery); -;/* - * jQuery UI Slider 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Slider - * - * Depends: - * jquery.ui.core.js - * jquery.ui.mouse.js - * jquery.ui.widget.js - */ -(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var b=this,a=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=a.values&&a.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+ -this.orientation+" ui-widget ui-widget-content ui-corner-all"+(a.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(a.range){if(a.range===true){if(!a.values)a.values=[this._valueMin(),this._valueMin()];if(a.values.length&&a.values.length!==2)a.values=[a.values[0],a.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(a.range==="min"||a.range==="max"?" ui-slider-range-"+a.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>"); -this.handles=c.add(d(e.join("")).appendTo(b.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle", -g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!b.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");i=b._start(g,l);if(i===false)return}break}m=b.options.step;i=b.options.values&&b.options.values.length? -(h=b.values(l)):(h=b.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=b._valueMin();break;case d.ui.keyCode.END:h=b._valueMax();break;case d.ui.keyCode.PAGE_UP:h=b._trimAlignValue(i+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=b._trimAlignValue(i-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===b._valueMax())return;h=b._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===b._valueMin())return;h=b._trimAlignValue(i- -m);break}b._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(g,k);b._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy(); -return this},_mouseCapture:function(b){var a=this.options,c,f,e,j,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(a.range===true&&this.values(1)===a.min){g+=1;e=d(this.handles[g])}if(this._start(b,g)===false)return false; -this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();a=e.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-e.width()/2,top:b.pageY-a.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(b){var a= -this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a;if(this.orientation==="horizontal"){a= -this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a); -c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var f;if(this.options.values&&this.options.values.length){f=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>f||a===1&&c<f))c=f;if(c!==this.values(a)){f=this.values();f[a]=c;b=this._trigger("slide",b,{handle:this.handles[a],value:c,values:f});this.values(a?0:1);b!==false&&this.values(a,c,true)}}else if(c!==this.value()){b=this._trigger("slide",b,{handle:this.handles[a],value:c}); -b!==false&&this.value(c)}},_stop:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("stop",b,c)},_change:function(b,a){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("change",b,c)}},value:function(b){if(arguments.length){this.options.value= -this._trimAlignValue(b);this._refreshValue();this._change(null,0)}else return this._value()},values:function(b,a){var c,f,e;if(arguments.length>1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(b): -this.value();else return this._values()},_setOption:function(b,a){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(b){case "disabled":if(a){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation(); -this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var b=this.options.value;return b=this._trimAlignValue(b)},_values:function(b){var a,c;if(arguments.length){a=this.options.values[b]; -return a=this._trimAlignValue(a)}else{a=this.options.values.slice();for(c=0;c<a.length;c+=1)a[c]=this._trimAlignValue(a[c]);return a}},_trimAlignValue:function(b){if(b<=this._valueMin())return this._valueMin();if(b>=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max}, -_refreshValue:function(){var b=this.options.range,a=this.options,c=this,f=!this._animateOff?a.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},a.animate); -if(h===1)c.range[f?"animate":"css"]({width:e-g+"%"},{queue:false,duration:a.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},a.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:a.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1, -1)[f?"animate":"css"]({width:e+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.13"})})(jQuery); -;/* - * jQuery UI Tabs 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Tabs - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading…</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&& -e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b= -d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]|| -(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"); -this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected= -this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active"); -if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected")); -this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+ -g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal", -function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")}; -this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected= --1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier."; -d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e= -d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b, -e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]); -j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove(); -if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null, -this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this}, -load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c, -"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this}, -url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.13"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&& -a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery); -;/* - * jQuery UI Datepicker 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Datepicker - * - * Depends: - * jquery.ui.core.js - */ -(function(d,B){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass= -"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su", -"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10", -minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.delegate("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a", -"mouseout",function(){d(this).removeClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).delegate("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a","mouseover",function(){if(!d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"); -d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).addClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==B)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.13"}});var z=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",log:function(){this.debug&&console.log.apply("",arguments)}, -_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a, -b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker", -function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker); -if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]); -return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a); -if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>'); -this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/ -2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a, -"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled= -false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled= -true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false; -for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&& -this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==B&&f.minDate===B)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==B&&f.maxDate===B)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a= -this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker(); -c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]?d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]):d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b, -"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target, --7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault(); -a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==B?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a); -d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);d.datepicker._curInst&&d.datepicker._curInst!=b&&d.datepicker._curInst.dpDiv.stop(true,true);var c=d.datepicker._get(b,"beforeShow");H(b.settings,c?c.apply(a,[a,b]):{});b.lastVal= -null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos= -null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0], -top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover"); -c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"); -a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]}, -_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e- -g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst= -null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();if(a=this._get(b,"onClose"))a.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")}, -_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"): -0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear= -false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay= -d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a); -else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b= -a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort, -g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var C=o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&C?4:p=="o"?3:2)+"}");p=b.substring(s).match(p);if(!p)throw"Missing number at position "+s;s+=p[0].length;return parseInt(p[0],10)},n=function(p,C,K){p=d.map(o(p)?K:C,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w= -x[1];if(b.substr(s,w.length).toLowerCase()==w.toLowerCase()){E=x[0];s+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+s;},r=function(){if(b.charAt(s)!=a.charAt(A))throw"Unexpected literal at position "+s;s++},s=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else r();else switch(a.charAt(A)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v= -new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "'":if(o("'"))r();else k=true;break;default:r()}if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!= -c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames, -h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,r){return i(o)?r[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break; -case "o":l+=g("o",(b.getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864E5,3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+ -1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==B?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null, -f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b, -c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+= -parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null; -a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear|| -a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay? -new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a)); -n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+z+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var r=this._get(a,"nextText");r=!h?r:this.formatDate(r,this._daylightSavingAdjust(new Date(m, -g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+z+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+r+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+r+"</span></a>";j=this._get(a,"currentText");r=this._get(a,"gotoCurrent")&& -a.currentDay?u:b;j=!h?j:this.formatDate(j,r,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+z+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,r)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+ -z+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");r=this._get(a,"dayNames");this._get(a,"dayNamesShort");var s=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),C=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){for(var O= -"",G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&x==0?c? -f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var D=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var q=(t+h)%7;D+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+r[q]+'">'+s[q]+"</span></th>"}y+=D+"</tr></thead><tbody>";D=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay, -D);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;D=l?6:Math.ceil((t+D)/7);q=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<D;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(q)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[q]):[true,""],F=q.getMonth()!=g,L=F&&!K||!I[0]||k&&q<k||o&&q>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(q.getTime()==P.getTime()&&g==a.selectedMonth&& -a._keyEvent||E.getTime()==q.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!C?"":" "+I[1]+(q.getTime()==u.getTime()?" "+this._currentClass:"")+(q.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||C)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+z+".datepicker._selectDay('#"+a.id+"',"+q.getMonth()+","+q.getFullYear()+', this);return false;"')+">"+(F&&!C?" ":L?'<span class="ui-state-default">'+q.getDate()+ -"</span>":'<a class="ui-state-default'+(q.getTime()==b.getTime()?" ui-state-highlight":"")+(q.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+q.getDate()+"</a>")+"</td>";q.setDate(q.getDate()+1);q=this._daylightSavingAdjust(q)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>': -"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+z+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" onclick=\"DP_jQuery_"+z+".datepicker._clickMonthYear('#"+ -a.id+"');\">";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?" ":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var r=(new Date).getFullYear();i=function(s){s=s.match(/c[+-].*/)?c+parseInt(s.substring(1),10):s.match(/[+-].*/)?r+parseInt(s,10):parseInt(s,10);return isNaN(s)? -r:s};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+z+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+z+".datepicker._clickMonthYear('#"+a.id+"');\">";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+= -(h||!(j&&l)?" ":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a, -"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a, -b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!= -"string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay)); -return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&& -arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.13";window["DP_jQuery_"+z]=d})(jQuery); -;/* - * jQuery UI Progressbar 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Progressbar - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"); -this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100* -this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.13"})})(jQuery); -;/* - * jQuery UI Effects 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/ - */ -jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb$\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*$/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb$\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*$/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1], -16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba$0, 0, 0, 0$/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle, -a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d= -a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor", -"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0, -0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211, -211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b, -d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easding:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})}; -f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this, -[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.13",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b= -0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}); -c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c, -a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments); -a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%", -"pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d* -((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/= -e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/= -e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/ -h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5* -h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c, -e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery); -;/* - * jQuery UI Effects Blind 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Blind - * - * Depends: - * jquery.effects.core.js - */ -(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a, -g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery); -;/* - * jQuery UI Effects Bounce 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Bounce - * - * Depends: - * jquery.effects.core.js - */ -(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/ -3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a); -b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery); -;/* - * jQuery UI Effects Clip 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Clip - * - * Depends: - * jquery.effects.core.js - */ -(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position, -c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Drop 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Drop - * - * Depends: - * jquery.effects.core.js - */ -(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e== -"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Explode 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Explode - * - * Depends: - * jquery.effects.core.js - */ -(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f= -0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+ -e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery); -;/* - * jQuery UI Effects Fade 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Fade - * - * Depends: - * jquery.effects.core.js - */ -(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Fold 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Fold - * - * Depends: - * jquery.effects.core.js - */ -(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1], -10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery); -;/* - * jQuery UI Effects Highlight 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Highlight - * - * Depends: - * jquery.effects.core.js - */ -(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&& -this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Pulsate 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Pulsate - * - * Depends: - * jquery.effects.core.js - */ -(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration, -a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery); -;/* - * jQuery UI Effects Scale 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Scale - * - * Depends: - * jquery.effects.core.js - */ -(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a, -b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity= -1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"], -p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}}; -if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a); -a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from); -child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a, -n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Shake 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Shake - * - * Depends: - * jquery.effects.core.js - */ -(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]= -(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery); -;/* - * jQuery UI Effects Slide 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Slide - * - * Depends: - * jquery.effects.core.js - */ -(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e); -var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery); -;/* - * jQuery UI Effects Transfer 1.8.13 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/Transfer - * - * Depends: - * jquery.effects.core.js - */ -(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments); -b.dequeue()})})}})(jQuery); -; \ No newline at end of file +/*! jQuery UI - v1.10.2 - 2013-03-14 +* http://jqueryui.com +* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.effect.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.position.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js +* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */ +(function(t,e){function i(e,i){var n,o,a,r=e.nodeName.toLowerCase();return"area"===r?(n=e.parentNode,o=n.name,e.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap=#"+o+"]")[0],!!a&&s(a)):!1):(/input|select|textarea|button|object/.test(r)?!e.disabled:"a"===r?e.href||i:i)&&s(e)}function s(e){return t.expr.filters.visible(e)&&!t(e).parents().addBack().filter(function(){return"hidden"===t.css(this,"visibility")}).length}var n=0,o=/^ui-id-\d+$/;t.ui=t.ui||{},t.extend(t.ui,{version:"1.10.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),t.fn.extend({focus:function(e){return function(i,s){return"number"==typeof i?this.each(function(){var e=this;setTimeout(function(){t(e).focus(),s&&s.call(e)},i)}):e.apply(this,arguments)}}(t.fn.focus),scrollParent:function(){var e;return e=t.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(t.css(this,"position"))&&/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!e.length?t(document):e},zIndex:function(i){if(i!==e)return this.css("zIndex",i);if(this.length)for(var s,n,o=t(this[0]);o.length&&o[0]!==document;){if(s=o.css("position"),("absolute"===s||"relative"===s||"fixed"===s)&&(n=parseInt(o.css("zIndex"),10),!isNaN(n)&&0!==n))return n;o=o.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){o.test(this.id)&&t(this).removeAttr("id")})}}),t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])},focusable:function(e){return i(e,!isNaN(t.attr(e,"tabindex")))},tabbable:function(e){var s=t.attr(e,"tabindex"),n=isNaN(s);return(n||s>=0)&&i(e,!n)}}),t("<a>").outerWidth(1).jquery||t.each(["Width","Height"],function(i,s){function n(e,i,s,n){return t.each(o,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),n&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var o="Width"===s?["Left","Right"]:["Top","Bottom"],a=s.toLowerCase(),r={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+s]=function(i){return i===e?r["inner"+s].call(this):this.each(function(){t(this).css(a,n(this,i)+"px")})},t.fn["outer"+s]=function(e,i){return"number"!=typeof e?r["outer"+s].call(this,e):this.each(function(){t(this).css(a,n(this,e,!0,i)+"px")})}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(t.fn.removeData=function(e){return function(i){return arguments.length?e.call(this,t.camelCase(i)):e.call(this)}}(t.fn.removeData)),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),t.support.selectstart="onselectstart"in document.createElement("div"),t.fn.extend({disableSelection:function(){return this.bind((t.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(t){t.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),t.extend(t.ui,{plugin:{add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i){var s,n=t.plugins[e];if(n&&t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType)for(s=0;n.length>s;s++)t.options[n[s][0]]&&n[s][1].apply(t.element,i)}},hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)}})})(jQuery),function(t,e){var i=0,s=Array.prototype.slice,n=t.cleanData;t.cleanData=function(e){for(var i,s=0;null!=(i=e[s]);s++)try{t(i).triggerHandler("remove")}catch(o){}n(e)},t.widget=function(i,s,n){var o,a,r,h,l={},c=i.split(".")[0];i=i.split(".")[1],o=c+"-"+i,n||(n=s,s=t.Widget),t.expr[":"][o.toLowerCase()]=function(e){return!!t.data(e,o)},t[c]=t[c]||{},a=t[c][i],r=t[c][i]=function(t,i){return this._createWidget?(arguments.length&&this._createWidget(t,i),e):new r(t,i)},t.extend(r,a,{version:n.version,_proto:t.extend({},n),_childConstructors:[]}),h=new s,h.options=t.widget.extend({},h.options),t.each(n,function(i,n){return t.isFunction(n)?(l[i]=function(){var t=function(){return s.prototype[i].apply(this,arguments)},e=function(t){return s.prototype[i].apply(this,t)};return function(){var i,s=this._super,o=this._superApply;return this._super=t,this._superApply=e,i=n.apply(this,arguments),this._super=s,this._superApply=o,i}}(),e):(l[i]=n,e)}),r.prototype=t.widget.extend(h,{widgetEventPrefix:a?h.widgetEventPrefix:i},l,{constructor:r,namespace:c,widgetName:i,widgetFullName:o}),a?(t.each(a._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,r,i._proto)}),delete a._childConstructors):s._childConstructors.push(r),t.widget.bridge(i,r)},t.widget.extend=function(i){for(var n,o,a=s.call(arguments,1),r=0,h=a.length;h>r;r++)for(n in a[r])o=a[r][n],a[r].hasOwnProperty(n)&&o!==e&&(i[n]=t.isPlainObject(o)?t.isPlainObject(i[n])?t.widget.extend({},i[n],o):t.widget.extend({},o):o);return i},t.widget.bridge=function(i,n){var o=n.prototype.widgetFullName||i;t.fn[i]=function(a){var r="string"==typeof a,h=s.call(arguments,1),l=this;return a=!r&&h.length?t.widget.extend.apply(null,[a].concat(h)):a,r?this.each(function(){var s,n=t.data(this,o);return n?t.isFunction(n[a])&&"_"!==a.charAt(0)?(s=n[a].apply(n,h),s!==n&&s!==e?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):e):t.error("no such method '"+a+"' for "+i+" widget instance"):t.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+a+"'")}):this.each(function(){var e=t.data(this,o);e?e.option(a||{})._init():t.data(this,o,new n(a,this))}),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this.bindings=t(),this.hoverable=t(),this.focusable=t(),s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(i,s){var n,o,a,r=i;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof i)if(r={},n=i.split("."),i=n.shift(),n.length){for(o=r[i]=t.widget.extend({},this.options[i]),a=0;n.length-1>a;a++)o[n[a]]=o[n[a]]||{},o=o[n[a]];if(i=n.pop(),s===e)return o[i]===e?null:o[i];o[i]=s}else{if(s===e)return this.options[i]===e?null:this.options[i];r[i]=s}return this._setOptions(r),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!e).attr("aria-disabled",e),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var o,a=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=o=t(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,o=this.widget()),t.each(n,function(n,r){function h(){return i||a.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof r?a[r]:r).apply(a,arguments):e}"string"!=typeof r&&(h.guid=r.guid=r.guid||h.guid||t.guid++);var l=n.match(/^(\w+)\s*(.*)$/),c=l[1]+a.eventNamespace,u=l[2];u?o.delegate(u,c,h):s.bind(c,h)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(e).undelegate(e)},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}})}(jQuery),function(t){var e=!1;t(document).mouseup(function(){e=!1}),t.widget("ui.mouse",{version:"1.10.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.bind("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).bind("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(i){if(!e){this._mouseStarted&&this._mouseUp(i),this._mouseDownEvent=i;var s=this,n=1===i.which,o="string"==typeof this.options.cancel&&i.target.nodeName?t(i.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(i)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){s.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(i)&&this._mouseDelayMet(i)&&(this._mouseStarted=this._mouseStart(i)!==!1,!this._mouseStarted)?(i.preventDefault(),!0):(!0===t.data(i.target,this.widgetName+".preventClickEvent")&&t.removeData(i.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return s._mouseMove(t)},this._mouseUpDelegate=function(t){return s._mouseUp(t)},t(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),i.preventDefault(),e=!0,!0)):!0}},_mouseMove:function(e){return t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button?this._mouseUp(e):this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){return t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),!1},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})}(jQuery),function(t){t.widget("ui.draggable",t.ui.mouse,{version:"1.10.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"!==this.options.helper||/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(t(i.iframeFix===!0?"iframe":i.iframeFix).each(function(){t("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(t(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),i.containment&&this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_mouseDrag:function(e,i){if(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i,s=this,n=!1,o=!1;for(t.ui.ddmanager&&!this.options.dropBehaviour&&(o=t.ui.ddmanager.drop(this,e)),this.dropped&&(o=this.dropped,this.dropped=!1),i=this.element[0];i&&(i=i.parentNode);)i===document&&(n=!0);return n||"original"!==this.options.helper?("invalid"===this.options.revert&&!o||"valid"===this.options.revert&&o||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,o)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){s._trigger("stop",e)!==!1&&s._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1):!1},_mouseUp:function(e){return t("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return s.parents("body").length||s.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s[0]===this.element[0]||/(fixed|absolute)/.test(s.css("position"))||s.css("position","absolute"),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.element.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;if("parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=["document"===n.containment?0:t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,"document"===n.containment?0:t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,("document"===n.containment?0:t(window).scrollLeft())+t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,("document"===n.containment?0:t(window).scrollTop())+(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||n.containment.constructor===Array)n.containment.constructor===Array&&(this.containment=n.containment);else{if(i=t(n.containment),s=i[0],!s)return;e="hidden"!==t(s).css("overflow"),this.containment=[(parseInt(t(s).css("borderLeftWidth"),10)||0)+(parseInt(t(s).css("paddingLeft"),10)||0),(parseInt(t(s).css("borderTopWidth"),10)||0)+(parseInt(t(s).css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(t(s).css("borderRightWidth"),10)||0)-(parseInt(t(s).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(t(s).css("borderBottomWidth"),10)||0)-(parseInt(t(s).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=i}},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n,o,a=this.options,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName),l=e.pageX,c=e.pageY;return this.originalPosition&&(this.containment&&(this.relative_container?(s=this.relative_container.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(l=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(c=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(l=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(c=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((c-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,c=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((l-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,l=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o)),{top:c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:l-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s]),"drag"===e&&(this.positionAbs=this._convertPositionTo("absolute")),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i){var s=t(this).data("ui-draggable"),n=s.options,o=t.extend({},i,{item:s.element});s.sortables=[],t(n.connectToSortable).each(function(){var i=t.data(this,"ui-sortable");i&&!i.options.disabled&&(s.sortables.push({instance:i,shouldRevert:i.options.revert}),i.refreshPositions(),i._trigger("activate",e,o))})},stop:function(e,i){var s=t(this).data("ui-draggable"),n=t.extend({},i,{item:s.element});t.each(s.sortables,function(){this.instance.isOver?(this.instance.isOver=0,s.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=this.shouldRevert),this.instance._mouseStop(e),this.instance.options.helper=this.instance.options._helper,"original"===s.options.helper&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",e,n))})},drag:function(e,i){var s=t(this).data("ui-draggable"),n=this;t.each(s.sortables,function(){var o=!1,a=this;this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(o=!0,t.each(s.sortables,function(){return this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this!==a&&this.instance._intersectsWith(this.instance.containerCache)&&t.contains(a.instance.element[0],this.instance.element[0])&&(o=!1),o})),o?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=t(n).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return i.helper[0]},e.target=this.instance.currentItem[0],this.instance._mouseCapture(e,!0),this.instance._mouseStart(e,!0,!0),this.instance.offset.click.top=s.offset.click.top,this.instance.offset.click.left=s.offset.click.left,this.instance.offset.parent.left-=s.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=s.offset.parent.top-this.instance.offset.parent.top,s._trigger("toSortable",e),s.dropped=this.instance.element,s.currentItem=s.element,this.instance.fromOutside=s),this.instance.currentItem&&this.instance._mouseDrag(e)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",e,this.instance._uiHash(this.instance)),this.instance._mouseStop(e,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),s._trigger("fromSortable",e),s.dropped=!1)})}}),t.ui.plugin.add("draggable","cursor",{start:function(){var e=t("body"),i=t(this).data("ui-draggable").options;e.css("cursor")&&(i._cursor=e.css("cursor")),e.css("cursor",i.cursor)},stop:function(){var e=t(this).data("ui-draggable").options;e._cursor&&t("body").css("cursor",e._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("opacity")&&(n._opacity=s.css("opacity")),s.css("opacity",n.opacity)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._opacity&&t(i.helper).css("opacity",s._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(){var e=t(this).data("ui-draggable");e.scrollParent[0]!==document&&"HTML"!==e.scrollParent[0].tagName&&(e.overflowOffset=e.scrollParent.offset())},drag:function(e){var i=t(this).data("ui-draggable"),s=i.options,n=!1;i.scrollParent[0]!==document&&"HTML"!==i.scrollParent[0].tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+i.scrollParent[0].offsetHeight-e.pageY<s.scrollSensitivity?i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop+s.scrollSpeed:e.pageY-i.overflowOffset.top<s.scrollSensitivity&&(i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop-s.scrollSpeed)),s.axis&&"y"===s.axis||(i.overflowOffset.left+i.scrollParent[0].offsetWidth-e.pageX<s.scrollSensitivity?i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft+s.scrollSpeed:e.pageX-i.overflowOffset.left<s.scrollSensitivity&&(i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft-s.scrollSpeed))):(s.axis&&"x"===s.axis||(e.pageY-t(document).scrollTop()<s.scrollSensitivity?n=t(document).scrollTop(t(document).scrollTop()-s.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<s.scrollSensitivity&&(n=t(document).scrollTop(t(document).scrollTop()+s.scrollSpeed))),s.axis&&"y"===s.axis||(e.pageX-t(document).scrollLeft()<s.scrollSensitivity?n=t(document).scrollLeft(t(document).scrollLeft()-s.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<s.scrollSensitivity&&(n=t(document).scrollLeft(t(document).scrollLeft()+s.scrollSpeed)))),n!==!1&&t.ui.ddmanager&&!s.dropBehaviour&&t.ui.ddmanager.prepareOffsets(i,e)}}),t.ui.plugin.add("draggable","snap",{start:function(){var e=t(this).data("ui-draggable"),i=e.options;e.snapElements=[],t(i.snap.constructor!==String?i.snap.items||":data(ui-draggable)":i.snap).each(function(){var i=t(this),s=i.offset();this!==e.element[0]&&e.snapElements.push({item:this,width:i.outerWidth(),height:i.outerHeight(),top:s.top,left:s.left})})},drag:function(e,i){var s,n,o,a,r,h,l,c,u,d,p=t(this).data("ui-draggable"),f=p.options,g=f.snapTolerance,m=i.offset.left,v=m+p.helperProportions.width,_=i.offset.top,b=_+p.helperProportions.height;for(u=p.snapElements.length-1;u>=0;u--)r=p.snapElements[u].left,h=r+p.snapElements[u].width,l=p.snapElements[u].top,c=l+p.snapElements[u].height,m>r-g&&h+g>m&&_>l-g&&c+g>_||m>r-g&&h+g>m&&b>l-g&&c+g>b||v>r-g&&h+g>v&&_>l-g&&c+g>_||v>r-g&&h+g>v&&b>l-g&&c+g>b?("inner"!==f.snapMode&&(s=g>=Math.abs(l-b),n=g>=Math.abs(c-_),o=g>=Math.abs(r-v),a=g>=Math.abs(h-m),s&&(i.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r-p.helperProportions.width}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h}).left-p.margins.left)),d=s||n||o||a,"outer"!==f.snapMode&&(s=g>=Math.abs(l-_),n=g>=Math.abs(c-b),o=g>=Math.abs(r-m),a=g>=Math.abs(h-v),s&&(i.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c-p.helperProportions.height,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[u].snapping&&(s||n||o||a||d)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=s||n||o||a||d):(p.snapElements[u].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=!1)}}),t.ui.plugin.add("draggable","stack",{start:function(){var e,i=this.data("ui-draggable").options,s=t.makeArray(t(i.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});s.length&&(e=parseInt(t(s[0]).css("zIndex"),10)||0,t(s).each(function(i){t(this).css("zIndex",e+i)}),this.css("zIndex",e+s.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("zIndex")&&(n._zIndex=s.css("zIndex")),s.css("zIndex",n.zIndex)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._zIndex&&t(i.helper).css("zIndex",s._zIndex)}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}t.widget("ui.droppable",{version:"1.10.2",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e=this.options,i=e.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(i)?i:function(t){return t.is(i)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},t.ui.ddmanager.droppables[e.scope]=t.ui.ddmanager.droppables[e.scope]||[],t.ui.ddmanager.droppables[e.scope].push(this),e.addClasses&&this.element.addClass("ui-droppable") +},_destroy:function(){for(var e=0,i=t.ui.ddmanager.droppables[this.options.scope];i.length>e;e++)i[e]===this&&i.splice(e,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(e,i){"accept"===e&&(this.accept=t.isFunction(i)?i:function(t){return t.is(i)}),t.Widget.prototype._setOption.apply(this,arguments)},_activate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var e=t.data(this,"ui-droppable");return e.options.greedy&&!e.options.disabled&&e.options.scope===s.options.scope&&e.accept.call(e.element[0],s.currentItem||s.element)&&t.ui.intersect(s,t.extend(e,{offset:e.element.offset()}),e.options.tolerance)?(n=!0,!1):undefined}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}}}),t.ui.intersect=function(t,i,s){if(!i.offset)return!1;var n,o,a=(t.positionAbs||t.position.absolute).left,r=a+t.helperProportions.width,h=(t.positionAbs||t.position.absolute).top,l=h+t.helperProportions.height,c=i.offset.left,u=c+i.proportions.width,d=i.offset.top,p=d+i.proportions.height;switch(s){case"fit":return a>=c&&u>=r&&h>=d&&p>=l;case"intersect":return a+t.helperProportions.width/2>c&&u>r-t.helperProportions.width/2&&h+t.helperProportions.height/2>d&&p>l-t.helperProportions.height/2;case"pointer":return n=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,o=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,e(o,d,i.proportions.height)&&e(n,c,i.proportions.width);case"touch":return(h>=d&&p>=h||l>=d&&p>=l||d>h&&l>p)&&(a>=c&&u>=a||r>=c&&u>=r||c>a&&r>u);default:return!1}},t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions.height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions={width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight})}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&t.ui.intersect(e,this,this.options.tolerance)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").bind("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=t.ui.intersect(e,this,this.options.tolerance),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t.data(this,"ui-droppable").options.scope===n}),o.length&&(s=t.data(o[0],"ui-droppable"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").unbind("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}}}(jQuery),function(t){function e(t){return parseInt(t,10)||0}function i(t){return!isNaN(parseInt(t,10))}t.widget("ui.resizable",t.ui.mouse,{version:"1.10.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var e,i,s,n,o,a=this,r=this.options;if(this.element.addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),e=this.handles.split(","),this.handles={},i=0;e.length>i;i++)s=t.trim(e[i]),o="ui-resizable-"+s,n=t("<div class='ui-resizable-handle "+o+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=t(this.handles[i],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),t(this.handles[i]).length},this._renderAxis(this.element),this._handles=t(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),t(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(t(this).removeClass("ui-resizable-autohide"),a._handles.show())}).mouseleave(function(){r.disabled||a.resizing||(t(this).addClass("ui-resizable-autohide"),a._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(i){var s,n,o,a=this.options,r=this.element.position(),h=this.element;return this.resizing=!0,/absolute/.test(h.css("position"))?h.css({position:"absolute",top:h.css("top"),left:h.css("left")}):h.is(".ui-draggable")&&h.css({position:"absolute",top:r.top,left:r.left}),this._renderProxy(),s=e(this.helper.css("left")),n=e(this.helper.css("top")),a.containment&&(s+=t(a.containment).scrollLeft()||0,n+=t(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:s,top:n},this.size=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalSize=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalPosition={left:s,top:n},this.sizeDiff={width:h.outerWidth()-h.width(),height:h.outerHeight()-h.height()},this.originalMousePosition={left:i.pageX,top:i.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,o=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===o?this.axis+"-resize":o),h.addClass("ui-resizable-resizing"),this._propagate("start",i),!0},_mouseDrag:function(e){var i,s=this.helper,n={},o=this.originalMousePosition,a=this.axis,r=this.position.top,h=this.position.left,l=this.size.width,c=this.size.height,u=e.pageX-o.left||0,d=e.pageY-o.top||0,p=this._change[a];return p?(i=p.apply(this,[e,u,d]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),this.position.top!==r&&(n.top=this.position.top+"px"),this.position.left!==h&&(n.left=this.position.left+"px"),this.size.width!==l&&(n.width=this.size.width+"px"),this.size.height!==c&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(n)||this._trigger("resize",e,this.ui()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&t.ui.hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null,h=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(t){var e,s,n,o,a,r=this.options;a={minWidth:i(r.minWidth)?r.minWidth:0,maxWidth:i(r.maxWidth)?r.maxWidth:1/0,minHeight:i(r.minHeight)?r.minHeight:0,maxHeight:i(r.maxHeight)?r.maxHeight:1/0},(this._aspectRatio||t)&&(e=a.minHeight*this.aspectRatio,n=a.minWidth/this.aspectRatio,s=a.maxHeight*this.aspectRatio,o=a.maxWidth/this.aspectRatio,e>a.minWidth&&(a.minWidth=e),n>a.minHeight&&(a.minHeight=n),a.maxWidth>s&&(a.maxWidth=s),a.maxHeight>o&&(a.maxHeight=o)),this._vBoundaries=a},_updateCache:function(t){this.offset=this.helper.offset(),i(t.left)&&(this.position.left=t.left),i(t.top)&&(this.position.top=t.top),i(t.height)&&(this.size.height=t.height),i(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,s=this.size,n=this.axis;return i(t.height)?t.width=t.height*this.aspectRatio:i(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===n&&(t.left=e.left+(s.width-t.width),t.top=null),"nw"===n&&(t.top=e.top+(s.height-t.height),t.left=e.left+(s.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,s=this.axis,n=i(t.width)&&e.maxWidth&&e.maxWidth<t.width,o=i(t.height)&&e.maxHeight&&e.maxHeight<t.height,a=i(t.width)&&e.minWidth&&e.minWidth>t.width,r=i(t.height)&&e.minHeight&&e.minHeight>t.height,h=this.originalPosition.left+this.originalSize.width,l=this.position.top+this.size.height,c=/sw|nw|w/.test(s),u=/nw|ne|n/.test(s);return a&&(t.width=e.minWidth),r&&(t.height=e.minHeight),n&&(t.width=e.maxWidth),o&&(t.height=e.maxHeight),a&&c&&(t.left=h-e.minWidth),n&&c&&(t.left=h-e.maxWidth),r&&u&&(t.top=l-e.minHeight),o&&u&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var t,e,i,s,n,o=this.helper||this.element;for(t=0;this._proportionallyResizeElements.length>t;t++){if(n=this._proportionallyResizeElements[t],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],e=0;i.length>e;e++)this.borderDif[e]=(parseInt(i[e],10)||0)+(parseInt(s[e],10)||0);n.css({height:o.height()-this.borderDif[0]-this.borderDif[2]||0,width:o.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).data("ui-resizable"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&t.ui.hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,c=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var i,s,n,o,a,r,h,l=t(this).data("ui-resizable"),c=l.options,u=l.element,d=c.containment,p=d instanceof t?d.get(0):/parent/.test(d)?u.parent().get(0):d;p&&(l.containerElement=t(p),/document/.test(d)||d===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(i=t(p),s=[],t(["Top","Right","Left","Bottom"]).each(function(t,n){s[t]=e(i.css("padding"+n))}),l.containerOffset=i.offset(),l.containerPosition=i.position(),l.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},n=l.containerOffset,o=l.containerSize.height,a=l.containerSize.width,r=t.ui.hasScroll(p,"left")?p.scrollWidth:a,h=t.ui.hasScroll(p)?p.scrollHeight:o,l.parentData={element:p,left:n.left,top:n.top,width:r,height:h}))},resize:function(e){var i,s,n,o,a=t(this).data("ui-resizable"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio),a.position.top=a._helper?h.top:0),a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top,i=Math.abs((a._helper?a.offset.left-u.left:a.offset.left-u.left)+a.sizeDiff.width),s=Math.abs((a._helper?a.offset.top-u.top:a.offset.top-h.top)+a.sizeDiff.height),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o&&(i-=a.parentData.left),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio))},stop:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=function(e){t(e).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseInt(e.width(),10),height:parseInt(e.height(),10),left:parseInt(e.css("left"),10),top:parseInt(e.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):t.each(i.alsoResize,function(t){s(t)})},resize:function(e,i){var s=t(this).data("ui-resizable"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0},h=function(e,s){t(e).each(function(){var e=t(this),n=t(this).data("ui-resizable-alsoresize"),o={},a=s&&s.length?s:e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(a,function(t,e){var i=(n[e]||0)+(r[e]||0);i&&i>=0&&(o[e]=i||null)}),e.css(o)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):t.each(n.alsoResize,function(t,e){h(t,e)})},stop:function(){t(this).removeData("resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).data("ui-resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).data("ui-resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,c=Math.round((s.width-n.width)/h)*h,u=Math.round((s.height-n.height)/l)*l,d=n.width+c,p=n.height+u,f=i.maxWidth&&d>i.maxWidth,g=i.maxHeight&&p>i.maxHeight,m=i.minWidth&&i.minWidth>d,v=i.minHeight&&i.minHeight>p;i.grid=r,m&&(d+=h),v&&(p+=l),f&&(d-=h),g&&(p-=l),/^(se|s|e)$/.test(a)?(e.size.width=d,e.size.height=p):/^(ne)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.top=o.top-u):/^(sw)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.left=o.left-c):(e.size.width=d,e.size.height=p,e.position.top=o.top-u,e.position.left=o.left-c)}})}(jQuery),function(t){t.widget("ui.selectable",t.ui.mouse,{version:"1.10.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e=t(i.options.filter,i.element[0]),e.addClass("ui-selectee"),e.each(function(){var e=t(this),i=e.offset();t.data(this,"selectable-item",{element:this,$element:e,left:i.left,top:i.top,right:i.left+e.outerWidth(),bottom:i.top+e.outerHeight(),startselected:!1,selected:e.hasClass("ui-selected"),selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=e.addClass("ui-selectee"),this._mouseInit(),this.helper=t("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):undefined}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||o>i.right||i.top>h||a>i.bottom):"fit"===n.tolerance&&(l=i.left>o&&r>i.right&&i.top>a&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}function i(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))}t.widget("ui.sortable",t.ui.mouse,{version:"1.10.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var t=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===t.axis||i(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_setOption:function(e,i){"disabled"===e?(this.options[e]=i,this.widget().toggleClass("ui-sortable-disabled",!!i)):t.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):undefined}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-t(document).scrollTop()<a.scrollSensitivity?r=t(document).scrollTop(t(document).scrollTop()-a.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<a.scrollSensitivity&&(r=t(document).scrollTop(t(document).scrollTop()+a.scrollSpeed)),e.pageX-t(document).scrollLeft()<a.scrollSensitivity?r=t(document).scrollLeft(t(document).scrollLeft()-a.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<a.scrollSensitivity&&(r=t(document).scrollLeft(t(document).scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break; +this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u=s+l>r&&h>s+l&&e+c>o&&a>e+c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?u:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var i="x"===this.options.axis||e(this.positionAbs.top+this.offset.click.top,t.top,t.height),s="y"===this.options.axis||e(this.positionAbs.left+this.offset.click.left,t.left,t.width),n=i&&s,o=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return n?this.floating?a&&"right"===a||"down"===o?2:1:o&&("down"===o?2:1):!1},_intersectsWithSides:function(t){var i=e(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),s=e(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),n=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return this.floating&&o?"right"===o&&s||"left"===o&&!s:n&&("down"===n&&i||"up"===n&&!i)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){var i,s,n,o,a=[],r=[],h=this._connectWith();if(h&&e)for(i=h.length-1;i>=0;i--)for(n=t(h[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&r.push([t.isFunction(o.options.items)?o.options.items.call(o.element):t(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(r.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),i=r.length-1;i>=0;i--)r[i][0].each(function(){a.push(this)});return t(a)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t(e.document[0].createElement(s)).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?n.append("<td colspan='99'> </td>"):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_contactContainers:function(s){var n,o,a,r,h,l,c,u,d,p,f=null,g=null;for(n=this.containers.length-1;n>=0;n--)if(!t.contains(this.currentItem[0],this.containers[n].element[0]))if(this._intersectsWith(this.containers[n].containerCache)){if(f&&t.contains(this.containers[n].element[0],f.element[0]))continue;f=this.containers[n],g=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",s,this._uiHash(this)),this.containers[n].containerCache.over=0);if(f)if(1===this.containers.length)this.containers[g].containerCache.over||(this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1);else{for(a=1e4,r=null,p=f.floating||i(this.currentItem),h=p?"left":"top",l=p?"width":"height",c=this.positionAbs[h]+this.offset.click[h],o=this.items.length-1;o>=0;o--)t.contains(this.containers[g].element[0],this.items[o].item[0])&&this.items[o].item[0]!==this.currentItem[0]&&(!p||e(this.positionAbs.top+this.offset.click.top,this.items[o].top,this.items[o].height))&&(u=this.items[o].item.offset()[h],d=!1,Math.abs(u-c)>Math.abs(u+this.items[o][l]-c)&&(d=!0,u+=this.items[o][l]),a>Math.abs(u-c)&&(a=Math.abs(u-c),r=this.items[o],this.direction=d?"up":"down"));if(!r&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[g])return;r?this._rearrange(s,r,null,!0):this._rearrange(s,null,this.containers[g].element,!0),this._trigger("change",s,this._uiHash()),this.containers[g]._trigger("change",s,this._uiHash(this)),this.currentContainer=this.containers[g],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){this.reverting=!1;var i,s=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(i in this._storedCSS)("auto"===this._storedCSS[i]||"static"===this._storedCSS[i])&&(this._storedCSS[i]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||s.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(s.push(function(t){this._trigger("remove",t,this._uiHash())}),s.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),s.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),i=this.containers.length-1;i>=0;i--)e||s.push(function(t){return function(e){t._trigger("deactivate",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over&&(s.push(function(t){return function(e){t._trigger("out",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!e){for(this._trigger("beforeStop",t,this._uiHash()),i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}if(e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!e){for(i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})}(jQuery),function(t,e){var i="ui-effects-";t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?$\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?$/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?$\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?$/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?$\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?$/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function s(e,i){var s,n,a={};for(s in i)n=i[s],e[s]!==n&&(o[s]||(t.fx.step[s]||!isNaN(parseFloat(n)))&&(a[s]=n));return a}var n=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(jQuery.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(e,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var e=t(this);return{el:e,start:i(this)}}),o=function(){t.each(n,function(t,i){e[i]&&a[i+"Class"](e[i])})},o(),l=l.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(i){return function(s,n,o,a,r){return"boolean"==typeof n||n===e?o?t.effects.animateClass.call(this,n?{add:s}:{remove:s},o,a,r):i.apply(this,arguments):t.effects.animateClass.call(this,{toggle:s},n,o,a)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function s(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function n(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}t.extend(t.effects,{version:"1.10.2",save:function(t,e){for(var s=0;e.length>s;s++)null!==e[s]&&t.data(i+e[s],t[0].style[e[s]])},restore:function(t,s){var n,o;for(o=0;s.length>o;o++)null!==s[o]&&(n=t.data(i+s[o]),n===e&&(n=""),t.css(s[o],n))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).focus(),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).focus()),e},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function e(e){function s(){t.isFunction(o)&&o.call(n[0]),t.isFunction(e)&&e()}var n=t(this),o=i.complete,r=i.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),s()):a.call(n[0],i,s)}var i=s.apply(this,arguments),n=i.mode,o=i.queue,a=t.effects.effect[i.effect];return t.fx.off||!a?n?this[n](i.duration,i.complete):this.each(function(){i.complete&&i.complete.call(this)}):o===!1?this.each(e):this.queue(o||"fx",e)},show:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="show",this.effect.call(this,i)}}(t.fn.show),hide:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="hide",this.effect.call(this,i)}}(t.fn.hide),toggle:function(t){return function(e){if(n(e)||"boolean"==typeof e)return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="toggle",this.effect.call(this,i)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s}})}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}()}(jQuery),function(t){var e=0,i={},s={};i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="hide",s.height=s.paddingTop=s.paddingBottom=s.borderTopWidth=s.borderBottomWidth="show",t.widget("ui.accordion",{version:"1.10.2",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t(),content:this.active.length?this.active.next():t()}},_createIcons:function(){var e=this.options.icons;e&&(t("<span>").addClass("ui-accordion-header-icon ui-icon "+e.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(e.header).addClass(e.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove() +},_destroy:function(){var t;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),undefined):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),"disabled"===t&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!e),undefined)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),o.focus(),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().focus()},refresh:function(){var e=this.options;this._processPanels(),(e.active===!1&&e.collapsible===!0||!this.headers.length)&&(e.active=!1,this.active=t()),e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var i,s=this.options,n=s.heightStyle,o=this.element.parent(),a=this.accordionId="ui-accordion-"+(this.element.attr("id")||++e);this.active=this._findActive(s.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(e){var i=t(this),s=i.attr("id"),n=i.next(),o=n.attr("id");s||(s=a+"-header-"+e,i.attr("id",s)),o||(o=a+"-panel-"+e,n.attr("id",o)),i.attr("aria-controls",o),n.attr("aria-labelledby",s)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false",tabIndex:-1}).next().attr({"aria-expanded":"false","aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true",tabIndex:0}).next().attr({"aria-expanded":"true","aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(s.event),"fill"===n?(i=o.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.headers.each(function(){i-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===n&&(i=0,this.headers.next().each(function(){i=Math.max(i,t(this).css("height","").height())}).height(i))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n[0]===s[0],a=o&&i.collapsible,r=a?t():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:a?t():n,newPanel:r};e.preventDefault(),o&&!i.collapsible||this._trigger("beforeActivate",e,l)===!1||(i.active=a?!1:this.headers.index(n),this.active=o?t():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),o||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-expanded":"false","aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr("tabIndex",-1):i.length&&this.headers.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr({"aria-expanded":"true","aria-hidden":"false"}).prev().attr({"aria-selected":"true",tabIndex:0})},_animate:function(t,e,n){var o,a,r,h=this,l=0,c=t.length&&(!e.length||t.index()<e.index()),u=this.options.animate||{},d=c&&u.down||u,p=function(){h._toggleComplete(n)};return"number"==typeof d&&(r=d),"string"==typeof d&&(a=d),a=a||d.easing||u.easing,r=r||d.duration||u.duration,e.length?t.length?(o=t.show().outerHeight(),e.animate(i,{duration:r,easing:a,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(s,{duration:r,easing:a,complete:p,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?l+=i.now:"content"!==h.options.heightStyle&&(i.now=Math.round(o-e.outerHeight()-l),l=0)}}),undefined):e.animate(i,r,a,p):t.animate(s,r,a,p)},_toggleComplete:function(t){var e=t.oldPanel;e.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}})}(jQuery),function(t){var e=0;t.widget("ui.autocomplete",{version:"1.10.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o?!0:a?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,undefined;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:case o.NUMPAD_ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,s.preventDefault(),undefined;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),undefined):(this._searchTimeout(t),undefined)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,undefined):(clearTimeout(this.searching),this.close(t),this._change(t),undefined)}}),this._initSource(),this.menu=t("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({input:t(),role:null}).hide().data("ui-menu"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];t(e.target).closest(".ui-menu-item").length||this._delay(function(){var e=this;this.document.one("mousedown",function(s){s.target===e.element[0]||s.target===i||t.contains(i,s.target)||e.close()})})},menufocus:function(e,i){if(this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type)))return this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),undefined;var s=i.item.data("ui-autocomplete-item");!1!==this._trigger("focus",e,{item:s})?e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(s.value):this.liveRegion.text(s.value)},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=t("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertAfter(this.element),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e||(e=this.element.closest(".ui-front")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):undefined},_search:function(t){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var t=this,i=++e;return function(s){i===e&&t.__response(s),t.pending--,t.pending||t.element.removeClass("ui-autocomplete-loading")}},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({label:e.label||e.value,value:e.value||e.label},e)})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<a>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this._value(this.term),this.menu.blur(),undefined):(this.menu[t](e),undefined):(this.search(null,e),undefined)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.text(e))}})}(jQuery),function(t){var e,i,s,n,o="ui-button ui-widget ui-state-default ui-corner-all",a="ui-state-hover ui-state-active ",r="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",h=function(){var e=t(this).find(":ui-button");setTimeout(function(){e.button("refresh")},1)},l=function(e){var i=e.name,s=e.form,n=t([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?t(s).find("[name='"+i+"']"):t("[name='"+i+"']",e.ownerDocument).filter(function(){return!this.form})),n};t.widget("ui.button",{version:"1.10.2",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,h),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var a=this,r=this.options,c="checkbox"===this.type||"radio"===this.type,u=c?"":"ui-state-active",d="ui-state-focus";null===r.label&&(r.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(o).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){r.disabled||this===e&&t(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){r.disabled||t(this).removeClass(u)}).bind("click"+this.eventNamespace,function(t){r.disabled&&(t.preventDefault(),t.stopImmediatePropagation())}),this.element.bind("focus"+this.eventNamespace,function(){a.buttonElement.addClass(d)}).bind("blur"+this.eventNamespace,function(){a.buttonElement.removeClass(d)}),c&&(this.element.bind("change"+this.eventNamespace,function(){n||a.refresh()}),this.buttonElement.bind("mousedown"+this.eventNamespace,function(t){r.disabled||(n=!1,i=t.pageX,s=t.pageY)}).bind("mouseup"+this.eventNamespace,function(t){r.disabled||(i!==t.pageX||s!==t.pageY)&&(n=!0)})),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return r.disabled||n?!1:undefined}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(r.disabled||n)return!1;t(this).addClass("ui-state-active"),a.buttonElement.attr("aria-pressed","true");var e=a.element[0];l(e).not(e).map(function(){return t(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return r.disabled?!1:(t(this).addClass("ui-state-active"),e=this,a.document.one("mouseup",function(){e=null}),undefined)}).bind("mouseup"+this.eventNamespace,function(){return r.disabled?!1:(t(this).removeClass("ui-state-active"),undefined)}).bind("keydown"+this.eventNamespace,function(e){return r.disabled?!1:((e.keyCode===t.ui.keyCode.SPACE||e.keyCode===t.ui.keyCode.ENTER)&&t(this).addClass("ui-state-active"),undefined)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){t(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(e){e.keyCode===t.ui.keyCode.SPACE&&t(this).click()})),this._setOption("disabled",r.disabled),this._resetButton()},_determineButtonType:function(){var t,e,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(t=this.element.parents().last(),e="label[for='"+this.element.attr("id")+"']",this.buttonElement=t.find(e),this.buttonElement.length||(t=t.length?t.siblings():this.element.siblings(),this.buttonElement=t.filter(e),this.buttonElement.length||(this.buttonElement=t.find(e))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(o+" "+a+" "+r).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(t,e){return this._super(t,e),"disabled"===t?(e?this.element.prop("disabled",!0):this.element.prop("disabled",!1),undefined):(this._resetButton(),undefined)},refresh:function(){var e=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");e!==this.options.disabled&&this._setOption("disabled",e),"radio"===this.type?l(this.element[0]).each(function(){t(this).is(":checked")?t(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):t(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),undefined;var e=this.buttonElement.removeClass(r),i=t("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(e.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,o=[];s.primary||s.secondary?(this.options.text&&o.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&e.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&e.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(o.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||e.attr("title",t.trim(i)))):o.push("ui-button-text-only"),e.addClass(o.join(" "))}}),t.widget("ui.buttonset",{version:"1.10.2",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(t,e){"disabled"===t&&this.buttons.button("option",t,e),this._super(t,e)},refresh:function(){var e="rtl"===this.element.css("direction");this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(e?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(e?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})}(jQuery),function(t,e){function i(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.dpDiv=s(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function s(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.delegate(i,"mouseout",function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",function(){t.datepicker._isDisabledDatepicker(o.inline?e.parent()[0]:o.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))})}function n(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}t.extend(t.ui,{datepicker:{version:"1.10.2"}});var o,a="datepicker",r=(new Date).getTime();t.extend(i.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return n(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var n=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:n,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?s(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),t.data(e,a,i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.click(function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,a,i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,o,r){var h,l,c,u,d,p=this._dialogInst;return p||(this.uuid+=1,h="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+h+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),t("body").append(this._dialogInput),p=this._dialogInst=this._newInst(this._dialogInput,!1),p.settings={},t.data(this._dialogInput[0],a,p)),n(p.settings,o||{}),i=i&&i.constructor===Date?this._formatDate(p,i):i,this._dialogInput.val(i),this._pos=r?r.length?r:[r.pageX,r.pageY]:null,this._pos||(l=document.documentElement.clientWidth,c=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[l/2-100+u,c/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),p.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],a,p),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,a);s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,a),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty())},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,a)}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(i,s,o){var a,r,h,l,c=this._getInst(i);return 2===arguments.length&&"string"==typeof s?"defaults"===s?t.extend({},t.datepicker._defaults):c?"all"===s?t.extend({},c.settings):this._get(c,s):null:(a=s||{},"string"==typeof s&&(a={},a[s]=o),c&&(this._curInst===c&&this._hideDatepicker(),r=this._getDateDatepicker(i,!0),h=this._getMinMaxDate(c,"min"),l=this._getMinMaxDate(c,"max"),n(c.settings,a),null!==h&&a.dateFormat!==e&&a.minDate===e&&(c.settings.minDate=this._formatDate(c,h)),null!==l&&a.dateFormat!==e&&a.maxDate===e&&(c.settings.maxDate=this._formatDate(c,l)),"disabled"in a&&(a.disabled?this._disableDatepicker(i):this._enableDatepicker(i)),this._attachments(t(i),c),this._autoSize(c),this._setDate(c,r),this._updateAlternate(c),this._updateDatepicker(c)),e)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M"); +break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(i){var s,n,o=t.datepicker._getInst(i.target);return t.datepicker._get(o,"constrainInput")?(s=t.datepicker._possibleChars(t.datepicker._get(o,"dateFormat")),n=String.fromCharCode(null==i.charCode?i.keyCode:i.charCode),i.ctrlKey||i.metaKey||" ">n||!s||s.indexOf(n)>-1):e},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var i,s,o,a,r,h,l;i=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==i&&(t.datepicker._curInst.dpDiv.stop(!0,!0),i&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),s=t.datepicker._get(i,"beforeShow"),o=s?s.apply(e,[e,i]):{},o!==!1&&(n(i.settings,o),i.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(i),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),a=!1,t(e).parents().each(function(){return a|="fixed"===t(this).css("position"),!a}),r={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(i),r=t.datepicker._checkOffset(i,r,a),i.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":a?"fixed":"absolute",display:"none",left:r.left+"px",top:r.top+"px"}),i.inline||(h=t.datepicker._get(i,"showAnim"),l=t.datepicker._get(i,"duration"),i.dpDiv.zIndex(t(e).zIndex()+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[h]?i.dpDiv.show(h,t.datepicker._get(i,"showOptions"),l):i.dpDiv[h||"show"](h?l:null),i.input.is(":visible")&&!i.input.is(":disabled")&&i.input.focus(),t.datepicker._curInst=i))}},_updateDatepicker:function(e){this.maxRows=4,o=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e),e.dpDiv.find("."+this._dayOverClass+" a").mouseover();var i,s=this._getNumberOfMonths(e),n=s[1],a=17;e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&e.input[0]!==document.activeElement&&e.input.focus(),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_getBorders:function(t){var e=function(t){return{thin:1,medium:2,thick:3}[t]||t};return[parseFloat(e(t.css("border-left-width"))),parseFloat(e(t.css("border-top-width")))]},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,r=this._curInst;!r||e&&r!==t.data(e,a)||this._datepickerShowing&&(i=this._get(r,"showAnim"),s=this._get(r,"duration"),n=function(){t.datepicker._tidyDialog(r)},t.effects&&(t.effects.effect[i]||t.effects[i])?r.dpDiv.hide(i,t.datepicker._get(r,"showOptions"),s,n):r.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(r,"onClose"),o&&o.apply(r.input?r.input[0]:null,[r.input?r.input.val():"",r]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.focus(),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).each(function(){t(this).val(n)}))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(i,s,n){if(null==i||null==s)throw"Invalid arguments";if(s="object"==typeof s?""+s:s+"",""===s)return null;var o,a,r,h,l=0,c=(n?n.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof c?c:(new Date).getFullYear()%100+parseInt(c,10),d=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,p=(n?n.dayNames:null)||this._defaults.dayNames,f=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,g=(n?n.monthNames:null)||this._defaults.monthNames,m=-1,v=-1,_=-1,b=-1,y=!1,w=function(t){var e=i.length>o+1&&i.charAt(o+1)===t;return e&&o++,e},k=function(t){var e=w(t),i="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n=RegExp("^\\d{1,"+i+"}"),o=s.substring(l).match(n);if(!o)throw"Missing number at position "+l;return l+=o[0].length,parseInt(o[0],10)},x=function(i,n,o){var a=-1,r=t.map(w(i)?o:n,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(r,function(t,i){var n=i[1];return s.substr(l,n.length).toLowerCase()===n.toLowerCase()?(a=i[0],l+=n.length,!1):e}),-1!==a)return a+1;throw"Unknown name at position "+l},D=function(){if(s.charAt(l)!==i.charAt(o))throw"Unexpected literal at position "+l;l++};for(o=0;i.length>o;o++)if(y)"'"!==i.charAt(o)||w("'")?D():y=!1;else switch(i.charAt(o)){case"d":_=k("d");break;case"D":x("D",d,p);break;case"o":b=k("o");break;case"m":v=k("m");break;case"M":v=x("M",f,g);break;case"y":m=k("y");break;case"@":h=new Date(k("@")),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"!":h=new Date((k("!")-this._ticksTo1970)/1e4),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"'":w("'")?D():y=!0;break;default:D()}if(s.length>l&&(r=s.substr(l),!/^\s+/.test(r)))throw"Extra/unparsed characters found in date: "+r;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),b>-1)for(v=1,_=b;;){if(a=this._getDaysInMonth(m,v-1),a>=_)break;v++,_-=a}if(h=this._daylightSavingAdjust(new Date(m,v-1,_)),h.getFullYear()!==m||h.getMonth()+1!==v||h.getDate()!==_)throw"Invalid date";return h},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getYear()%100?"0":"")+e.getYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,i){return t.settings[i]!==e?t.settings[i]:this._defaults[i]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){window["DP_jQuery_"+r].datepicker._adjustDate(s,-i,"M")},next:function(){window["DP_jQuery_"+r].datepicker._adjustDate(s,+i,"M")},hide:function(){window["DP_jQuery_"+r].datepicker._hideDatepicker()},today:function(){window["DP_jQuery_"+r].datepicker._gotoToday(s)},selectDay:function(){return window["DP_jQuery_"+r].datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return window["DP_jQuery_"+r].datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return window["DP_jQuery_"+r].datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).bind(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,v,_,b,y,w,k,x,D,C,I,P,T,M,S,z,A,H,N,E,W,O,F,R,j=new Date,L=this._daylightSavingAdjust(new Date(j.getFullYear(),j.getMonth(),j.getDate())),Y=this._get(t,"isRTL"),B=this._get(t,"showButtonPanel"),V=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),q=this._get(t,"showCurrentAtPos"),Q=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],$=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),G=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-q,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=G&&G>e?G:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-Q,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":V?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+Q,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":V?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?$:L,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),v=this._get(t,"showOtherMonths"),_=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,D=0;U[1]>D;D++){if(C=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",P="",X){if(P+="<div class='ui-datepicker-group",U[1]>1)switch(D){case 0:P+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case U[1]-1:P+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:P+=" ui-datepicker-group-middle",I=""}P+="'>"}for(P+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,G,J,k>0||D>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",T=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,T+="<th"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(P+=T+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),z=(this._getFirstDayOfMonth(te,Z)-c+7)%7,A=Math.ceil((z+S)/7),H=X?this.maxRows>A?this.maxRows:A:A,this.maxRows=H,N=this._daylightSavingAdjust(new Date(te,Z,1-z)),E=0;H>E;E++){for(P+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(N)+"</td>":"",w=0;7>w;w++)O=m?m.apply(t.input?t.input[0]:null,[N]):[!0,""],F=N.getMonth()!==Z,R=F&&!_||!O[0]||G&&G>N||J&&N>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(N.getTime()===C.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===N.getTime()&&b.getTime()===C.getTime()?" "+this._dayOverClass:"")+(R?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!v?"":" "+O[1]+(N.getTime()===$.getTime()?" "+this._currentClass:"")+(N.getTime()===L.getTime()?" ui-datepicker-today":""))+"'"+(F&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"'")+"'")+(R?"":" data-handler='selectDay' data-event='click' data-month='"+N.getMonth()+"' data-year='"+N.getFullYear()+"'")+">"+(F&&!v?" ":R?"<span class='ui-state-default'>"+N.getDate()+"</span>":"<a class='ui-state-default"+(N.getTime()===L.getTime()?" ui-state-highlight":"")+(N.getTime()===$.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+N.getDate()+"</a>")+"</td>",N.setDate(N.getDate()+1),N=this._daylightSavingAdjust(N);P+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),P+="</tbody></table>"+(X?"</div>"+(U[0]>0&&D===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=P}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),v=this._get(t,"changeYear"),_=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(_||(b+=y+(!o&&m&&v?"":" ")),!t.yearshtml)if(t.yearshtml="",o||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),_&&(b+=(!o&&m&&v?"":" ")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.drawYear+("Y"===i?e:0),n=t.drawMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).mousedown(t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new i,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.10.2",window["DP_jQuery_"+r]=t}(jQuery),function(t){var e={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},i={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};t.widget("ui.dialog",{version:"1.10.2",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._destroyOverlay(),this.opener.filter(":focusable").focus().length||t(this.document[0].activeElement).blur(),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var i=!!this.uiDialog.nextAll(":visible").insertBefore(this.uiDialog).length;return i&&!e&&this._trigger("focus",t),i},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),undefined):(this._isOpen=!0,this.opener=t(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._trigger("open"),undefined)},_focusTabbable:function(){var t=this.element.find("[autofocus]");t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).focus()},_keepFocus:function(e){function i(){var e=this.document[0].activeElement,i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),undefined;if(e.keyCode===t.ui.keyCode.TAB){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(n.focus(1),e.preventDefault()):(s.focus(1),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=t("<button></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(e),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title||t.html(" "),t.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),undefined):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(e.element[0],arguments)},o={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,t("<button></button>",s).button(o).appendTo(e.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),undefined)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){t(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){s.position=[o.position.left-i.document.scrollLeft(),o.position.top-i.document.scrollTop()],t(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o)) +}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){t(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){s.height=t(this).height(),s.width=t(this).width(),t(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(s){var n=this,o=!1,a={};t.each(s,function(t,s){n._setOption(t,s),t in e&&(o=!0),t in i&&(a[t]=s)}),o&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",a)},_setOption:function(t,e){var i,s,n=this.uiDialog;"dialogClass"===t&&n.removeClass(this.options.dialogClass).addClass(e),"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:""+e}),"draggable"===t&&(i=n.is(":data(ui-draggable)"),i&&!e&&n.draggable("destroy"),!i&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&(s=n.is(":data(ui-resizable)"),s&&!e&&n.resizable("destroy"),s&&"string"==typeof e&&n.resizable("option","handles",e),s||e===!1||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=this,i=this.widgetFullName;t.ui.dialog.overlayInstances||this._delay(function(){t.ui.dialog.overlayInstances&&this.document.bind("focusin.dialog",function(s){e._allowInteraction(s)||(s.preventDefault(),t(".ui-dialog:visible:last .ui-dialog-content").data(i)._focusTabbable())})}),this.overlay=t("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),t.ui.dialog.overlayInstances++}},_destroyOverlay:function(){this.options.modal&&this.overlay&&(t.ui.dialog.overlayInstances--,t.ui.dialog.overlayInstances||this.document.unbind("focusin.dialog"),this.overlay.remove(),this.overlay=null)}}),t.ui.dialog.overlayInstances=0,t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{_position:function(){var e,i=this.options.position,s=[],n=[0,0];i?(("string"==typeof i||"object"==typeof i&&"0"in i)&&(s=i.split?i.split(" "):[i[0],i[1]],1===s.length&&(s[1]=s[0]),t.each(["left","top"],function(t,e){+s[t]===s[t]&&(n[t]=s[t],s[t]=e)}),i={my:s[0]+(0>n[0]?n[0]:"+"+n[0])+" "+s[1]+(0>n[1]?n[1]:"+"+n[1]),at:s.join(" ")}),i=t.extend({},t.ui.dialog.prototype.options.position,i)):i=t.ui.dialog.prototype.options.position,e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.position(i),e||this.uiDialog.hide()}})}(jQuery),function(t){var e=/up|down|vertical/,i=/up|left|vertical|horizontal/;t.effects.effect.blind=function(s,n){var o,a,r,h=t(this),l=["position","top","bottom","left","right","height","width"],c=t.effects.setMode(h,s.mode||"hide"),u=s.direction||"up",d=e.test(u),p=d?"height":"width",f=d?"top":"left",g=i.test(u),m={},v="show"===c;h.parent().is(".ui-effects-wrapper")?t.effects.save(h.parent(),l):t.effects.save(h,l),h.show(),o=t.effects.createWrapper(h).css({overflow:"hidden"}),a=o[p](),r=parseFloat(o.css(f))||0,m[p]=v?a:0,g||(h.css(d?"bottom":"right",0).css(d?"top":"left","auto").css({position:"absolute"}),m[f]=v?r:a+r),v&&(o.css(p,0),g||o.css(f,r+a)),o.animate(m,{duration:s.duration,easing:s.easing,queue:!1,complete:function(){"hide"===c&&h.hide(),t.effects.restore(h,l),t.effects.removeWrapper(h),n()}})}}(jQuery),function(t){t.effects.effect.bounce=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"effect"),l="hide"===h,c="show"===h,u=e.direction||"up",d=e.distance,p=e.times||5,f=2*p+(c||l?1:0),g=e.duration/f,m=e.easing,v="up"===u||"down"===u?"top":"left",_="up"===u||"left"===u,b=a.queue(),y=b.length;for((c||l)&&r.push("opacity"),t.effects.save(a,r),a.show(),t.effects.createWrapper(a),d||(d=a["top"===v?"outerHeight":"outerWidth"]()/3),c&&(o={opacity:1},o[v]=0,a.css("opacity",0).css(v,_?2*-d:2*d).animate(o,g,m)),l&&(d/=Math.pow(2,p-1)),o={},o[v]=0,s=0;p>s;s++)n={},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m).animate(o,g,m),d=l?2*d:d/2;l&&(n={opacity:0},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m)),a.queue(function(){l&&a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}),y>1&&b.splice.apply(b,[1,0].concat(b.splice(y,f+1))),a.dequeue()}}(jQuery),function(t){t.effects.effect.clip=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"hide"),l="show"===h,c=e.direction||"vertical",u="vertical"===c,d=u?"height":"width",p=u?"top":"left",f={};t.effects.save(a,r),a.show(),s=t.effects.createWrapper(a).css({overflow:"hidden"}),n="IMG"===a[0].tagName?s:a,o=n[d](),l&&(n.css(d,0),n.css(p,o/2)),f[d]=l?o:0,f[p]=l?0:o/2,n.animate(f,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){l||a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.drop=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","opacity","height","width"],a=t.effects.setMode(n,e.mode||"hide"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h?"pos":"neg",u={opacity:r?1:0};t.effects.save(n,o),n.show(),t.effects.createWrapper(n),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===c?-s:s),u[l]=(r?"pos"===c?"+=":"-=":"pos"===c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.explode=function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),g||p.hide(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=t.effects.setMode(p,e.mode||"hide"),g="show"===f,m=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/d),_=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*_,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*v,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*v,top:-o*_}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:_,left:r+(g?l*v:0),top:h+(g?c*_:0),opacity:g?0:1}).animate({left:r+(g?0:l*v),top:h+(g?0:c*_),opacity:g?1:0},e.duration||500,e.easing,s)}}(jQuery),function(t){t.effects.effect.fade=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}}(jQuery),function(t){t.effects.effect.fold=function(e,i){var s,n,o=t(this),a=["position","top","bottom","left","right","height","width"],r=t.effects.setMode(o,e.mode||"hide"),h="show"===r,l="hide"===r,c=e.size||15,u=/([0-9]+)%/.exec(c),d=!!e.horizFirst,p=h!==d,f=p?["width","height"]:["height","width"],g=e.duration/2,m={},v={};t.effects.save(o,a),o.show(),s=t.effects.createWrapper(o).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],u&&(c=parseInt(u[1],10)/100*n[l?0:1]),h&&s.css(d?{height:0,width:c}:{height:c,width:0}),m[f[0]]=h?n[0]:c,v[f[1]]=h?n[1]:0,s.animate(m,g,e.easing).animate(v,g,e.easing,function(){l&&o.hide(),t.effects.restore(o,a),t.effects.removeWrapper(o),i()})}}(jQuery),function(t){t.effects.effect.highlight=function(e,i){var s=t(this),n=["backgroundImage","backgroundColor","opacity"],o=t.effects.setMode(s,e.mode||"show"),a={backgroundColor:s.css("backgroundColor")};"hide"===o&&(a.opacity=0),t.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(a,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===o&&s.hide(),t.effects.restore(s,n),i()}})}}(jQuery),function(t){t.effects.effect.pulsate=function(e,i){var s,n=t(this),o=t.effects.setMode(n,e.mode||"show"),a="show"===o,r="hide"===o,h=a||"hide"===o,l=2*(e.times||5)+(h?1:0),c=e.duration/l,u=0,d=n.queue(),p=d.length;for((a||!n.is(":visible"))&&(n.css("opacity",0).show(),u=1),s=1;l>s;s++)n.animate({opacity:u},c,e.easing),u=1-u;n.animate({opacity:u},c,e.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&d.splice.apply(d,[1,0].concat(d.splice(p,l+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.puff=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"hide"),o="hide"===n,a=parseInt(e.percent,10)||150,r=a/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};t.extend(e,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:o?a:100,from:o?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(e)},t.effects.effect.scale=function(e,i){var s=t(this),n=t.extend(!0,{},e),o=t.effects.setMode(s,e.mode||"effect"),a=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"hide"===o?0:100),r=e.direction||"both",h=e.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},c={y:"horizontal"!==r?a/100:1,x:"vertical"!==r?a/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==o&&(n.origin=h||["middle","center"],n.restore=!0),n.from=e.from||("show"===o?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*c.y,width:l.width*c.x,outerHeight:l.outerHeight*c.y,outerWidth:l.outerWidth*c.x},n.fade&&("show"===o&&(n.from.opacity=0,n.to.opacity=1),"hide"===o&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},t.effects.effect.size=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],c=["fontSize"],u=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],d=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=t.effects.setMode(a,e.mode||"effect"),f=e.restore||"effect"!==p,g=e.scale||"both",m=e.origin||["middle","center"],v=a.css("position"),_=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&a.show(),s={height:a.height(),width:a.width(),outerHeight:a.outerHeight(),outerWidth:a.outerWidth()},"toggle"===e.mode&&"show"===p?(a.from=e.to||b,a.to=e.from||s):(a.from=e.from||("show"===p?b:s),a.to=e.to||("hide"===p?b:s)),o={from:{y:a.from.height/s.height,x:a.from.width/s.width},to:{y:a.to.height/s.height,x:a.to.width/s.width}},("box"===g||"both"===g)&&(o.from.y!==o.to.y&&(_=_.concat(u),a.from=t.effects.setTransition(a,u,o.from.y,a.from),a.to=t.effects.setTransition(a,u,o.to.y,a.to)),o.from.x!==o.to.x&&(_=_.concat(d),a.from=t.effects.setTransition(a,d,o.from.x,a.from),a.to=t.effects.setTransition(a,d,o.to.x,a.to))),("content"===g||"both"===g)&&o.from.y!==o.to.y&&(_=_.concat(c).concat(l),a.from=t.effects.setTransition(a,c,o.from.y,a.from),a.to=t.effects.setTransition(a,c,o.to.y,a.to)),t.effects.save(a,_),a.show(),t.effects.createWrapper(a),a.css("overflow","hidden").css(a.from),m&&(n=t.effects.getBaseline(m,s),a.from.top=(s.outerHeight-a.outerHeight())*n.y,a.from.left=(s.outerWidth-a.outerWidth())*n.x,a.to.top=(s.outerHeight-a.to.outerHeight)*n.y,a.to.left=(s.outerWidth-a.to.outerWidth)*n.x),a.css(a.from),("content"===g||"both"===g)&&(u=u.concat(["marginTop","marginBottom"]).concat(c),d=d.concat(["marginLeft","marginRight"]),l=r.concat(u).concat(d),a.find("*[width]").each(function(){var i=t(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};f&&t.effects.save(i,l),i.from={height:s.height*o.from.y,width:s.width*o.from.x,outerHeight:s.outerHeight*o.from.y,outerWidth:s.outerWidth*o.from.x},i.to={height:s.height*o.to.y,width:s.width*o.to.x,outerHeight:s.height*o.to.y,outerWidth:s.width*o.to.x},o.from.y!==o.to.y&&(i.from=t.effects.setTransition(i,u,o.from.y,i.from),i.to=t.effects.setTransition(i,u,o.to.y,i.to)),o.from.x!==o.to.x&&(i.from=t.effects.setTransition(i,d,o.from.x,i.from),i.to=t.effects.setTransition(i,d,o.to.x,i.to)),i.css(i.from),i.animate(i.to,e.duration,e.easing,function(){f&&t.effects.restore(i,l)})})),a.animate(a.to,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){0===a.to.opacity&&a.css("opacity",a.from.opacity),"hide"===p&&a.hide(),t.effects.restore(a,_),f||("static"===v?a.css({position:"relative",top:a.to.top,left:a.to.left}):t.each(["top","left"],function(t,e){a.css(e,function(e,i){var s=parseInt(i,10),n=t?a.to.left:a.to.top;return"auto"===i?n+"px":s+n+"px"})})),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.shake=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","height","width"],a=t.effects.setMode(n,e.mode||"effect"),r=e.direction||"left",h=e.distance||20,l=e.times||3,c=2*l+1,u=Math.round(e.duration/c),d="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},g={},m={},v=n.queue(),_=v.length;for(t.effects.save(n,o),n.show(),t.effects.createWrapper(n),f[d]=(p?"-=":"+=")+h,g[d]=(p?"+=":"-=")+2*h,m[d]=(p?"-=":"+=")+2*h,n.animate(f,u,e.easing),s=1;l>s;s++)n.animate(g,u,e.easing).animate(m,u,e.easing);n.animate(g,u,e.easing).animate(f,u/2,e.easing).queue(function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}),_>1&&v.splice.apply(v,[1,0].concat(v.splice(_,c+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.slide=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","width","height"],a=t.effects.setMode(n,e.mode||"show"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u={};t.effects.save(n,o),n.show(),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0),t.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,c?isNaN(s)?"-"+s:-s:s),u[l]=(r?c?"+=":"-=":c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.transfer=function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),i()})}}(jQuery),function(t){t.widget("ui.menu",{version:"1.10.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,t.proxy(function(t){this.options.disabled&&t.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(t){t.preventDefault()},"click .ui-state-disabled > a":function(t){t.preventDefault()},"click .ui-menu-item:has(a)":function(e){var i=t(e.target).closest(".ui-menu-item");!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.mouseHandled=!0,this.select(e),i.has(".ui-menu").length?this.expand(e):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){var i=t(e.currentTarget);i.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(e,i)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.children(".ui-menu-item").eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){t.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){t(e.target).closest(".ui-menu").length||this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var e=t(this);e.data("ui-menu-submenu-carat")&&e.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(e){function i(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var s,n,o,a,r,h=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:h=!1,n=this.previousFilter||"",o=String.fromCharCode(e.keyCode),a=!1,clearTimeout(this.filterTimer),o===n?a=!0:o=n+o,r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())}),s=a&&-1!==s.index(this.active.next())?this.active.nextAll(".ui-menu-item"):s,s.length||(o=String.fromCharCode(e.keyCode),r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())})),s.length?(this.focus(e,s),s.length>1?(this.previousFilter=o,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}h&&e.preventDefault()},_activate:function(t){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i=this.options.icons.submenu,s=this.element.find(this.options.menus);s.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),s=e.prev("a"),n=t("<span>").addClass("ui-menu-icon ui-icon "+i).data("ui-menu-submenu-carat",!0);s.attr("aria-haspopup","true").prepend(n),e.attr("aria-labelledby",s.attr("id"))}),e=s.add(this.element),e.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),e.children(":not(.ui-menu-item)").each(function(){var e=t(this);/[^\-\u2014\u2013\s]/.test(e.text())||e.addClass("ui-widget-content ui-menu-divider")}),e.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){"icons"===t&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(e.submenu),this._super(t,e)},focus:function(t,e){var i,s;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.height(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",t,{item:this.active}))},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.children(".ui-menu-item")[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())),undefined):(this.next(e),undefined)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item").first())),undefined):(this.next(e),undefined)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)}})}(jQuery),function(t,e){function i(t,e,i){return[parseFloat(t[0])*(p.test(t[0])?e/100:1),parseFloat(t[1])*(p.test(t[1])?i/100:1)]}function s(e,i){return parseInt(t.css(e,i),10)||0}function n(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}t.ui=t.ui||{};var o,a=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,c=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,d=/^\w+/,p=/%$/,f=t.fn.position;t.position={scrollbarWidth:function(){if(o!==e)return o;var i,s,n=t("<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=n.children()[0];return t("body").append(n),i=a.offsetWidth,n.css("overflow","scroll"),s=a.offsetWidth,i===s&&(s=n[0].clientWidth),n.remove(),o=i-s},getScrollInfo:function(e){var i=e.isWindow?"":e.element.css("overflow-x"),s=e.isWindow?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]);return{element:i,isWindow:s,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s?i.width():i.outerWidth(),height:s?i.height():i.outerHeight()}}},t.fn.position=function(e){if(!e||!e.of)return f.apply(this,arguments);e=t.extend({},e);var o,p,g,m,v,_,b=t(e.of),y=t.position.getWithinInfo(e.within),w=t.position.getScrollInfo(y),k=(e.collision||"flip").split(" "),x={};return _=n(b),b[0].preventDefault&&(e.at="left top"),p=_.width,g=_.height,m=_.offset,v=t.extend({},m),t.each(["my","at"],function(){var t,i,s=(e[this]||"").split(" ");1===s.length&&(s=l.test(s[0])?s.concat(["center"]):c.test(s[0])?["center"].concat(s):["center","center"]),s[0]=l.test(s[0])?s[0]:"center",s[1]=c.test(s[1])?s[1]:"center",t=u.exec(s[0]),i=u.exec(s[1]),x[this]=[t?t[0]:0,i?i[0]:0],e[this]=[d.exec(s[0])[0],d.exec(s[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===e.at[0]?v.left+=p:"center"===e.at[0]&&(v.left+=p/2),"bottom"===e.at[1]?v.top+=g:"center"===e.at[1]&&(v.top+=g/2),o=i(x.at,p,g),v.left+=o[0],v.top+=o[1],this.each(function(){var n,l,c=t(this),u=c.outerWidth(),d=c.outerHeight(),f=s(this,"marginLeft"),_=s(this,"marginTop"),D=u+f+s(this,"marginRight")+w.width,C=d+_+s(this,"marginBottom")+w.height,I=t.extend({},v),P=i(x.my,c.outerWidth(),c.outerHeight());"right"===e.my[0]?I.left-=u:"center"===e.my[0]&&(I.left-=u/2),"bottom"===e.my[1]?I.top-=d:"center"===e.my[1]&&(I.top-=d/2),I.left+=P[0],I.top+=P[1],t.support.offsetFractions||(I.left=h(I.left),I.top=h(I.top)),n={marginLeft:f,marginTop:_},t.each(["left","top"],function(i,s){t.ui.position[k[i]]&&t.ui.position[k[i]][s](I,{targetWidth:p,targetHeight:g,elemWidth:u,elemHeight:d,collisionPosition:n,collisionWidth:D,collisionHeight:C,offset:[o[0]+P[0],o[1]+P[1]],my:e.my,at:e.at,within:y,elem:c})}),e.using&&(l=function(t){var i=m.left-I.left,s=i+p-u,n=m.top-I.top,o=n+g-d,h={target:{element:b,left:m.left,top:m.top,width:p,height:g},element:{element:c,left:I.left,top:I.top,width:u,height:d},horizontal:0>s?"left":i>0?"right":"center",vertical:0>o?"top":n>0?"bottom":"middle"};u>p&&p>r(i+s)&&(h.horizontal="center"),d>g&&g>r(n+o)&&(h.vertical="middle"),h.important=a(r(i),r(s))>a(r(n),r(o))?"horizontal":"vertical",e.using.call(this,t,h)}),c.offset(t.extend(I,{using:l}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,o=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-o-n;e.collisionWidth>o?h>0&&0>=l?(i=t.left+h+e.collisionWidth-o-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+o-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=a(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,o=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-o-n;e.collisionHeight>o?h>0&&0>=l?(i=t.top+h+e.collisionHeight-o-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+o-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=a(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,a=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-a-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-a-o,(0>i||r(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>r(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,a=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-a-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-a-o,t.top+p+f+g>c&&(0>s||r(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,t.top+p+f+g>u&&(i>0||u>r(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}},function(){var e,i,s,n,o,a=document.getElementsByTagName("body")[0],r=document.createElement("div");e=document.createElement(a?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},a&&t.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)e.style[o]=s[o];e.appendChild(r),i=a||document.documentElement,i.insertBefore(e,i.firstChild),r.style.cssText="position: absolute; left: 10.7432222px;",n=t(r).offset().left,t.support.offsetFractions=n>10&&11>n,e.innerHTML="",i.removeChild(e)}()}(jQuery),function(t,e){t.widget("ui.progressbar",{version:"1.10.2",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=t("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue() +},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(t){return t===e?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),e)},_constrainedValue:function(t){return t===e&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).toggleClass("ui-corner-right",e===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}})}(jQuery),function(t){var e=5;t.widget("ui.slider",t.ui.mouse,{version:"1.10.2",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),o="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e)})},_createRange:function(){var e=this.options,i="";e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=t("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===e.range||"max"===e.range?" ui-slider-range-"+e.range:""))):this.range=t([])},_setupEvents:function(){var t=this.handles.add(this.range).filter("a");this._off(t),this._on(t,this._handleEvents),this._hoverable(t),this._focusable(t)},_destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,o.addClass("ui-state-active").focus(),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_start:function(t,e){var i={handle:this.handles[e],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("start",t,i)},_slide:function(t,e,i){var s,n,o;this.options.values&&this.options.values.length?(s=this.values(e?0:1),2===this.options.values.length&&this.options.range===!0&&(0===e&&i>s||1===e&&s>i)&&(i=s),i!==this.values(e)&&(n=this.values(),n[e]=i,o=this._trigger("slide",t,{handle:this.handles[e],value:i,values:n}),s=this.values(e?0:1),o!==!1&&this.values(e,i,!0))):i!==this.value()&&(o=this._trigger("slide",t,{handle:this.handles[e],value:i}),o!==!1&&this.value(i))},_stop:function(t,e){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("stop",t,i)},_change:function(t,e){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._lastChangedValue=e,this._trigger("change",t,i)}},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),undefined):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),undefined;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),t.Widget.prototype._setOption.apply(this,arguments),e){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(i){var s,n,o,a,r=t(i.target).data("ui-slider-handle-index");switch(i.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(i.preventDefault(),!this._keySliding&&(this._keySliding=!0,t(i.target).addClass("ui-state-active"),s=this._start(i,r),s===!1))return}switch(a=this.options.step,n=o=this.options.values&&this.options.values.length?this.values(r):this.value(),i.keyCode){case t.ui.keyCode.HOME:o=this._valueMin();break;case t.ui.keyCode.END:o=this._valueMax();break;case t.ui.keyCode.PAGE_UP:o=this._trimAlignValue(n+(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.PAGE_DOWN:o=this._trimAlignValue(n-(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(n===this._valueMax())return;o=this._trimAlignValue(n+a);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(n===this._valueMin())return;o=this._trimAlignValue(n-a)}this._slide(i,r,o)},click:function(t){t.preventDefault()},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),t(e.target).removeClass("ui-state-active"))}}})}(jQuery),function(t){function e(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.widget("ui.spinner",{version:"1.10.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e={},i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);void 0!==n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var t=this.element[0]===this.document[0].activeElement;t||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var t=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=t.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*t.height())&&t.height()>0&&t.height(t.height()),this.options.disabled&&this.disable()},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>▲</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>▼</span>"+"</a>"},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){if("culture"===t||"numberFormat"===t){var i=this._parse(this.element.val());return this.options[t]=e,this.element.val(this._format(i)),void 0}("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(e.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(e.down)),this._super(t,e),"disabled"===t&&(e?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:e(function(t){this._super(t),this._value(this.element.val())}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:e(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:e(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:e(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:e(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(e(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}})}(jQuery),function(t,e){function i(){return++n}function s(t){return t.hash.length>1&&decodeURIComponent(t.href.replace(o,""))===decodeURIComponent(location.href.replace(o,""))}var n=0,o=/#.*$/;t.widget("ui.tabs",{version:"1.10.2",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var e=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var i=this.options.active,s=this.options.collapsible,n=location.hash.substring(1);return null===i&&(n&&this.tabs.each(function(s,o){return t(o).attr("aria-controls")===n?(i=s,!1):e}),null===i&&(i=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===i||-1===i)&&(i=this.tabs.length?0:!1)),i!==!1&&(i=this.tabs.index(this.tabs.eq(i)),-1===i&&(i=s?!1:0)),!s&&i===!1&&this.anchors.length&&(i=0),i},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(i){var s=t(this.document[0].activeElement).closest("li"),n=this.tabs.index(s),o=!0;if(!this._handlePageNav(i)){switch(i.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:n++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:o=!1,n--;break;case t.ui.keyCode.END:n=this.anchors.length-1;break;case t.ui.keyCode.HOME:n=0;break;case t.ui.keyCode.SPACE:return i.preventDefault(),clearTimeout(this.activating),this._activate(n),e;case t.ui.keyCode.ENTER:return i.preventDefault(),clearTimeout(this.activating),this._activate(n===this.options.active?!1:n),e;default:return}i.preventDefault(),clearTimeout(this.activating),n=this._focusNextTab(n,o),i.ctrlKey||(s.attr("aria-selected","false"),this.tabs.eq(n).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",n)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.focus())},_handlePageNav:function(i){return i.altKey&&i.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):i.altKey&&i.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):e},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).focus(),t},_setOption:function(t,i){return"active"===t?(this._activate(i),e):"disabled"===t?(this._setupDisabled(i),e):(this._super(t,i),"collapsible"===t&&(this.element.toggleClass("ui-tabs-collapsible",i),i||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(i),"heightStyle"===t&&this._setupHeightStyle(i),e)},_tabId:function(t){return t.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=t(),this.anchors.each(function(i,n){var o,a,r,h=t(n).uniqueId().attr("id"),l=t(n).closest("li"),c=l.attr("aria-controls");s(n)?(o=n.hash,a=e.element.find(e._sanitizeSelector(o))):(r=e._tabId(l),o="#"+r,a=e.element.find(o),a.length||(a=e._createPanel(r),a.insertAfter(e.panels[i-1]||e.tablist)),a.attr("aria-live","polite")),a.length&&(e.panels=e.panels.add(a)),c&&l.data("ui-tabs-aria-controls",c),l.attr({"aria-controls":o.substring(1),"aria-labelledby":h}),a.attr("aria-labelledby",h)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(e){t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1);for(var i,s=0;i=this.tabs[s];s++)e===!0||-1!==t.inArray(s,e)?t(i).addClass("ui-state-disabled").attr("aria-disabled","true"):t(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=e},_setupEvents:function(e){var i={click:function(t){t.preventDefault()}};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr({"aria-expanded":"false","aria-hidden":"true"}),i.oldTab.attr("aria-selected","false"),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr({"aria-expanded":"true","aria-hidden":"false"}),i.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(t){return"string"==typeof t&&(t=this.anchors.index(this.anchors.filter("[href$='"+t+"']"))),t},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(i){var s=this.options.disabled;s!==!1&&(i===e?s=!1:(i=this._getIndex(i),s=t.isArray(s)?t.map(s,function(t){return t!==i?t:null}):t.map(this.tabs,function(t,e){return e!==i?e:null})),this._setupDisabled(s))},disable:function(i){var s=this.options.disabled;if(s!==!0){if(i===e)s=!0;else{if(i=this._getIndex(i),-1!==t.inArray(i,s))return;s=t.isArray(s)?t.merge([i],s).sort():[i]}this._setupDisabled(s)}},load:function(e,i){e=this._getIndex(e);var n=this,o=this.tabs.eq(e),a=o.find(".ui-tabs-anchor"),r=this._getPanelForTab(o),h={tab:o,panel:r};s(a[0])||(this.xhr=t.ajax(this._ajaxSettings(a,i,h)),this.xhr&&"canceled"!==this.xhr.statusText&&(o.addClass("ui-tabs-loading"),r.attr("aria-busy","true"),this.xhr.success(function(t){setTimeout(function(){r.html(t),n._trigger("load",i,h)},1)}).complete(function(t,e){setTimeout(function(){"abort"===e&&n.panels.stop(!1,!0),o.removeClass("ui-tabs-loading"),r.removeAttr("aria-busy"),t===n.xhr&&delete n.xhr},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href"),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}})}(jQuery),function(t){function e(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))}function i(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")}var s=0;t.widget("ui.tooltip",{version:"1.10.2",options:{content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(e,i){var s=this;return"disabled"===e?(this[i?"_disable":"_enable"](),this.options[e]=i,void 0):(this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e)}),void 0)},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.is("[title]")&&e.data("ui-tooltip-title",e.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))})},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s?this._open(e,t,s):(i=s.call(t[0],function(i){t.data("ui-tooltip-open")&&n._delay(function(){e&&(e.type=o),this._open(e,t,i) +})}),i&&this._open(e,t,i),void 0)},_open:function(i,s,n){function o(t){l.of=t,a.is(":hidden")||a.position(l)}var a,r,h,l=t.extend({},this.options.position);if(n){if(a=this._find(s),a.length)return a.find(".ui-tooltip-content").html(n),void 0;s.is("[title]")&&(i&&"mouseover"===i.type?s.attr("title",""):s.removeAttr("title")),a=this._tooltip(s),e(s,a.attr("id")),a.find(".ui-tooltip-content").html(n),this.options.track&&i&&/^mouse/.test(i.type)?(this._on(this.document,{mousemove:o}),o(i)):a.position(t.extend({of:s},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){a.is(":visible")&&(o(l.of),clearInterval(h))},t.fx.interval)),this._trigger("open",i,{tooltip:a}),r={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var i=t.Event(e);i.currentTarget=s[0],this.close(i,!0)}},remove:function(){this._removeTooltip(a)}},i&&"mouseover"!==i.type||(r.mouseleave="close"),i&&"focusin"!==i.type||(r.focusout="close"),this._on(!0,s,r)}},close:function(e){var s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);this.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&n.attr("title",n.data("ui-tooltip-title")),i(n),o.stop(!0),this._hide(o,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),this.closing=!0,this._trigger("close",e,{tooltip:o}),this.closing=!1)},_tooltip:function(e){var i="ui-tooltip-"+s++,n=t("<div>").attr({id:i,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return t("<div>").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[i]=e,n},_find:function(e){var i=e.data("ui-tooltip-id");return i?t("#"+i):t()},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0),t("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))})}})}(jQuery); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/js/jquery.min.js --- a/web/res/js/jquery.min.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/js/jquery.min.js Sun Apr 21 21:54:24 2013 +0200 @@ -1,4 +1,5 @@ -/*! jQuery v1.7.1 jquery.com | jquery.org/license */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML=" <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; -f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:$\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*$)?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:$(\d*)$)?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:$(['"]?)((?:\([^$]+\)|[^]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^$]*$)/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha$[^)]*$/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file +/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license +//@ sourceMappingURL=jquery.min.map +*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj; +return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\$((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\$|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\$"+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\$|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\$"+_+"*((?:-\\d)?\\d*)"+_+"*\$|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&>(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l) +}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha$[^)]*$/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window); \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/js/live-polemic.js --- a/web/res/js/live-polemic.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/js/live-polemic.js Sun Apr 21 21:54:24 2013 +0200 @@ -1,3 +1,7 @@ +function rejectUser(username) { + return (/^[A-Z][a-z]{2,8}[0-9]{4,6}$/.test(username)) +} + if (typeof annotations == "undefined" || !annotations) { var annotations = { "default" : { @@ -72,7 +76,7 @@ tlWidth : 150, tlHeight : 480, globalWords : {}, - suggestCount : suggested_keywords.map(function(_w) { + suggestCount : _(suggested_keywords).map(function(_w) { return { "word" : _w, "rgxp" : new RegExp(_w.replace(/(\W)/g, '\\$1'), "im"), @@ -96,9 +100,9 @@ stopWords : [ 'aussi', 'and', 'avec', 'aux', 'bien', 'car', 'cette', 'comme', 'dans', 'donc', 'des', 'elle', 'encore', 'est', 'être', 'eux', 'faire', 'fait', 'http', 'ici', 'ils', 'les', 'leur', 'leurs', 'mais', 'mes', 'même', 'mon', 'notre', - 'non', 'nos', 'nous', 'ont', 'par', 'pas', 'peu', 'peut', 'plus', 'pour', 'que', 'qui', 'ses' ,'son', 'sont', 'sur', + 'non', 'nos', 'nous', 'ont', 'oui', 'par', 'pas', 'peu', 'peut', 'plus', 'pour', 'que', 'qui', 'ses' ,'son', 'sont', 'sur', 'tes', 'très', 'the', 'ton', 'tous', 'tout', 'une', 'votre', 'vos', 'vous' - ], + ] } function getTweets(options) { @@ -172,6 +176,11 @@ console.log(tweet); return; } + + if (rejectUser(tweet.from_user)) { + return; + } + function backRef(source_id, target_id, type) { var target = tweetById(target_id); if (target) { @@ -192,7 +201,7 @@ delete tweet[_i + '_str']; }); - if (twCx.idIndex.indexOf(tweet.id) != -1) { + if (_(twCx.idIndex).indexOf(tweet.id) != -1) { return; } @@ -209,7 +218,7 @@ "text" : _m, "start" : _start, "end" : _lastpos, - "link" :'<a href="http://twitter.com/' + _m.substr(1) + '" onclick="filtrerTexte(\'' + _m + '\'); return false;" target="_blank">', + "link" :'<a href="http://twitter.com/' + _m.substr(1) + '" onclick="filtrerTexte(\'' + _m + '\'); return false;" target="_blank">' }); } } @@ -226,7 +235,7 @@ "text" : _h, "start" : _start, "end" : _lastpos, - "link" :'<a href="http://twitter.com/search?q=' + encodeURIComponent(_h) + '" onclick="filtrerTexte(\'' + _.escape(_h) + '\'); return false;" target="_blank">', + "link" :'<a href="http://twitter.com/search?q=' + encodeURIComponent(_h) + '" onclick="filtrerTexte(\'' + _.escape(_h) + '\'); return false;" target="_blank">' }); } } @@ -242,7 +251,7 @@ "text" : _m, "start" : _start, "end" : _lastpos, - "link" :'<a href="' + _m + '" target="_blank">', + "link" :'<a href="' + _m + '" target="_blank">' }); } } @@ -279,9 +288,9 @@ var tab = tweet.text.replace(twCx.urlRegExp,'').match(twCx.wordRegExp); - for (var i in tab) { - var word = tab[i].toLowerCase(); - if (twCx.stopWords.indexOf(word) == -1 && tracking_keywords.indexOf(word) == -1 && word[0] != '@') { + _(tab).each(function(w) { + var word = w.toLowerCase(); + if (_(twCx.stopWords).indexOf(word) == -1 && _(tracking_keywords).indexOf(word) == -1 && word[0] != '@') { if (twCx.globalWords[word]) { twCx.globalWords[word].freq++; } else { @@ -301,7 +310,7 @@ } } } - } + }); _(twCx.suggestCount).each(function(_k) { if (tweet.text.search(_k.rgxp) != -1) { @@ -343,6 +352,9 @@ } function flattenDateStruct(slices, target_level) { + if (!slices || !slices.length) { + return []; + } var current_level = slices[0].level, result = []; if (current_level < target_level) { @@ -425,7 +437,7 @@ } function tweetById(tweetid) { - var pos = twCx.idIndex.indexOf(tweetid); + var pos = _(twCx.idIndex).indexOf(tweetid); return (pos == -1) ? false : twCx.tweets[pos]; } @@ -442,7 +454,7 @@ } function movePos(delta) { - goToPos( delta + twCx.currentIdIndex.indexOf(twCx.position) ); + goToPos( delta + _(twCx.currentIdIndex).indexOf(twCx.position) ); } function tweetToHtml(tweet, className, elName) { @@ -455,7 +467,21 @@ return placeHolder(className); } var el = (elName ? elName : 'li'); - var html = '<' + el + ' class="tweet ' + className + '" id="tweet_' + tweet.id + '"'; + var html = '<' + + el + + ' draggable="true" class="tweet ' + + className + + '" id="tweet_' + + tweet.id + + '" data-title="Tweet by ' + + _(tweet.from_user_name).escape() + + '" data-description="' + + _(tweet.text).escape() + + '" data-uri="http://twitter.com/' + + tweet.from_user + + '/status/' + + tweet.id + + '"'; if (className != 'full') { html += ' onclick="selectTweet(\'' + tweet.id + '\'); return false;"'; } @@ -500,7 +526,7 @@ } function tlIdFromPos(x, y, outside) { - if (!twCx.tlOnDisplay) { + if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) { return; } var ligne = Math.min( twCx.tlOnDisplay.length - 1, Math.max( 0, Math.floor(( twCx.tlHeight - y ) / twCx.scaleY) ) ), @@ -539,7 +565,7 @@ var l = 0; for (var j in twCx.tlOnDisplay[i].displayData) { if (j == ann) { - var p = twCx.tlOnDisplay[i].displayData[j].indexOf(tweet.id); + var p = _(twCx.tlOnDisplay[i].displayData[j]).indexOf(tweet.id); if (p != -1) { x = twCx.deltaX + twCx.scaleX * ( p + l + .5 ); } @@ -686,16 +712,16 @@ return; } if (twCx.filtre) { - var tweets = twCx.tweets.filter(function(tweet) { + var tweets = _(twCx.tweets).filter(function(tweet) { var mention = '@' + tweet.from_user; return ( tweet.text.search(twCx.filtre) != -1 ) || ( mention.search(twCx.filtre) != -1 ); }); $("#inp_q").val(twCx.filtreTexte + ' (' + tweets.length + ' tweets)'); if (tweets.length) { - var idIndex = tweets.map(function(tweet) { + var idIndex = _(tweets).map(function(tweet) { return tweet.id; }); - var p = idIndex.indexOf(twCx.position); + var p = _(idIndex).indexOf(twCx.position); if (p == -1) { for (p = idIndex.length - 1; p > 0 && idIndex[p] > twCx.position; p--) { } @@ -707,7 +733,7 @@ } else { twCx.currentIdIndex = twCx.idIndex; var tweets = twCx.tweets; - var p = twCx.idIndex.indexOf(twCx.position); + var p = _(twCx.idIndex).indexOf(twCx.position); if (p == -1) { p = (twCx.followLast ? twCx.idIndex.length - 1 : 0); } @@ -785,19 +811,20 @@ makeTagCloud(twCx.suggestCount, "#suggkw"); } - var tab = _(twCx.globalWords).map(function(v, k) { + var tab = _(twCx.globalWords).chain() + .map(function(v, k) { return { "word": k, "freq" : v.freq, - "annotations" : v.annotations, + "annotations" : v.annotations }; }).filter(function(v) { - return v.freq > 1; - }); + return v.freq > 3; + }).value(); if (tab.length) { - tab = _(tab).sortBy( function(a) { return ( - a.freq ) }).slice(0,20); + tab = _(tab).sortBy( function(a) { return ( - a.freq ) }).slice(0,40); makeTagCloud(tab,"#motscles"); } else { $("#motscles").html(''); @@ -810,6 +837,9 @@ } twCx.tlOnDisplay = trimFDS(); + if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) { + return; + } twCx.scaleY = twCx.tlHeight / twCx.tlOnDisplay.length; var maxTweets = 0, startTl = 0, @@ -928,7 +958,7 @@ function filtrerAnnotation(annotation) { if (annotations[annotation]) { effectuerFiltrage(annotations[annotation].display_name, - new RegExp( "(" + annotations[annotation].keywords.map(function(a) { return a.source }).join("|") + ")", "gim" ) ); + new RegExp( "(" + _(annotations[annotation].keywords).map(function(a) { return a.source }).join("|") + ")", "gim" ) ); } else { effectuerFiltrage('', null) } @@ -1037,13 +1067,13 @@ function saveCSV() { function csvEncode(tableau) { - return tableau.map(function(el) { + return _(tableau).map(function(el) { return '"' + unescape(encodeURIComponent(el)).replace(/"/gm, '""') + '"'; }).join(",") }; var _csvfields = [ "id", "from_user", "from_user_name", "created_at", "text" ], - _csvtxt = csvEncode(_csvfields) + "\n" + twCx.tweets.map(function(tw) { - return csvEncode(_csvfields.map(function(field) { + _csvtxt = csvEncode(_csvfields) + "\n" + _(twCx.tweets).map(function(tw) { + return csvEncode(_(_csvfields).map(function(field) { return tw[field]; })); }).join("\n"); @@ -1075,6 +1105,16 @@ } return false; }); + $("#tweetlist").delegate(".tweet", "dragstart", function(e) { + var div = document.createElement('div'); + div.appendChild(this.cloneNode(true)); + try { + e.originalEvent.dataTransfer.setData("text/html",div.innerHTML); + } + catch(err) { + e.originalEvent.dataTransfer.setData("text",div.innerHTML); + } + }); $("#timeline").mousewheel(function(e, d) { twCx.wheelDelta += d; if (Math.abs(twCx.wheelDelta) >= 1) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/js/popcorn-complete.min.js --- a/web/res/js/popcorn-complete.min.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/js/popcorn-complete.min.js Sun Apr 21 21:54:24 2013 +0200 @@ -1,200 +1,160 @@ /* - * popcorn.js version 1.2 + * popcorn.js version 1.3 * http://popcornjs.org * * Copyright 2011, Mozilla Foundation * Licensed under the MIT license */ -(function(g,b){function d(e,m){return function(){if(n.plugin.debug)return e.apply(this,arguments);try{return e.apply(this,arguments)}catch(q){n.plugin.errors.push({plugin:m,thrown:q,source:e.toString()});this.emit("error",n.plugin.errors)}}}if(b.addEventListener){var a=Array.prototype,c=Object.prototype,f=a.forEach,h=a.slice,p=c.hasOwnProperty,o=c.toString,l=g.Popcorn,i=/^(#([\w\-\_\.]+))$/,r=[],k=false,j={events:{hash:{},apis:{}}},v=function(){return g.requestAnimationFrame||g.webkitRequestAnimationFrame|| -g.mozRequestAnimationFrame||g.oRequestAnimationFrame||g.msRequestAnimationFrame||function(e){g.setTimeout(e,16)}}(),w=function(e){var m=e.media.currentTime,q=e.options.frameAnimation,s=e.data.disabled,t=e.data.trackEvents,u=t.animating,x=t.startIndex,A=n.registryByName,B=0,D,E;for(x=Math.min(x+1,t.byStart.length-2);x>0&&t.byStart[x];){B=t.byStart[x];E=(D=B._natives)&&D.type;if(!D||A[E]||e[E])if(B.start<=m&&B.end>m&&s.indexOf(E)===-1){if(!B._running){B._running=true;D.start.call(e,null,B);q&&B&&B._running&& -B.natives.frame&&D.frame.call(e,null,B,m)}}else if(B._running===true){B._running=false;D.end.call(e,null,B);if(q&&B._natives.frame){B=u.indexOf(B);B>=0&&u.splice(B,1)}}x--}},n=function(e,m){return new n.p.init(e,m||null)};n.version="1.2";n.isSupported=true;n.instances=[];n.p=n.prototype={init:function(e,m){var q,s=this;if(typeof e==="function")if(b.readyState==="complete")e(b,n);else{r.push(e);if(!k){k=true;var t=function(){b.removeEventListener("DOMContentLoaded",t,false);for(var x=0,A=r.length;x< -A;x++)r[x].call(b,n);r=null};b.addEventListener("DOMContentLoaded",t,false)}}else{this.media=(q=i.exec(e))&&q.length&&q[2]?b.getElementById(q[2]):e;this[this.media.nodeName&&this.media.nodeName.toLowerCase()||"video"]=this.media;n.instances.push(this);this.options=m||{};this.isDestroyed=false;this.data={timeUpdate:n.nop,disabled:[],events:{},hooks:{},history:[],state:{volume:this.media.volume},trackRefs:{},trackEvents:{byStart:[{start:-1,end:-1}],byEnd:[{start:-1,end:-1}],animating:[],startIndex:0, -endIndex:0,previousUpdateTime:-1}};var u=function(){s.media.removeEventListener("loadeddata",u,false);var x;x=s.media.duration;x=x!=x?Number.MAX_VALUE:x+1;n.addTrackEvent(s,{start:x,end:x});if(s.options.frameAnimation){s.data.timeUpdate=function(){n.timeUpdate(s,{});s.emit("timeupdate");!s.isDestroyed&&v(s.data.timeUpdate)};!s.isDestroyed&&v(s.data.timeUpdate)}else{s.data.timeUpdate=function(A){n.timeUpdate(s,A)};s.isDestroyed||s.media.addEventListener("timeupdate",s.data.timeUpdate,false)}};s.media.readyState>= -2?u():s.media.addEventListener("loadeddata",u,false);return this}}};n.p.init.prototype=n.p;n.forEach=function(e,m,q){if(!e||!m)return{};q=q||this;var s,t;if(f&&e.forEach===f)return e.forEach(m,q);if(o.call(e)==="[object NodeList]"){s=0;for(t=e.length;s<t;s++)m.call(q,e[s],s,e);return e}for(s in e)p.call(e,s)&&m.call(q,e[s],s,e);return e};n.extend=function(e){var m=h.call(arguments,1);n.forEach(m,function(q){for(var s in q)e[s]=q[s]});return e};n.extend(n,{noConflict:function(e){if(e)g.Popcorn=l;return n}, -error:function(e){throw Error(e);},guid:function(e){n.guid.counter++;return(e?e:"")+(+new Date+n.guid.counter)},sizeOf:function(e){var m=0,q;for(q in e)m++;return m},isArray:Array.isArray||function(e){return o.call(e)==="[object Array]"},nop:function(){},position:function(e){e=e.getBoundingClientRect();var m={},q=b.documentElement,s=b.body,t,u,x;t=q.clientTop||s.clientTop||0;u=q.clientLeft||s.clientLeft||0;x=g.pageYOffset&&q.scrollTop||s.scrollTop;q=g.pageXOffset&&q.scrollLeft||s.scrollLeft;t=Math.ceil(e.top+ -x-t);u=Math.ceil(e.left+q-u);for(var A in e)m[A]=Math.round(e[A]);return n.extend({},m,{top:t,left:u})},disable:function(e,m){var q=e.data.disabled;q.indexOf(m)===-1&&q.push(m);w(e);return e},enable:function(e,m){var q=e.data.disabled,s=q.indexOf(m);s>-1&&q.splice(s,1);w(e);return e},destroy:function(e){var m=e.data.events,q,s,t;for(s in m){q=m[s];for(t in q)delete q[t];m[s]=null}if(!e.isDestroyed){e.data.timeUpdate&&e.media.removeEventListener("timeupdate",e.data.timeUpdate,false);e.isDestroyed= -true}}});n.guid.counter=1;n.extend(n.p,function(){var e={};n.forEach("load play pause currentTime playbackRate volume duration preload playbackRate autoplay loop controls muted buffered readyState seeking paused played seekable ended".split(/\s+/g),function(m){e[m]=function(q){if(typeof this.media[m]==="function"){if(q!=null&&/play|pause/.test(m))this.media.currentTime=n.util.toSeconds(q);this.media[m]();return this}if(q!=null){this.media[m]=q;return this}return this.media[m]}});return e}());n.forEach("enable disable".split(" "), -function(e){n.p[e]=function(m){return n[e](this,m)}});n.extend(n.p,{roundTime:function(){return-~this.media.currentTime},exec:function(e,m){n.addTrackEvent(this,{start:e,end:e+1,_running:false,_natives:{start:m||n.nop,end:n.nop,type:"cue"}});return this},mute:function(e){e=e==null||e===true?"muted":"unmuted";if(e==="unmuted"){this.media.muted=false;this.media.volume=this.data.state.volume}if(e==="muted"){this.data.state.volume=this.media.volume;this.media.muted=true}this.emit(e);return this},unmute:function(e){return this.mute(e== -null?false:!e)},position:function(){return n.position(this.media)},toggle:function(e){return n[this.data.disabled.indexOf(e)>-1?"enable":"disable"](this,e)},defaults:function(e,m){if(n.isArray(e)){n.forEach(e,function(q){for(var s in q)this.defaults(s,q[s])},this);return this}if(!this.options.defaults)this.options.defaults={};this.options.defaults[e]||(this.options.defaults[e]={});n.extend(this.options.defaults[e],m);return this}});n.Events={UIEvents:"blur focus focusin focusout load resize scroll unload", -MouseEvents:"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave click dblclick",Events:"loadstart progress suspend emptied stalled play pause loadedmetadata loadeddata waiting playing canplay canplaythrough seeking seeked timeupdate ended ratechange durationchange volumechange"};n.Events.Natives=n.Events.UIEvents+" "+n.Events.MouseEvents+" "+n.Events.Events;j.events.apiTypes=["UIEvents","MouseEvents","Events"];(function(e,m){for(var q=j.events.apiTypes,s=e.Natives.split(/\s+/g), -t=0,u=s.length;t<u;t++)m.hash[s[t]]=true;q.forEach(function(x){m.apis[x]={};for(var A=e[x].split(/\s+/g),B=A.length,D=0;D<B;D++)m.apis[x][A[D]]=true})})(n.Events,j.events);n.events={isNative:function(e){return!!j.events.hash[e]},getInterface:function(e){if(!n.events.isNative(e))return false;var m=j.events,q=m.apiTypes;m=m.apis;for(var s=0,t=q.length,u,x;s<t;s++){x=q[s];if(m[x][e]){u=x;break}}return u},all:n.Events.Natives.split(/\s+/g),fn:{trigger:function(e,m){var q;if(this.data.events[e]&&n.sizeOf(this.data.events[e])){if(q= -n.events.getInterface(e)){q=b.createEvent(q);q.initEvent(e,true,true,g,1);this.media.dispatchEvent(q);return this}n.forEach(this.data.events[e],function(s){s.call(this,m)},this)}return this},listen:function(e,m){var q=this,s=true,t=n.events.hooks[e],u;if(!this.data.events[e]){this.data.events[e]={};s=false}if(t){t.add&&t.add.call(this,{},m);if(t.bind)e=t.bind;if(t.handler){u=m;m=function(x){t.handler.call(q,x,u)}}s=true;if(!this.data.events[e]){this.data.events[e]={};s=false}}this.data.events[e][m.name|| -m.toString()+n.guid()]=m;!s&&n.events.all.indexOf(e)>-1&&this.media.addEventListener(e,function(x){n.forEach(q.data.events[e],function(A){typeof A==="function"&&A.call(q,x)})},false);return this},unlisten:function(e,m){if(this.data.events[e]&&this.data.events[e][m]){delete this.data.events[e][m];return this}this.data.events[e]=null;return this}},hooks:{canplayall:{bind:"canplaythrough",add:function(e,m){var q=false;if(this.media.readyState){m.call(this,e);q=true}this.data.hooks.canplayall={fired:q}}, -handler:function(e,m){if(!this.data.hooks.canplayall.fired){m.call(this,e);this.data.hooks.canplayall.fired=true}}}}};n.forEach([["trigger","emit"],["listen","on"],["unlisten","off"]],function(e){n.p[e[0]]=n.p[e[1]]=n.events.fn[e[0]]});n.addTrackEvent=function(e,m){if(m&&m._natives&&m._natives.type&&e.options.defaults&&e.options.defaults[m._natives.type])m=n.extend({},e.options.defaults[m._natives.type],m);if(m._natives){m._id=!m.id?n.guid(m._natives.type):m.id;e.data.history.push(m._id)}m.start= -n.util.toSeconds(m.start,e.options.framerate);m.end=n.util.toSeconds(m.end,e.options.framerate);var q=e.data.trackEvents.byStart,s=e.data.trackEvents.byEnd,t;for(t=q.length-1;t>=0;t--)if(m.start>=q[t].start){q.splice(t+1,0,m);break}for(q=s.length-1;q>=0;q--)if(m.end>s[q].end){s.splice(q+1,0,m);break}if(m._natives&&(n.registryByName[m._natives.type]||e[m._natives.type])){s=e.media.currentTime;if(m.end>s&&m.start<=s&&e.data.disabled.indexOf(m._natives.type)===-1){m._running=true;m._natives.start.call(e, -null,m);if(e.options.frameAnimation&&m._natives.frame){e.data.trackEvents.animating.push(m);m._natives.frame.call(e,null,m,s)}}}t<=e.data.trackEvents.startIndex&&m.start<=e.data.trackEvents.previousUpdateTime&&e.data.trackEvents.startIndex++;q<=e.data.trackEvents.endIndex&&m.end<e.data.trackEvents.previousUpdateTime&&e.data.trackEvents.endIndex++;this.timeUpdate(e,null,true);m._id&&n.addTrackEvent.ref(e,m)};n.addTrackEvent.ref=function(e,m){e.data.trackRefs[m._id]=m;return e};n.removeTrackEvent=function(e, -m){for(var q,s,t=e.data.history.length,u=e.data.trackEvents.byStart.length,x=0,A=0,B=[],D=[],E=[],z=[];--u>-1;){q=e.data.trackEvents.byStart[x];s=e.data.trackEvents.byEnd[x];if(!q._id){B.push(q);D.push(s)}if(q._id){q._id!==m&&B.push(q);s._id!==m&&D.push(s);if(q._id===m){A=x;q._natives._teardown&&q._natives._teardown.call(e,q)}}x++}u=e.data.trackEvents.animating.length;x=0;if(u)for(;--u>-1;){q=e.data.trackEvents.animating[x];q._id||E.push(q);q._id&&q._id!==m&&E.push(q);x++}A<=e.data.trackEvents.startIndex&& -e.data.trackEvents.startIndex--;A<=e.data.trackEvents.endIndex&&e.data.trackEvents.endIndex--;e.data.trackEvents.byStart=B;e.data.trackEvents.byEnd=D;e.data.trackEvents.animating=E;for(u=0;u<t;u++)e.data.history[u]!==m&&z.push(e.data.history[u]);e.data.history=z;n.removeTrackEvent.ref(e,m)};n.removeTrackEvent.ref=function(e,m){delete e.data.trackRefs[m];return e};n.getTrackEvents=function(e){var m=[];e=e.data.trackEvents.byStart;for(var q=e.length,s=0,t;s<q;s++){t=e[s];t._id&&m.push(t)}return m}; -n.getTrackEvents.ref=function(e){return e.data.trackRefs};n.getTrackEvent=function(e,m){return e.data.trackRefs[m]};n.getTrackEvent.ref=function(e,m){return e.data.trackRefs[m]};n.getLastTrackEventId=function(e){return e.data.history[e.data.history.length-1]};n.timeUpdate=function(e,m){var q=e.media.currentTime,s=e.data.trackEvents.previousUpdateTime,t=e.data.trackEvents,u=t.animating,x=t.endIndex,A=t.startIndex,B=0,D=t.byStart.length,E=t.byEnd.length,z=n.registryByName,F,H,G;if(s<=q){for(;t.byEnd[x]&& -t.byEnd[x].end<=q;){F=t.byEnd[x];G=(s=F._natives)&&s.type;if(!s||z[G]||e[G]){if(F._running===true){F._running=false;s.end.call(e,m,F);e.emit("trackend",n.extend({},F,{plugin:G,type:"trackend"}))}x++}else{n.removeTrackEvent(e,F._id);return}}for(;t.byStart[A]&&t.byStart[A].start<=q;){H=t.byStart[A];G=(s=H._natives)&&s.type;if(!s||z[G]||e[G]){if(H.end>q&&H._running===false&&e.data.disabled.indexOf(G)===-1){H._running=true;s.start.call(e,m,H);e.emit("trackstart",n.extend({},H,{plugin:G,type:"trackstart"})); -e.options.frameAnimation&&H&&H._running&&H._natives.frame&&u.push(H)}A++}else{n.removeTrackEvent(e,H._id);return}}if(e.options.frameAnimation)for(;B<u.length;){z=u[B];if(z._running){z._natives.frame.call(e,m,z,q);B++}else u.splice(B,1)}}else if(s>q){for(;t.byStart[A]&&t.byStart[A].start>q;){H=t.byStart[A];G=(s=H._natives)&&s.type;if(!s||z[G]||e[G]){if(H._running===true){H._running=false;s.end.call(e,m,H);e.emit("trackend",n.extend({},F,{plugin:G,type:"trackend"}))}A--}else{n.removeTrackEvent(e,H._id); -return}}for(;t.byEnd[x]&&t.byEnd[x].end>q;){F=t.byEnd[x];G=(s=F._natives)&&s.type;if(!s||z[G]||e[G]){if(F.start<=q&&F._running===false&&e.data.disabled.indexOf(G)===-1){F._running=true;s.start.call(e,m,F);e.emit("trackstart",n.extend({},H,{plugin:G,type:"trackstart"}));e.options.frameAnimation&&F&&F._running&&F._natives.frame&&u.push(F)}x--}else{n.removeTrackEvent(e,F._id);return}}if(e.options.frameAnimation)for(;B<u.length;){z=u[B];if(z._running){z._natives.frame.call(e,m,z,q);B++}else u.splice(B, -1)}}t.endIndex=x;t.startIndex=A;t.previousUpdateTime=q;t.byStart.length<D&&t.startIndex--;t.byEnd.length<E&&t.endIndex--};n.extend(n.p,{getTrackEvents:function(){return n.getTrackEvents.call(null,this)},getTrackEvent:function(e){return n.getTrackEvent.call(null,this,e)},getLastTrackEventId:function(){return n.getLastTrackEventId.call(null,this)},removeTrackEvent:function(e){n.removeTrackEvent.call(null,this,e);return this},removePlugin:function(e){n.removePlugin.call(null,this,e);return this},timeUpdate:function(e){n.timeUpdate.call(null, -this,e);return this},destroy:function(){n.destroy.call(null,this);return this}});n.manifest={};n.registry=[];n.registryByName={};n.plugin=function(e,m,q){if(n.protect.natives.indexOf(e.toLowerCase())>=0)n.error("'"+e+"' is a protected function name");else{var s=["start","end"],t={},u=typeof m==="function",x=["_setup","_teardown","start","end","frame"],A=function(E,z){E=E||n.nop;z=z||n.nop;return function(){E.apply(this,arguments);z.apply(this,arguments)}};n.manifest[e]=q=q||m.manifest||{};x.forEach(function(E){m[E]= -d(m[E]||n.nop,e)});var B=function(E,z){if(!z)return this;var F=z._natives={},H="",G;n.extend(F,E);z._natives.type=e;z._running=false;F.start=F.start||F["in"];F.end=F.end||F.out;F._teardown=A(function(){var I=h.call(arguments);I.unshift(null);I[1]._running&&F.end.apply(this,I)},F._teardown);z.compose=z.compose&&z.compose.split(" ")||[];z.effect=z.effect&&z.effect.split(" ")||[];z.compose=z.compose.concat(z.effect);z.compose.forEach(function(I){H=n.compositions[I]||{};x.forEach(function(J){F[J]=A(F[J], -H[J])})});z._natives.manifest=q;if(!("start"in z))z.start=z["in"]||0;if(!z.end&&z.end!==0)z.end=z.out||Number.MAX_VALUE;if(!p.call(z,"toString"))z.toString=function(){var I=["start: "+z.start,"end: "+z.end,"id: "+(z.id||z._id)];z.target!=null&&I.push("target: "+z.target);return e+" ( "+I.join(", ")+" )"};if(!z.target){G="options"in q&&q.options;z.target=G&&"target"in G&&G.target}z._natives._setup&&z._natives._setup.call(this,z);n.addTrackEvent(this,n.extend(z,z));n.forEach(E,function(I,J){J!=="type"&& -s.indexOf(J)===-1&&this.on(J,I)},this);return this};n.p[e]=t[e]=function(E){E=n.extend({},this.options.defaults&&this.options.defaults[e]||{},E);return B.call(this,u?m.call(this,E):m,E)};var D={fn:t[e],definition:m,base:m,parents:[],name:e};n.registry.push(n.extend(t,D,{type:e}));n.registryByName[e]=D;return t}};n.plugin.errors=[];n.plugin.debug=false;n.removePlugin=function(e,m){if(!m){m=e;e=n.p;if(n.protect.natives.indexOf(m.toLowerCase())>=0){n.error("'"+m+"' is a protected function name");return}var q= -n.registry.length,s;for(s=0;s<q;s++)if(n.registry[s].name===m){n.registry.splice(s,1);delete n.registryByName[m];delete n.manifest[m];delete e[m];return}}q=e.data.trackEvents.byStart;s=e.data.trackEvents.byEnd;var t=e.data.trackEvents.animating,u,x;u=0;for(x=q.length;u<x;u++){if(q[u]&&q[u]._natives&&q[u]._natives.type===m){q[u]._natives._teardown&&q[u]._natives._teardown.call(e,q[u]);q.splice(u,1);u--;x--;if(e.data.trackEvents.startIndex<=u){e.data.trackEvents.startIndex--;e.data.trackEvents.endIndex--}}s[u]&& -s[u]._natives&&s[u]._natives.type===m&&s.splice(u,1)}u=0;for(x=t.length;u<x;u++)if(t[u]&&t[u]._natives&&t[u]._natives.type===m){t.splice(u,1);u--;x--}};n.compositions={};n.compose=function(e,m,q){n.manifest[e]=q||m.manifest||{};n.compositions[e]=m};n.plugin.effect=n.effect=n.compose;var y=/\?/,C={url:"",data:"",dataType:"",success:n.nop,type:"GET",async:true,xhr:function(){return new g.XMLHttpRequest}};n.xhr=function(e){e.dataType=e.dataType&&e.dataType.toLowerCase()||null;if(e.dataType&&(e.dataType=== -"jsonp"||e.dataType==="script"))n.xhr.getJSONP(e.url,e.success,e.dataType==="script");else{e=n.extend({},C,e);e.ajax=e.xhr();if(e.ajax){if(e.type==="GET"&&e.data){e.url+=(y.test(e.url)?"&":"?")+e.data;e.data=null}e.ajax.open(e.type,e.url,e.async);e.ajax.send(e.data||null);return n.xhr.httpData(e)}}};n.xhr.httpData=function(e){var m,q=null,s,t=null;e.ajax.onreadystatechange=function(){if(e.ajax.readyState===4){try{q=JSON.parse(e.ajax.responseText)}catch(u){}m={xml:e.ajax.responseXML,text:e.ajax.responseText, -json:q};if(!m.xml||!m.xml.documentElement){m.xml=null;try{s=new DOMParser;t=s.parseFromString(e.ajax.responseText,"text/xml");if(!t.getElementsByTagName("parsererror").length)m.xml=t}catch(x){}}if(e.dataType)m=m[e.dataType];e.success.call(e.ajax,m)}};return m};n.xhr.getJSONP=function(e,m,q){var s=b.head||b.getElementsByTagName("head")[0]||b.documentElement,t=b.createElement("script"),u=e.split("?")[1],x=false,A=[],B,D;if(u&&!q)A=u.split("&");if(A.length)D=A[A.length-1].split("=");B=A.length?D[1]? -D[1]:D[0]:"jsonp";if(!u&&!q)e+="?callback="+B;if(B&&!q){if(window[B])B=n.guid(B);window[B]=function(E){m&&m(E);x=true};e=e.replace(D.join("="),D[0]+"="+B)}t.addEventListener("load",function(){q&&m&&m();x&&delete window[B];s.removeChild(t)},false);t.src=e;s.insertBefore(t,s.firstChild)};n.getJSONP=n.xhr.getJSONP;n.getScript=n.xhr.getScript=function(e,m){return n.xhr.getJSONP(e,m,true)};n.util={toSeconds:function(e,m){var q=/^([0-9]+:){0,2}[0-9]+([.;][0-9]+)?$/,s,t,u;if(typeof e==="number")return e; -typeof e==="string"&&!q.test(e)&&n.error("Invalid time format");q=e.split(":");s=q.length-1;t=q[s];if(t.indexOf(";")>-1){t=t.split(";");u=0;if(m&&typeof m==="number")u=parseFloat(t[1],10)/m;q[s]=parseInt(t[0],10)+u}s=q[0];return{1:parseFloat(s,10),2:parseInt(s,10)*60+parseFloat(q[1],10),3:parseInt(s,10)*3600+parseInt(q[1],10)*60+parseFloat(q[2],10)}[q.length||1]}};n.p.cue=n.p.exec;n.protect={natives:function(e){return Object.keys?Object.keys(e):function(m){var q,s=[];for(q in m)p.call(m,q)&&s.push(q); -return s}(e)}(n.p).map(function(e){return e.toLowerCase()})};n.forEach({listen:"on",unlisten:"off",trigger:"emit",exec:"cue"},function(e,m){var q=n.p[m];n.p[m]=function(){if(typeof console!=="undefined"&&console.warn){console.warn("Deprecated method '"+m+"', "+(e==null?"do not use.":"use '"+e+"' instead."));n.p[m]=q}return n.p[e].apply(this,[].slice.call(arguments))}});g.Popcorn=n}else{g.Popcorn={isSupported:false};for(a="removeInstance addInstance getInstanceById removeInstanceById forEach extend effects error guid sizeOf isArray nop position disable enable destroyaddTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId timeUpdate plugin removePlugin compose effect xhr getJSONP getScript".split(/\s+/);a.length;)g.Popcorn[a.shift()]= -function(){}}})(window,window.document);(function(g,b){var d=g.document,a=g.location,c=/:\/\//,f=a.href.replace(a.href.split("/").slice(-1)[0],""),h=function(o,l,i){o=o||0;l=(l||o||0)+1;i=i||1;l=Math.ceil((l-o)/i)||0;var r=0,k=[];for(k.length=l;r<l;){k[r++]=o;o+=i}return k};b.sequence=function(o,l){return new b.sequence.init(o,l)};b.sequence.init=function(o,l){this.parent=d.getElementById(o);this.seqId=b.guid("__sequenced");this.queue=[];this.playlist=[];this.inOuts={ofVideos:[],ofClips:[]};this.dims={width:0,height:0};this.active=0;this.playing= -this.cycling=false;this.times={last:0};this.events={};var i=this,r=0;b.forEach(l,function(k,j){var v=d.createElement("video");v.preload="auto";v.controls=true;v.style.display=j&&"none"||"";v.id=i.seqId+"-"+j;i.queue.push(v);var w=k["in"],n=k.out;i.inOuts.ofVideos.push({"in":w!==undefined&&w||1,out:n!==undefined&&n||0});i.inOuts.ofVideos[j].out=i.inOuts.ofVideos[j].out||i.inOuts.ofVideos[j]["in"]+2;v.src=!c.test(k.src)?f+k.src:k.src;v.setAttribute("data-sequence-owner",o);v.setAttribute("data-sequence-guid", -i.seqId);v.setAttribute("data-sequence-id",j);v.setAttribute("data-sequence-clip",[i.inOuts.ofVideos[j]["in"],i.inOuts.ofVideos[j].out].join(":"));i.parent.appendChild(v);i.playlist.push(b("#"+v.id))});i.inOuts.ofVideos.forEach(function(k){k={"in":r,out:r+(k.out-k["in"])};i.inOuts.ofClips.push(k);r=k.out+1});b.forEach(this.queue,function(k,j){function v(){if(!j){i.dims.width=k.videoWidth;i.dims.height=k.videoHeight}k.currentTime=i.inOuts.ofVideos[j]["in"]-0.5;k.removeEventListener("canplaythrough", -v,false);return true}k.addEventListener("canplaythrough",v,false);k.addEventListener("play",function(){i.playing=true},false);k.addEventListener("pause",function(){i.playing=false},false);k.addEventListener("timeupdate",function(w){w=w.srcElement||w.target;w=+(w.dataset&&w.dataset.sequenceId||w.getAttribute("data-sequence-id"));var n=Math.floor(k.currentTime);if(i.times.last!==n&&w===i.active){i.times.last=n;n===i.inOuts.ofVideos[w].out&&b.sequence.cycle.call(i,w)}},false)});return this};b.sequence.init.prototype= -b.sequence.prototype;b.sequence.cycle=function(o){this.queue||b.error("Popcorn.sequence.cycle is not a public method");var l=this.queue,i=this.inOuts.ofVideos,r=l[o],k=0,j;if(l[o+1])k=o+1;if(l[o+1]){l=l[k];i=i[k];b.extend(l,{width:this.dims.width,height:this.dims.height});j=this.playlist[k];r.pause();this.active=k;this.times.last=i["in"]-1;j.currentTime(i["in"]);j[k?"play":"pause"]();this.trigger("cycle",{position:{previous:o,current:k}});if(k){r.style.display="none";l.style.display=""}this.cycling= -false}else this.playlist[o].pause();return this};var p=["timeupdate","play","pause"];b.extend(b.sequence.prototype,{eq:function(o){return this.playlist[o]},remove:function(){this.parent.innerHTML=null},clip:function(o){return this.inOuts.ofVideos[o]},duration:function(){for(var o=0,l=this.inOuts.ofClips,i=0;i<l.length;i++)o+=l[i].out-l[i]["in"]+1;return o-1},play:function(){this.playlist[this.active].play();return this},exec:function(o,l){var i=this.active;this.inOuts.ofClips.forEach(function(r,k){if(o>= -r["in"]&&o<=r.out)i=k});o+=this.inOuts.ofVideos[i]["in"]-this.inOuts.ofClips[i]["in"];b.addTrackEvent(this.playlist[i],{start:o-1,end:o,_running:false,_natives:{start:l||b.nop,end:b.nop,type:"exec"}});return this},listen:function(o,l){var i=this,r=this.playlist,k=r.length,j=0;if(!l)l=b.nop;if(b.Events.Natives.indexOf(o)>-1)b.forEach(r,function(v){v.listen(o,function(w){w.active=i;if(p.indexOf(o)>-1)l.call(v,w);else++j===k&&l.call(v,w)})});else{this.events[o]||(this.events[o]={});r=l.name||b.guid("__"+ -o);this.events[o][r]=l}return this},unlisten:function(){},trigger:function(o,l){var i=this;if(!(b.Events.Natives.indexOf(o)>-1)){this.events[o]&&b.forEach(this.events[o],function(r){r.call(i,{type:o},l)});return this}}});b.forEach(b.manifest,function(o,l){b.sequence.prototype[l]=function(i){var r={},k=[],j,v,w,n,y;for(j=0;j<this.inOuts.ofClips.length;j++){k=this.inOuts.ofClips[j];v=h(k["in"],k.out);w=v.indexOf(i.start);n=v.indexOf(i.end);if(w>-1)r[j]=b.extend({},k,{start:v[w],clipIdx:w});if(n>-1)r[j]= -b.extend({},k,{end:v[n],clipIdx:n})}j=Object.keys(r).map(function(e){return+e});k=h(j[0],j[1]);for(j=0;j<k.length;j++){w={};n=k[j];var C=r[n];if(C){y=this.inOuts.ofVideos[n];v=C.clipIdx;y=h(y["in"],y.out);if(C.start){w.start=y[v];w.end=y[y.length-1]}if(C.end){w.start=y[0];w.end=y[v]}}else{w.start=this.inOuts.ofVideos[n]["in"];w.end=this.inOuts.ofVideos[n].out}this.playlist[n][l](b.extend({},i,w))}return this}})})(this,Popcorn);(function(g){document.addEventListener("DOMContentLoaded",function(){var b=document.querySelectorAll("[data-timeline-sources]");g.forEach(b,function(d,a){var c=b[a],f,h,p;if(!c.id)c.id=g.guid("__popcorn");if(c.nodeType&&c.nodeType===1){p=g("#"+c.id);f=(c.getAttribute("data-timeline-sources")||"").split(",");f[0]&&g.forEach(f,function(o){h=o.split("!");if(h.length===1){h=o.match(/(.*)[\/\\]([^\/\\]+\.\w+)$/)[2].split(".");h[0]="parse"+h[1].toUpperCase();h[1]=o}f[0]&&p[h[0]]&&p[h[0]](h[1])});p.autoplay&& -p.play()}})},false)})(Popcorn);(function(g,b){function d(f){f=typeof f==="string"?f:[f.language,f.region].join("-");var h=f.split("-");return{iso6391:f,language:h[0]||"",region:h[1]||""}}var a=g.navigator,c=d(a.userLanguage||a.language);b.locale={get:function(){return c},set:function(f){c=d(f);b.locale.broadcast();return c},broadcast:function(f){var h=b.instances,p=h.length,o=0,l;for(f=f||"locale:changed";o<p;o++){l=h[o];f in l.data.events&&l.trigger(f)}}}})(this,this.Popcorn);(function(g){var b=Object.prototype.hasOwnProperty;g.parsers={};g.parser=function(d,a,c){if(g.protect.natives.indexOf(d.toLowerCase())>=0)g.error("'"+d+"' is a protected function name");else{if(typeof a==="function"&&!c){c=a;a=""}if(!(typeof c!=="function"||typeof a!=="string")){var f={};f[d]=function(h,p){if(!h)return this;var o=this;g.xhr({url:h,dataType:a,success:function(l){var i,r,k=0;l=c(l).data||[];if(i=l.length){for(;k<i;k++){r=l[k];for(var j in r)b.call(r,j)&&o[j]&&o[j](r[j])}p&&p()}}}); -return this};g.extend(g.p,f);return f}}}})(Popcorn);(function(g){var b=function(a,c){a=a||g.nop;c=c||g.nop;return function(){a.apply(this,arguments);c.apply(this,arguments)}},d=/^(#([\w\-\_\.]+))$/;g.player=function(a,c){if(!g[a]){c=c||{};var f=function(h,p,o){o=o||{};var l=new Date/1E3,i=l,r=0,k=0,j=1,v=false,w={},n=document.getElementById(d.exec(h)&&d.exec(h)[2])||document.getElementById(h)||h,y={};Object.prototype.__defineGetter__||(y=n||document.createElement("div"));for(var C in n)if(!(C in y))if(typeof n[C]==="object")y[C]=n[C];else if(typeof n[C]=== -"function")y[C]=function(m){return"length"in n[m]&&!n[m].call?n[m]:function(){return n[m].apply(n,arguments)}}(C);else g.player.defineProperty(y,C,{get:function(m){return function(){return n[m]}}(C),set:g.nop,configurable:true});var e=function(){l=new Date/1E3;if(!y.paused){y.currentTime+=l-i;y.dispatchEvent("timeupdate");setTimeout(e,10)}i=l};y.play=function(){this.paused=false;if(y.readyState>=4){i=new Date/1E3;y.dispatchEvent("play");e()}};y.pause=function(){this.paused=true;y.dispatchEvent("pause")}; -g.player.defineProperty(y,"currentTime",{get:function(){return r},set:function(m){r=+m;y.dispatchEvent("timeupdate");return r},configurable:true});g.player.defineProperty(y,"volume",{get:function(){return j},set:function(m){j=+m;y.dispatchEvent("volumechange");return j},configurable:true});g.player.defineProperty(y,"muted",{get:function(){return v},set:function(m){v=+m;y.dispatchEvent("volumechange");return v},configurable:true});g.player.defineProperty(y,"readyState",{get:function(){return k},set:function(m){return k= -m},configurable:true});y.addEventListener=function(m,q){w[m]||(w[m]=[]);w[m].push(q);return q};y.removeEventListener=function(m,q){var s,t=w[m];if(t){for(s=w[m].length-1;s>=0;s--)q===t[s]&&t.splice(s,1);return q}};y.dispatchEvent=function(m){var q,s=m.type;if(!s){s=m;if(m=g.events.getInterface(s)){q=document.createEvent(m);q.initEvent(s,true,true,window,1)}}if(w[s])for(m=w[s].length-1;m>=0;m--)w[s][m].call(this,q,this)};y.src=p||"";y.duration=0;y.paused=true;y.ended=0;o&&o.events&&g.forEach(o.events, -function(m,q){y.addEventListener(q,m,false)});if(c._canPlayType(n.nodeName,p)!==false)if(c._setup)c._setup.call(y,o);else{y.readyState=4;y.dispatchEvent("loadedmetadata");y.dispatchEvent("loadeddata");y.dispatchEvent("canplaythrough")}else y.dispatchEvent("error");y.addEventListener("loadedmetadata",function(){y.currentTime=r;y.volume=j;y.muted=v});y.addEventListener("loadeddata",function(){!y.paused&&y.play()});h=new g.p.init(y,o);if(c._teardown)h.destroy=b(h.destroy,function(){c._teardown.call(y, -o)});return h};f.canPlayType=c._canPlayType=c._canPlayType||g.nop;g[a]=g.player.registry[a]=f}};g.player.registry={};g.player.defineProperty=Object.defineProperty||function(a,c,f){a.__defineGetter__(c,f.get||g.nop);a.__defineSetter__(c,f.set||g.nop)};g.smart=function(a,c,f){var h=d.exec(a);h=h&&h.length&&h[2]?document.getElementById(h[2]):a;if(h.nodeType==="VIDEO"&&!c){if(typeof c==="object")f=c;return g(h,f)}for(var p in g.player.registry)if(g.player.registry.hasOwnProperty(p))if(g.player.registry[p].canPlayType(h.nodeName, -c))return g[p](a,c,f);if(h.nodeType!=="VIDEO"){a=document.createElement("video");h.appendChild(a);h=a}f&&f.events&&f.events.error&&h.addEventListener("error",f.events.error,false);h.src=c;return g(h,f)}})(Popcorn);(function(g){var b=function(d,a){var c=0,f=0,h;g.forEach(a.classes,function(p,o){h=[];if(p==="parent")h[0]=document.querySelectorAll("#"+a.target)[0].parentNode;else h=document.querySelectorAll("#"+a.target+" "+p);c=0;for(f=h.length;c<f;c++)h[c].classList.toggle(o)})};g.compose("applyclass",{manifest:{about:{name:"Popcorn applyclass Effect",version:"0.1",author:"@scottdowne",website:"scottdowne.wordpress.com"},options:{}},_setup:function(d){d.classes={};d.applyclass=d.applyclass||"";for(var a=d.applyclass.replace(/\s/g, -"").split(","),c=[],f=0,h=a.length;f<h;f++){c=a[f].split(":");if(c[0])d.classes[c[0]]=c[1]||""}},start:b,end:b})})(Popcorn);(function(g){g.plugin("attribution",function(){var b={"cc-by":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAYAAABjyArgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAEZ0FNQQAAsY58+1GTAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAeeSURBVHja7JpfbNvGHce/R9JBU9Qa89QN2gD5TepLmGTJYyyte9mypiSC7aXrIj8NqDFI6lavLezISpwuE5LJwpACw7aaWJ8L0/kD7B8iyi2wRXYiGikgvUkPNbY+ybXbh5l/bg8kT6RlO7Zjq2maM0488e4o8sPv/e53vzOhlEYIIZ/hadr3RCklBAAFgNt/vwWO48BxHHieB8fx4DkOHO8dOQ6EcOAIASEEIMS/CigoqEPhUAeO42bbtt2jY8O2HTiOzeoc6rD2lFL/Zlj5SUg/fvknAAACgPpweZ53M8d3yzzv1nG8B5mAEC7I14PjgXVcmLbt5WDZDkN2HIeBDYJ+kiALAMJweQFC6Ojmm3O3UKlUUKvVsLa6FrrQYGQQp06dQup7Kbx09kewHR4cZ7kvxOZAQLx3GRg+DnVHArwxRPYH7v2FOrQPNDQajdD5RCIB+ZyM4yeP9RUyAUD/duevEASBQRUEwc28gKo+j+KVIpaXl3d0wWg0irG3xjA8fBqWbcO2LViWl20LlmUzhW+m5L2q+L//+RTXy9fRbDQBAMlkEpIkAQAMw4Cu6wCAeCKO0cwovvmt5/uiYAKA/rP6Dwi80AUrDGBAEJCfmIQ2q7EOoihClmXEYjEMDw8DAKrVKtrtNjRNw8rKCmsrKzJ+NfZLHH72MCzLgmlZsCwTlmWFTYYP2PFs+R5s8eernyMzmsXq6ipkWUapVEIsFgu1abfbyOVy0DQNkUgEl4uXDxwyA3znwzsY8MEOCBgQBkJwRVFENptFJpOBKIpbXlBVVeRyOQY6nojjT+/9Ec8cPgzLMmGaJlPyppDp3gBPvHkBzUYT6XQaMzMz3eHpmaDg9VRVxcjICOKJOC5duXjggDkA4D0bLPA8BD6sXEmSUK/Xkc/nt4ULAOl0Gq1Wiw3NZqOJq8VrIVvOMY+EdLP3txHMTm1us9GELMsYe+ONh7ZPp9OQZRnNRhP3F+oHbiY4AOB8t4znUdXnQ3ArlUrPcNsuiaKISqXCIGuzGqrVefC8sDlkznf7EIK806R94N5rqVRC4oUXNvqhm46GUqkU6nvggF0FuyouXikyUDMzMw9V7XaQ/b7F3xQ9X9qDSzyfmvM8DIIuZLI7yI1GA8lkskcEIyMjbISMjIyE6mKxGJLJZI+ncXAK9h7+5twt5i1ks1mmwr0kURSZUpaXl3Hzxi22YHEhb20idps2u09VVTctb9fnwAD7aqpUKgxOJpNhjXRdh6IoSKVSSKVSKBQKW9ZNT0+H7J2v4sqdSkC9XdNAyKOZiMc9uQsNQsARglqt5rpYsszA6LqOVCoV6qTrOnRdRyaTgaIoPXVLS0tsNpdlGaqqolaruSvAAFigC7frle/+IQzD2HQy85WbTqd31OcAFew+qL9CO3r0KGuQy+WY3Wq1WmzSO3/+PFOyJElotVqYnZ0N+cgAWHltda1rDtjR57p3E5FIJKDrOtrtduh80F0Lln2fWNd1JBKJ/ih44+QStE/+m06n04jFYgy0P5H4KvXrZFnumVC67hf72LcHkM/JaEw1kMvlMDs7u6M+vmjkc3J/FPxVTsdPHkM8EYemaT3ewlZwNU1DPBHvS1yC84MtQX8xaJ98NauqipWVFRiGgaGhIRQKha6v6y2Tg3XB4dj1S9nHvj7Er98eQyQSgaqqUBSF/WbQD26321AUBdPT04hEIhjNjPZvkvNvZDAyiLXVNSwtLbEG+Xye3fSRI0dC4Pw6wzB66vzkX2swMghKA8thUPjv1Pu254d4LvIcyten8dt3itA0DZqmQZIkSJIEURSh6zoTTT+DPWzevnvvLg4dOoTChQK0WQ2iKKLT6YQ8g3K5zGIMyWQS+XyeqbdcLrO2wToAGBoaQrvdxovffxHXSlfxv/V1mOY6TMuEaVqw/biEY8OxHRaE32vo8nEKV7Jgz78X/4WBgUP4aP4jZH6RYcvJbDb7SD/gB1YAYOqdKfzwzA+wbq5j3TRhmSZMawPgRwj4PK4Bdw4A29JJpoYRjUYBAIVCocf12U1aWVlhs3U0GvUC8X5o0oHj2WLfXDypiQMAhzqwbXcf7dLliwyQoiihGO9u4KZSKdZ37M0xL8BudyEHQpRskqVP1pYRm9wB0PH8OF24X6PGgzp99Wev+lM9lSSJ1ut1utPUarWoJEmsv6zI1HhQpwv3a/Ti5Yvs/Ncod79kX8/QxfoCNT42qKzI7LwoinRycpJ2Op0twXY6HTo5OUlFUWT9Tp46SZc+NuiisUDH8+NfR7i0Z/U/kR/Hy4oMQRBwrXgN7//l/T1vGRUuTcKyLNy9W8NrP3/t4IdiwLwEdzOCq9SN3/tmIoJ5Ij/uKvlBnb6n/plGo9Edv7FoNErLvy9T40GdLhoL9N0/vNs3tVBKty0Hz31pCvZT9vUMXvnpK2wXQq9UcWPuxrbb9mfls0gmh9le29zcDUwVpvqnlE0U/GUq96EBwuMnjmEifwHf/k40sBsRDDci5Lf6/3iy/Mkn+N3VEuar8/0digGIj4Np2HEE9vTwaZx56QxOfPcEvhGJhGO4nmv12eoq7i3ew+2bt/sO9iur4KdpHwBTSp8lhHzxFMWBjCjy/wEATHqgDqiBjQoAAAAASUVORK5CYII=", -"cc-by-sa":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAYAAABjyArgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAEZ0FNQQAAsY58+1GTAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAj2SURBVHja7FpLbBvHGf72IaMyInZ9SgKqiHQTdfH6eUossmlTuI7tZS27dtzUpA8NGqMgldpy2kiiKFupo9qh2MIx2iYS4/QaaP0CGqcwV2qAWpRtUnAA6kYGkFDnJIVKAVvc3elhd4e7FPWgHkHj+BeGOzuPf3e/+eaff/4RQwhxMQzzFZ7ImgshhGEAEAC4cfM6WJYFy7LgOA4sy4FjWbCceWVZMAwLlmHAMAzAMJYWEBAQnUAnOnTdSJqmGVddg6bp0HWN1ulEp+0JIdbL0PzjIAf3HwIAMACIBS7HcUZiuVKe44w6ljNBZsAwrB1fExwTWN0AU9PMZM9rTpB1XafA2oF+nEDmATjB5XjwjquRrl25jmQyiVQqhdnCrENRnasOO3fuhO+HPuzd9zI0nQPLqsaAaCwYMOZY2qaPToyZAHMOMYuDe28sDfljGdls1lHu8XggHZCwdceWVYGxXvoZAOSTW/8Az/MUVJ7njcTxGFZG0HeuD1NTU8tS6Ha70f67drS07IKqadA0FapqJk2FqmqU4ZWYXM7iB//5EhfjFzGRnQAAeL1eiKIIAMhkMlAUBQDQ5GnCidAJPPPs01UBsJ76D+4/ZAD8z+FPwXN8CVi+BjU8j0hnN+QhmXYQBAGSJKGhoQEtLS0AgOHhYeTzeciyjJmZGdpW8ks42f5b1G6shaqqKKoqVLUIVVWdJsMCWDdtuQ3orwtfI3QijEKhAEmSEIvF0NDQ4PiIfD6PtrY2yLIMl8uF3r7eZYOw3vopwLf+dQs1FrA1PGr4Gge4giAgHA4jFApBEIQFFSYSCbS1tVGgmzxNeH/gb/hebS1UtYhisUiZXBHkMnvc+WYXJrITCAQCGBwcLE0707TYmZ5IJBAMBtHkacKZcz3LAqCS/snJSUxNThqzsb4e9fX1K9Z/cP8hsADAmTaY5zjwnJO5oiginU4jEoksCi4ABAIB5HI5OsUmshM433fBYctZ6pEwpWT+2QG8N5bGRHYCkiSh/dSpJT8mEAhAkiRMZCdwbyy9LJtbrv/vly/D+/wLOHr4CI4ePgLv8y/g05s3V6TfEhYAWMst4zgMKyMOcJPJ5Lxps5gIgoBkMklBlodkDA+PgOP4yiCzltsHB8jyx8Y7xGIxeJqby/3LigtiLBZz9F1MyvWP3r6N7q4I6p95Fl6vDwdaWwEAv/7Va/hTf3/V+h0AGww2WNx3ro8CNTg4uCRrFwPZ6tv3hz7TlzbBZUyfmjU9DAYlkM3pn81m4fV65w1uMBikzA8Gg466hoYGeL3eeZ5AJbHrLxQKyKbvAwD2Sz/D+4kBvHP+j3irq9MwDwODVet3Mtj8+GtXrlNvIRwOUxauRARBoCM+NTWFa1ev0w2LAfLCJsKSSs9PJBIV84v1WUjsbXvfNYj11w8/oGU/fuklAEChUMCXDx5UrZ8CbLEpmUxScEKhEG2kKAr8fj98Ph98Ph+i0eiCdf3mdLLslsXi5K2kjb0l08AwlU3ENykulwvxeBwbXXW4dOlSxTYPHz5akW5jo8EwYBkGqVTKcLEkiQKjKAp8Pp+jk6IoUBQFoVAIfr9/Xt34+DhdlSVJQiKRQCqVMnaANmCBErglr7ykK5PJVFzMLOYGAoF59ZX6LCT2tjU8j/aTJ7GxtpaWjd6+TfPPNTxXtX4bg40PtXZomzdvpg3a2tqo/cnlcnTRO3bsGGWyKIrI5XIYGhpy+MgAaH62MFsyB/Rq4TrfRHg8HiiKgnw+7yi3u2v2vOWzKooCj8ez5IeX65+cnER3VwSv/PwwenvOoLfnDLo6OgAAp06frlq/A2D74lJuZ6wRCwQC1MjncjkEAgFaZ20+JEmidfaFp+R+0Z8lX0w6IDkGeDlitbX6VqM/ePw4gsePGwM3MIDBgQE8evgIe/a+jCNHX6lav8NE/D/K1h1b0ORpgizLCAaD89haCVxZltHkaVpW3KCS/re6OvGT3bvxxRcGq5ubm6mLWK1+J4OJc1dktzMWmxOJBGZmZpDJZNDY2IhoNFrydc1tsr3OPm1L/iv9WdbLnf59O1wuFxKJBPx+P9Vl94Pz+Tz8fj/6+/vhcrlwInRi2R9fSf/2HdtxoLUVB1pb4WluXpV+ymDrhetcdZgtzGJ8fJw2iEQi9OGbNm1yAGfVZTKZeXWWWLrqXHUgxLYdBoE1pubdvJd7yvUU4hf78c7bfZBlGbIsQxRFiKIIQRCgKAolw0qCMeutn67bo3dHsWHDBkS7opCHZAiCgOnpaYdnEI/HaYzB6/UiEolQ9sbjcdrWXgcAjY2NyOfzePFHL+JC7Dwezc2hWJxDUS2iWFShWXEJXYOu6TQIX75T+zaGK2mw5/adf6OmZgM+G/kMod+E6LYwHA6v6qWtAAkAnH37LH66ZzfminOYKxahFosoqmUAVwj4fNsD7iwAeqTj9bXA7XYDAKLR6DwXqRqZmZmhq67b7TYD8VZoUodu2mLLXDyuwgKATnRomnGOdqa3hwLk9/sdMd5qwPX5fLRv+5vtZoBdK4FsC1HSRZY8XkdGdHEHQDoiHWTsXopk7qfJq7981VrqiSiKJJ1Ok+VKLpcjoijS/pJfIpn7aTJ2L0V6ento+XcolW7Cb4TInfQYyXyeIZJfouWCIJDu7m4yPT29ILDT09Oku7ubCIJA++3YuYOMf54hdzJjpCPS8V0ElzDlTmlnpAP7/RJ4nseFvgv46PJHKz4yip7phqqqGB1N4fXXXl/5FLOZDftphn33WX6/Vs+w36/KRNhTZ6TDYPL9NBlIfEDcbveyR8ztdpP4n+Mkcz9N7mTGyHt/eW/VLCCELJq3l61W/1LPXDWDLQm/EcLRXxylpxBKchhXr1xd9Nh+n7QPXm8LPWu7cuUqzkbPrn6RqMCutWJu+TMqnfethsXMYvvWrdu2oDPShfofuG2nEfZwIxx+q/WPJ1OTk3j3fAwjwyNrswrbQFxr07DQsxZ75poBbMmull3Ys3cPtm3fhu+7XM4YrulafVUo4O6du7hx7caaAftNMXgpG7/uAD+RlQtDCNnIMMx/n0CxDhsMQpj/DQDwRbusfJXB0QAAAABJRU5ErkJggg==", -"cc-by-nd":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAYAAABjyArgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAEZ0FNQQAAsY58+1GTAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAgrSURBVHja7FpNbBvHFf72R0YdROz6lBZsAQrogczFtB37aFF1AqR1bC1h2Jc0NXUqEKEgmTZqWkimaMupS9ilicJJA7fRojkHWvkH6B/MpRqgNSWLKzgAeSjAPURoe5IipYeKuzs97O5wl1xSFCWljeNnjHa5M/Ptzjdv3nvzxgwhJMAwzKd4KnsuhBCGAUAA4P4f74FlWbAsC47jwLIcOJYFy9lXlgXDsGAZBgzDAAzjoICAgJgEJjFhmlYxDMO6mgYMw4RpGrTOJCZtTwhxPobePwlyfvQCAIABQBxyOY6zCss17znOqmM5m2QGDMO6+bXJsYk1LTINwy7ue8NLsmmalFg30U8SyTwAL7kcD95ztcrd+XsoFosol8vY3Nj0AA0GBnHixAmMfHsEZ86+AsPkwLK6NSEGCwaMPZeu5WMSayXAXkNMd3KXFyuQP5RRrVY9zyORCMRzIo4eP7IrMvYLnwFA/vDg9+B5npLK87xVOB4lZQG5azmsrq72BBgMBjHx0wkMD5+EbhgwDB26bhdDh64bVMP9NLlVi//5j3/hVuEWatUaACAWiyEajQIAVFWFoigAgHAkjPHkOL729ed2RMB+4p8fvWAR/OfSn8BzfJNYfgADPI/M1DTkOZl2EAQBoigiFApheHgYAFAqlaBpGmRZxvr6Om0rxkX8eOJHOPjMQei6joauQ9cb0HXdazIcgk3blruI/mzjMyTHU9jY2IAoisjn8wiFQp5BaJqGdDoNWZYRCARwNXe1ZxL2G58S/OAvDzDgEDvAY4Af8JArCAJSqRSSySQEQegIKEkS0uk0JTocCeM379/GVw4ehK430Gg0qCb7ktxij6feuoRatYZEIoHZ2dnmsrNNi1vTJUnC2NgYwpEwrly73BMBnfA7jW2n+OdHL4AFAM62wTzHgee8mhuNRlGpVJDJZLqSCwCJRAL1ep0usVq1huu5Gx5bztKIhGkW+5+bwOXFCmrVGkRRxMSbb247mEQiAVEUUavWsLxY6cnm7ie+IywAsE5YxnEoKQsecovFYtuy6SaCIKBYLFKS5TkZpdICOI73J5l1wj54SJY/tL4hn88j8vzzrfGlr0PM5/Oevt2kG34n2Qm+h2BLgy0tzl3LUaJmZ2e31dpuJDt9cz/P2bG0TS5jx9SsHWEwaJJsL/9qtYpYLNY2uWNjY1Tzx8bGPHWhUAixWKwtEvATP/xvhYZ8Sz/4Xg22B393/h6NFlKpFNXCfkQQBDrjq6uruHvnHt2wWCR3NhGO+L1fkiTf+259Oklr25deftm39IsPwIqDHW0qFouUnGQySRspioJCoUCdVywWQyaT8a0bHR1FKpWidstxesUHRbxy5rStvbZpMJskOyaC4H+30Xj31+/uOaa10WAYsAyDcrlshViiSJe3oigYGRnxdFIUBYqiIJlMIh6Pt9WtrKxQryyKIiRJQrlctnaArItUNMltRuVNLFVVfZ2No7mJRKKt3q9PJ2lt6zYHbvm7Vu8Ln5oIZ8DODu3w4cO0QTqdpvanXq9Tp3fx4kVks1m6bOr1Oubm5jwxMgB6v7mx2TQH9Orw2m4iIpEIFEWBpmme5+5wqjW00jQNiqIgEolsO3A//FMvvehb+sH3aLDbubTaGWfGEokEQqEQJdpxOI6WOnWiKLY5nmb4Rf9s+2HiORHVmSrS6TTm5uZ6GoyjDOI5sS/8927f3jN8jwb/P8rR40cQjoQhy3JbtNBp8LIsIxwJ95Q32G98L8HEuyty2xlHmyVJwvr6OlRVxdDQELLZbDPWtbfJ7jr3smrGr/RPTx/3k59NIBAIQJIkxONxiuWOgzVNQzwex82bNxEIBDCeHO958J3wW81Ov/jURDgfPBgYxObGJlZWVmiDTCZDX37o0CHPi506VVXb6hxxsAYDgyDEtR0GgTOn9q+2j3s28CwKt27iF2/nIMsyZFlGNBpFNBqFIAhQFIUqQz/JmP3Gp3774aOHOHDgALKXspDnZAiCgLW1tZ7CNFmWUSgUaFt3HQAMDQ1B0zScevEUbuSv4z9bW2g0ttDQG2g0dBhOXsI0YBomTcK37tS+iOlKmuz529JfMTBwAB8tfITkD5N0W+jEs/2KkyABgJm3Z/Dd09/BVmMLW40G9EYDDb2FYJ+Ezxc94c4CoEc6sZFhBINBAEA2m/W1Sb3K+vo69brBYNBOxDupSROmbYsdc/GkCgsAJjFhGNY52pWrlylB8Xjck+PdCbkjIyO078RbE3aC3WiS7EpRUidLnqwjI+rcAZDJzCRZXC4T9XGFvPb91xxXT6LRKKlUKqRXqdfrJBqN0v5iXCTq4wpZXC6Ty1cv0+dfotL8kXojSZYqi0T9WCViXKTPBUEg09PTZG1trSOxa2trZHp6mgiCQPsdP3GcrHyskiV1kUxmJr+M5BKmNSidykxiNC6C53ncyN3AB7/7oO8jo+yVaei6jocPy3j9B6/3v8RcZsN9muHefbb+3im+H5bfe/s2Ee4ylZm0NPlxhbwv/ZYEg8GeZywYDJLCrwpEfVwhS+oieee9d3atBYSQrvfuZ/3ib4fb7zuYTtuq1BtJvPq9V+kphFIs4c78na7H9mfFs4jFhulZ2/z8HcxkZ3bvJLpo0m40109j/a67eQ/Tbd969NgRTGUu4RvfDLpOI9zpRnjiVuc/nqx+8gl+eT2PhdLC3njhLgPdS4Ldk/m5EOzIyeGTOH3mNI69cAxfDQS8OVw7tPp0YwOPlh7h/t37e0bs563B+2GDeyL4qfQvDCHkGYZh/v2Uin3YYBDC/HcArOiX8zGX6zMAAAAASUVORK5CYII=", -"cc-by-nc":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAYAAABjyArgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAEZ0FNQQAAsY58+1GTAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAk0SURBVHja7FpdbNvWFf5IysFS1BrztA1yMBt7sQqskZMmy4Ytlta9LJ4TCnaCFkkWuQ812mCTlB+3S+3Iyk8TK/Zkb0iBYVstrCjahwZm/oDNGSLaKzBbTiIZaSM9rJCK2FiHDbArpwVmkbx7EHlF2pIty3axpjnGFX/uvR/J75577jnnmiGEWBmG+RSPZc2FEMIwAAgA3Bi+DpZlwbIsOI4Dy3LgWBYspx1ZFgzDgmUYMAwDMIyOAgICohKoRIWq5ouiKPmjqkBRVKiqQutUotL2hBD9Zej5oyD79u4HADAAiE4ux3H5wnKFc47L17GcRjIDhmGN/GrkaMSqeTIVRSvGc8VMsqqqlFgj0Y8SyRYAZnI5CyymY75cu3Id0WgUsVgMc9k5E1C1tRo7duyA68cuNO/5GRSVA8vK+QFRWDBgtLE0TB+V5GcCtDnELE3u3Yk4xMsiksmk6b7dbofQImDr9oZVkbFe+AwA8pdbf4bFYqGkWiyWfOEsGJFGEboQwvT0dFmANpsNHb/qQGPjLsiKAkWRIctaUWTIskI1vJgmL9TiT/75L1wauIRUMgUAcDqdcDgcAIBEIgFJkgAA9fZ6HPEewTe/9Y0VEbCe+Pv27s8T/NeRm7BwlgKxlipUWSwIdHVDHBJpB57nIQgCamtr0djYCAAYGRlBJpOBKIqYnZ2lbQW3gOMdx7DxiY2QZRk5WYYs5yDLstlk6ASrmi03EP0w+xDeIz5ks1kIgoBwOIza2lrTR2QyGfj9foiiCKvVinOhc2WTsN74lOBbf7uFKp3YKguqLFUmcnmeh8/ng9frBc/zJQEjkQj8fj8lut5ejz+8+Xt8beNGyHIOuVyOanJRkhfY465XTyGVTMHj8WBwcLAw7TTTYtT0SCSCtrY21NvrcebC6bIIKIX/m/5+jI+N4+1331kV/r69+8ECAKfZYAvHwcKZNdfhcCAejyMQCCxJLgB4PB6k02k6xVLJFHpDfSZbzlKPhCkU7c9I4N2JOFLJFARBQMeJE8t+jMfjgSAISCVTuDsRL8vmppIpbG1owA92ft9E7oVQCNdu3MArx09gamqqInxdWABgdbeM4zAijZrIjUaji6bNUsLzPKLRKCVZHBIxMjIKjrMUJ5nV3T6YSBYv598hHA7D/tRTC/3LogtiOBw29V1K9DafP/wMPefPw/nDH+GlF9vh9fvR3t6OkydPItTXi/GxsYrwTQTnNTivxaELIUrU4ODgslq7FMl639D5kOZLa+Qymk/Nah4GgwLJ2vRPJpNwOp2LBretrY1qfltbm6mutrYWTqdzkSdQTHT85uZm7Nu/H1NTU7g5PIzvfLsWn889xMFDB3H/ww/R0tpaEb5Zg7WPv3blOvUWfD4f1cJKhOd5OuLT09O4dvU6DVjyJJc2EboUe34kEil6vlSfUuJwOBDq68X5UA/efvcdtLS24qOPMwj19WLz5s2IvDmI5P37FeNTgnVtikajlByv10sbSZIEt9sNl8sFl8uFYDBYsq6/v99kF3Utjt6KGrS3YBoYpriJ+KLlezt3oqf3Ih48eICOY8fR8N2ncfm999C8uwkHnnseN4eHK8LNBxoMA5ZhEIvF8i6WIFBiJEmCy+UydZIkCZIkwev1wu12L6qbnJykq7IgCIhEIojFYvkI0EAsUCC34JUXsBKJRNHFTNdcj8ezqL5Yn1KysG02m8XN4WH09F6E534bmnc3AQDGx8YwPjaGmpoaMFWWSjQ4/6F6hLZlyxbawO/3U/uTTqfponf48GGqyQ6HA+l0GkNDQyYfGQA9n8vOFcwBPeq8LjYRdrsdkiQhk8mY7hvdKeO57rNKkgS73b7shxfDf+nFdpw7fQZbn96CA889j48+zqCltRU9vRdx4ODBFeGbCDYuLgvtjD7KHo+HGvl0Og2Px0Pr9OBDEARaZ1wYCu4X/Vn2xYQWwTTA5YjeVu+7Uvye3otoe+EFfPKff+Mf6TQGwmG8dqoLLa2tCJ49g4btz5SNbyb4/1C2bm9Avb0eoigu8hZKkSuKIurt9WXlDYrh19TU4LVTXTjmP4rmpib80ueD1WqtCN9MMDFHRUbbpGtzJBLB7OwsEokE6urqEAwGC76uFiYb64zTtuC/0p+yXu6Vkx2wWq2IRCJwu90Uy+gHZzIZuN1u9Pf3w2q14oj3SNkfXwr/2InjNIpbDT5d5PQXrrZWYy47h8nJSdogEAjQh2/atMlEnF6XSCQW1emiY1Vbq0GIIRwGgT6m2tWil3vS+iQGLvWj5/UQRFGEKIpwOBxwOBzgeR6SJFFlqCQZs974dN0evzOODRs2IHgqCHFIBM/zmJmZMXkGAwMDNMfgdDoRCASo9g4MDNC2xjoAqKurQyaTwbM/eRZ94V78d34eudw8cnIOuZwMRc9LqApURaVJ+IWR2pcxXUmTPWO3/46qqg14f/R9eH/hpWGhz+db1UvrCRIAOPv6Wexu+inmc/OYz+Ug53LIyQsILpLw+bIn3FkAdEvH6WqEzWYDAASDwUUu0kpkdnaWrtA2m01LxOupSRWqZot1c/GoCgsAKlGhKPl9tDPnTlOC3G63Kce7EnJdLhft2/Fqh5ZgVwokG1KUdJElj9aWEV3cAZDOQCeZuBsjiXtxcujnh/SlnjgcDhKPx0m5kk6nicPhoP0Ft0AS9+Jk4m6MnD53mt7/CpXChe+ol9yOT5DEBwkiuAV6n+d50t3dTWZmZkoSOzMzQ7q7uwnP87Tf9h3byeQHCXI7MUE6A51fRXIJs9Ap7Qp0Yq9bgMViQV+oD2/96a2Kt4yCZ7ohyzLGx2N4uf3lyqeYwWwYdzOM0efC65Xil8LSn10pNoqx3hXozGvyvTh5M/JHYrPZyh4xm81GBn47QBL34uR2YoK88bs3Vq0FhJAlz433KsVfDrfSZzClwirfUS8OHDxAdyGk6AiuXrm65Lb9HmEPnM5Gutd25cpVnA2eXf0iUUSD10JzF2KUOq5GmKXi1q3bGtAVOIWazTbDboQx3QiT36r/48n01BR+3RvG6Mjo2qzCC6bsWpmG5UzCUs9dE4J12dW4C03NTdj2zDZ83Wo153A11+rTbBZ3bt/BjWs31ozYL1qD18MGl0XwY1mFiSCEPMEwzGePqViHAIMQ5n8DAFb/49reYmyHAAAAAElFTkSuQmCC", -"cc-by-nc-sa":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAYAAABjyArgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAEZ0FNQQAAsY58+1GTAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAApvSURBVHja7FptbFPXGX7utYlGJzz/2yYHYYQ2xZFWHAq0dLSx161TS9NcLylfocNmWtuVdUlKCNvIl4FAY0Id91Ob1sRrV7VaqTBfaxc6fEPQ4sRJbEaL82OVjZKoVJvm4KCpxB/vflzfE9/EThxo1Y72lY7v8T3nPPfc57znPe95z+WISMNx3FV8JZ+6EBHHASAAON19CjzPg+d5qFQq8LwKKp4Hr0pfeR4cx4PnOHAcB3CcjAICgVKEFKWQSkkpmUxK11QSyWQKqVSSlaUoxeoTkdwZlr8V5JHyjQAADgDJ5KpUKinxqum8SiWV8ao0yRw4js/kN01OmtiURGYymU6Z+aSS5FQqxYjNJPpWIlkNQEmuSg214iqlk8dPwev1YmBgAJOxSQXQEs0SrF27FuYfmFH28ENIplTg+YQ0IEkeHLj0WGZMnxRJMwHpOcRJ5A77A/C87UEoFFLUNxgMECoErFpTktfLfVFwOAD017PvQq1WM1LVarWUVGr0iOfgeMaB8fHxvDqk0+lQ/5t6lJbei0QyiWQygUQinZIJJBJJpuGZmvzR+Ed4vuMFjIRGAAAmkwlGoxEAEAwGIYoiAKDIUISd1TvxrW9/M+vzr3z0MV50vfiFwHmkfKNE8Hs9Z6BWqaeJVS/CIrUazY0t8BzzsAZarRaCIECv16O0tBQA0NPTg0gkAo/Hg4mJCVZXsAioq9+FxbctRiKRQDyRQCIRRyKRUJoMSuFq9Cp++cRTiMViEAQBTqcTer1e0dlIJILa2lp4PB5oNBq0OlpnvdS12DVU76z5wuDIdpjO9p6l3r5z1Ofvo8Ggny68HyTBIlB68pJWq6WWlhaKRqM0l3R1dZFWq2XtigxFdL6vlwaDg+Qb7KPevnPk7T1LZ8Ruevdv79Dp7lN04p3jZDAYCABZrVYFnowz8xky9lvH/6xIRYairDgup5O2btp8Uzijo6Pk6+sjX18fjY6O5oUDgHgAUKVtsFqlglql1Fyj0YhAIIDm5mZotdo5zYPVakU4HGZTaSQ0gnbHEYUt55lHInkjfp8foVAIgiCgfvfueU2Q1WqFIAgYCY1g2B9Q2MqR0AhWlZTg7rvWsfvPdXTgGYcDJ0+fxp663RgbG8sLJ7M/f3r1VZjW34OqzVtQtXkLTOvvwZnu7jlxFOtNr6+XfIM+Gr4wRK7nXUxzjEbjvFqbTaLRKBmNRobjesFFw/8Ypv4hH5339ZL3vKTF77z3FzIUS9obDofzxg+HwwSADAYD0xZ5FhR957u0YpmeSr+/np74+WMEgFpaWujQwUMEgI6+9VZeOHJ/fH19Et6d6+hn221Uv6uOVizT04plenI5nTlxsmiwpMWOZxzM3nZ1dc2rtdlEq9XC6/Wyto5DjrQvndZgLu1T8zxCl0IwmUyzbJzNZmNabrPZFGV6vR4mk0mxsodCEk5ZWRke2bgRY2NjONPdjRXL9Pjv5DVse3QbLn3wASoqK/PC0ev1iMViCAUuAgDKhZ/gD+5OtLUfxt6mRgCAu7MrJ44svOym8bzkisneQk1NDZvqNyJarRZOpxMAMD4+jpMnTrENi0Qyx9y0bM9xu91Z87Jka2M0GuE40o5Djja8/uYbqKisxIeXI3AcacfSpUvh7uxC6NKlvHBkaX1WUrjf//EVdu9H998PAIjFYvj4ypWcOIxgWZu8Xi8jp7q6mlUSRREWiwVmsxlmsxl2uz1nWUdHh8JeylrsPevN0F4OHD9N8Gchd951F9raD2N0dBT1u+pQ8r3b8fbRoyh7cAOqNm9hNnQu0Wg0cLlcuE2zBC+//HLWOp98cn1ODGmjwXHgOQ4DAwOSiyUIjBhRFGE2mxWNRFGEKIqorq6GxWKZVXbhwgV0dXUxLLfbjYGBAWkHmCZWIpdjfmW2xUzWXKvVOqs8W5uZ92KxGM50d6Ot/TCsl2woe3ADAKDf50O/z4fCwkJwi9Rz4ixSq1FfV4fbFi9m9/p9PpZfpl+Wsz8ZGiy9sLxDW7lyJatQW1vL7Ew4HIbX64Ver8f27duZJhuNRoTDYRw7dkzhIwNg+cnYpPQccBlXoLi4GKIoIhKJKDomD9DMvOyDiqIIg8Gg2FnNxPnFY4+jdd9+rLp9Jao2b8GHlyOoqKxEW/thVG3blhfO2NgYWpqasXXTZrTu24/WffvR1NAAANi9Z0/O/igIBgfFdM20J/LIWK1WZszD4TCsVisrkzcfgiCwssyFhG0bOfYz7YxvqlQMZD4i1xUqhOmNTTqfidPWfhi2HTtw5d//wj/DYbicTuxtakRFZSXsB/ajZM3qeXFsO3bAtmOHNNCdnejq7MT1T65jQ9lD2FK1NWd/FCbi85R169fBUGyAx+OBzWabpa3ZyPV4PCgyFCniAKvWlKDIUKTAKSwsxN6mRnxt8WIMDw3hVzU1N4Szt6kRP37gAVy+LGl1cXExDMXFc+IoNZiUUaxMeyJrs9vtxsTEBILBIJYvXw673c7K5G1yZlnmdJ6Oj7IfRScaWxqh0WjgdrthsVhYm8woWyQSgcViQUdHBzQaDXZW75z1Mnt+W58VZ9fuOrz+5hs3hbN6zWpUVFaiorIShuLivHBYsMc/PICCggKsv/seTMYmYbVamSZ5PJ5ZC5lsMsrLy3OWye1ra2vR0dGBJZolOP/3XkxNTWEqPoV4Io54PCEFg5IJRP8zgYP2g8yXNBqNMBqN0Gq1EEWRDfp8QZprsWtoO+hgQZrPE4cFe/qH+lFQUAB7kx2eYx5otVpEo1GFZ+ByuVgwx2Qyobm5mQ2Ay+VidTPLAGD58uWIRCK474f34YizHdenphCfQbAcN04lU/D3+3Hs6K0RrmQE+wb7sGhRAc6fO4/qpyT/1+l0oibDZt2IuN1utgs7cPAAHtzwAKbiU5iKx5GIxxFPzCA4SwD+/z3gzgNgRzomcyl0Oh0AwG63z3KdFiITExNsddXpdOlAfPoUI5VCKm2LKX3kdKsKDwApSiGZlM7R9rfuYwRZLBZFjHch5JrNZta2/tf16QB7cprkjCMjtsjSrXVkxBZ3ANTQ3ED+4QEKXgzQoz99VBFRCwQCC4p0ZUbSBItAwYsB8g8P0L7Wfez+lyhN/6l5upoGA34K3kDAPRqNUktLiyLgvmbtGrrwfpAGg35qaG74MpJL3EyntLG5AeUWAWq1GkccR/Daq6/d8JGRfX8LEokE+vsH8OTjT+bzHUHGro9j9zJ3mTP/58LJ1UZ+Rr6Bplx9WhDGzNTY3CBp8sUAdbpfIZ1Ol/eI6XQ6cj3vouDFAA0G/fTS717Ku+3MY6KZ+cx78+HM1z4frGx1FooxS4NlqXm6GlXbqthRj+jtwYnjJ+Y8tn9YeBgmUyk70Dx+/AQO2A8s5EuYWdqyEM2dWTfXdYFf52TV3lz9zLqTy1W46o4SNDY3oXCpLuM0IjPcCIXfKn94Mj42hmfbnTjXc27BL3MzpmE+kzAX/kIHLV+MOQmW5d7Se7GhbAPuWH0HvqHRpD+dmjYwRISrsRiGBodw+uTpBRP7WWnwzdrg+daET43gr+QmNhpE9PWvaPiMNhhE3P8GAG3CFDKJWtqSAAAAAElFTkSuQmCC", -"cc-by-nc-nd":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAYAAABjyArgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAEZ0FNQQAAsY58+1GTAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAm8SURBVHja7FpdcBvVFf52pXgGplH11mbkDPbQdqy8oIQmMZRiufwMxRivJiHtFChyZwqUlMoiiWlaO5JCfkBNKqvhp30oUsswMCVMlL9CHRqt4xTLkmKtE7D8UMZisIf2pZLltDO1Vnv6sNprrS1bsgNDGjgz17vW3fvt3W/PPfe75y5HRCaO46bxhX3iRkQcB4AA4HT/KfA8D57nYTAYwPMGGHgevKF05HlwHA+e48BxHMBxGgoIBFIICilQFLUUi0X1qBRRLCpQlCKrU0hh1xOR1hl2fi3YAx3bAAAcANLINRgMauENc+cGg1rHG0okc+A4vpzfEjklYhWVzGKxVMrPi3qSFUVhxJYTfS2RbASgJ9dghFF3VMvJ46cQjUYRj8cxk5/RAa02rcamTZvQ+p1WtN9/H4qKATwvqy+kyIMDV3qXZcNHIXUkoDSGOJXckUQKkTcjSKfTuuutViuELQI2bFxf08NdLTgcAPrL2bdhNBoZqUajUS0GIwbEc/A/68fU1FRNHbJYLOje3Y2WltshF4soFmXIcqkUZchykXl4uSd/PPUxjvQ9j/H0OADAbrfDZrMBACRJgiiKAIAmaxO2u7bjq2u+UvH+//j4n3gh+MJVgfNAxzaV4HcGzsBoMM4Ra1yFVUYjPL1eRI5FWAOz2QxBENDQ0ICWlhYAwMDAADKZDCKRCHK5HLtWcAjY2b0D111/HWRZRkGWIcsFyLKsDxmkYDo7jZ8+/iTy+TwEQUAgEEBDQ4Ous5lMBm63G5FIBCaTCfv9+xc81OX8Zbi2d101OFocprODZ2lw6BwNJYYoKSVo9D2JBIdApcFLZrOZvF4vZbNZWspCoRCZzWbWrsnaROeHBikpJSmWHKLBoXMUHTxLZ8R+evuvb9Hp/lN04q3jZLVaCQA5nU4dnoYz/x4a9hvH/6QrTdamijjBQIB+8L3vXzHOYs+8GA4A4gHAUIrBRoMBRoPec202G1KpFDweD8xm85Lhwel0YmJigg2l8fQ4DvkP62I5zxSJqkYSsQTS6TQEQUD3rl1VQ5DT6YQgCBhPj2MkkdLFyvH0ODasX49bm29hv/+mrw/P+v04efo0nt65C5OTkzXhXGl/dPPNYGyQYskYjYxeoOCRIPMcm81W1WsrWTabJZvNxnCCzwdp5OIIDV+I0fnYIEXPq1781jt/Jus61XsnJiZqxp+YmCAAZLVambdoo6Dp69+gG29ooJZv3UaP//hRAkBer5cOHjhIAOjoG2/UhHOl/angwaoX+5/1s3gbCoWqem0lM5vNiEajrK3/oL+kpUsezJU0Nc8jPZaG3W5fEOM6OzuZl3d2durqGhoaYLfbdTN7Oq3itLe344Ft2zA5OYkz/f248YYG/GfmMh56+CGMvf8+tmzdWhNOeX++1tBYsSyFoxmvyTSeV6WYpha6urrYUF+Jmc1mBAIBAMDU1BROnjjFFiwqyRyTaZXuEw6HK55rVqmNzWaD//AhHPQ/h1dffw1btm7FBx9m4D98CGvXrkX45RDSY2M14ZTbXffcU7FUwwGg6mDNm6LRKCPH5XKxi0RRRDAYZCrBbrfD4/FUrOvo6EBXVxeLT263G7lcDtGzUdzX3lbyXg4cz4FTuE9N5G9ubsbm5mY82eXCkb4gzvT3482jR/Hm0aPY3NwM5486cdfdd9eE9dJvX1pxP9SFBseB5zjE43FVYgkCG96iKKK1tVXXSBRFiKIIl8sFh8OxoG50dBShUIhhhcNhxONxdQXIc2zoa4sPSZIqTh6a5zqdzgX1ldrM/y2fz+NMfz+eO/QrOMc60X5vGwBgOBbDcCyG+vp6cKuMVXHKw0G5/T0zsWR/yjxYfWBthXbTTTexC9xuN4sz0WgUmUwGnZ2deOSRR+Dz+djwOHbsGCRJgtvtZhoZAFpaWhAOhzGTn1HvA67sCKxbtw6iKCKTyejiXigUYgRrL6tcg4qiCKvVqltZzcf5yaOPYTgWw5G+IADggw8z6N6xE5uaN+OiNIo/hMP4cGqyKs4dd925pJdW6o9ORSSlBF0au8hm/Wg0ukCLer3eBbPnUnWaRaNRdt2lsYuUlJL0bvxdGvibSO8MnCGPbw8BIEEQFsWfb4KgavTdPbvZjL27Z/cCnI8++oj2+fbSmjVraPWXVlMwEKDp6ell41SzSjg6FfFZ2i233QLrOisikcgCtVDJtNVTk7VJlwfYsHE9mqxNOpz6+nr8ck8vdrifQntbG37W1QWTybRsnJX0R6ciQPosVnk80WbHcDiMXC4HSZLQ2NgIn8/H6rRlcnld+fCZy4+yP7pO9Hp7YTKZEA6H4XA4WJvyLFsmk4HD4UBfXx9MJhO2u7YveJinf9FdEWfHrp149fXXrhhnfliohsOSPYmROOrq6nDbrd/GTH4GTqeTxb1IJLJgItMmno6OjkXrtPZutxt9fX1YbVqN8+8OYnZ2FrOFWRTkAgoFWU0GFWVk/5XDAd8BpiVtNhtsNhvMZjNEUWQvvVqS5nL+Mp474GdJms8ShyV7hi8Mo66uDr49PkSORWA2m5HNZmuSaZFIBMFgkF1bXgcAjY2NyGQyuOPOO3A4cAj/nZ1FYR7BWt5YKSpIDCdw7Oi1ka5kBMeSQ1i1qg7nz52H60lV/wYCAaZnV2rhcJjFsX0H9uHetu9itjCL2UIBcqGAgjyP4AoJ+P/3hDsPgG3p2FtbYLFYAAA+n69i7KnVcrkck3gWi6WUiC/tYigKlFIsptKW07VqPAAopKBYVPfRntm/lxHkcDh0Od7lkNva2sradv+8u5RgL86RXLZlxCZZura2jNjkDoB6PD2UGImTdClFD//wYV1GLZVKLSuzVJ5JExwCSZdSlBiJ0979e9nvn6My90/XUy5KphIkrSDhns1myev16hLuGzdtpNH3JEpKCerx9HweySVuvijt9fSgwyHAaDTisP8wXvnjKyveMvI944UsyxgejuOJx56o5TuCOf1YyrQRlW2OVvh/MZzF2mj3qIaxFE6lflYNEeWl19OjevKlFL0c/j1ZLJaa35jFYqHgkSBJl1KUlBL04u9erLnt/OXx/PPy36rhVGtfC9YngbPAgzXresqFBx96kG31iNEBnDh+Yslt+/uF+2G3t7ANzePHT2Cfb99yvoRZ1DNq8dxKnlbpuJz+VMOphrkowQCw4eb16PXsQf1aS9luRHm6ETrdqn14MjU5iV8fCuDcwLnlfmp0RaGhWkhYDjGfFM6SBGt2e8vtaGtvw83fvBlfNplKn07NBRgiwnQ+jwvJCzh98vSyif20PPhqiME1EfyFrdw4Irqe47h/f0HFp7DAIOL+NwDFrtvhh4x87AAAAABJRU5ErkJggg=="}, -d;return{_setup:function(a){var c="",f=a.license&&b[a.license.toLowerCase()];a._container=document.createElement("div");a._container.style.display="none";d=document.getElementById(a.target);if(a.nameofworkurl)c+="<a href='"+a.nameofworkurl+"' target=_blank>";if(a.nameofwork)c+=a.nameofwork;if(a.nameofworkurl)c+="</a>";if(a.copyrightholderurl)c+="<a href='"+a.copyrightholderurl+"' target=_blank>";if(a.copyrightholder)c+=", "+a.copyrightholder;if(a.copyrightholderurl)c+="</a>";if(c==="")c=a.text;if(a.license)if(f)c= -a.licenseurl?"<a href='"+a.licenseurl+"' target=_blank><img src='"+f+"' border='0'/></a> "+c:"<img src='"+f+"' />"+c;else{c+=", license: ";c+=a.licenseurl?"<a href='"+a.licenseurl+"' target=_blank>"+a.license+"</a> ":a.license}else if(a.licenseurl)c+=", <a href='"+a.licenseurl+"' target=_blank>license</a> ";a._container.innerHTML=c;if(!d&&g.plugin.debug)throw Error("target container doesn't exist");d&&d.appendChild(a._container)},start:function(a,c){c._container.style.display="inline"},end:function(a, -c){c._container.style.display="none"},_teardown:function(a){(d=document.getElementById(a.target))&&d.removeChild(a._container)}}}(),{about:{name:"Popcorn Attribution Plugin",version:"0.2",author:"@rwaldron",website:"github.com/rwldrn"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},nameofwork:{elem:"input",type:"text",label:"Name of Work"},nameofworkurl:{elem:"input",type:"url",label:"Url of Work",optional:true},copyrightholder:{elem:"input",type:"text", -label:"Copyright Holder"},copyrightholderurl:{elem:"input",type:"url",label:"Copyright Holder Url",optional:true},license:{elem:"input",type:"text",label:"License type"},licenseurl:{elem:"input",type:"url",label:"License URL",optional:true},target:"attribution-container"}})})(Popcorn);(function(g){g.plugin("code",function(b){var d=false,a=function(){var c=function(f){return function(h){var p=function(){d&&h();d&&f(p)};p()}};return window.webkitRequestAnimationFrame?c(window.webkitRequestAnimationFrame):window.mozRequestAnimationFrame?c(window.mozRequestAnimationFrame):c(function(f){window.setTimeout(f,16)})}();if(!b.onStart||typeof b.onStart!=="function"){if(g.plugin.debug)throw Error("Popcorn Code Plugin Error: onStart must be a function.");b.onStart=g.nop}if(b.onEnd&&typeof b.onEnd!== -"function"){if(g.plugin.debug)throw Error("Popcorn Code Plugin Error: onEnd must be a function.");b.onEnd=undefined}if(b.onFrame&&typeof b.onFrame!=="function"){if(g.plugin.debug)throw Error("Popcorn Code Plugin Error: onFrame must be a function.");b.onFrame=undefined}return{start:function(c,f){f.onStart(f);if(f.onFrame){d=true;a(f.onFrame,f)}},end:function(c,f){if(f.onFrame)d=false;f.onEnd&&f.onEnd(f)}}},{about:{name:"Popcorn Code Plugin",version:"0.1",author:"David Humphrey (@humphd)",website:"http://vocamus.net/dave"}, -options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},onStart:{elem:"input",type:"function",label:"onStart"},onFrame:{elem:"input",type:"function",label:"onFrame",optional:true},onEnd:{elem:"input",type:"function",label:"onEnd"}}})})(Popcorn);(function(g){var b=0;g.plugin("flickr",function(d){var a,c=document.getElementById(d.target),f,h,p,o,l=d.numberofimages||4,i=d.height||"50px",r=d.width||"50px",k=d.padding||"5px",j=d.border||"0px";a=document.createElement("div");a.id="flickr"+b;a.style.width="100%";a.style.height="100%";a.style.display="none";b++;if(!c&&g.plugin.debug)throw Error("flickr target container doesn't exist");c&&c.appendChild(a);var v=function(){if(f)setTimeout(function(){v()},5);else{h="http://api.flickr.com/services/rest/?method=flickr.people.findByUsername&"; -h+="username="+d.username+"&api_key="+d.apikey+"&format=json&jsoncallback=flickr";g.getJSONP(h,function(n){f=n.user.nsid;w()})}},w=function(){h="http://api.flickr.com/services/feeds/photos_public.gne?";if(f)h+="id="+f+"&";if(d.tags)h+="tags="+d.tags+"&";h+="lang=en-us&format=json&jsoncallback=flickr";g.xhr.getJSONP(h,function(n){var y=document.createElement("div");y.innerHTML="<p style='padding:"+k+";'>"+n.title+"<p/>";g.forEach(n.items,function(C,e){if(e<l){p=document.createElement("a");p.setAttribute("href", -C.link);p.setAttribute("target","_blank");o=document.createElement("img");o.setAttribute("src",C.media.m);o.setAttribute("height",i);o.setAttribute("width",r);o.setAttribute("style","border:"+j+";padding:"+k);p.appendChild(o);y.appendChild(p)}else return false});a.appendChild(y)})};if(d.username&&d.apikey)v();else{f=d.userid;w()}return{start:function(){a.style.display="inline"},end:function(){a.style.display="none"},_teardown:function(n){document.getElementById(n.target)&&document.getElementById(n.target).removeChild(a)}}}, -{about:{name:"Popcorn Flickr Plugin",version:"0.2",author:"Scott Downe, Steven Weerdenburg, Annasob",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"number",label:"In"},end:{elem:"input",type:"number",label:"Out"},userid:{elem:"input",type:"text",label:"UserID",optional:true},tags:{elem:"input",type:"text",label:"Tags"},username:{elem:"input",type:"text",label:"Username",optional:true},apikey:{elem:"input",type:"text",label:"Api_key",optional:true},target:"flickr-container", -height:{elem:"input",type:"text",label:"Height",optional:true},width:{elem:"input",type:"text",label:"Width",optional:true},padding:{elem:"input",type:"text",label:"Padding",optional:true},border:{elem:"input",type:"text",label:"Border",optional:true},numberofimages:{elem:"input",type:"text",label:"Number of Images"}}})})(Popcorn);(function(g){g.forEach(["footnote","text"],function(b){g.plugin(b,{manifest:{about:{name:"Popcorn "+b+" Plugin",version:"0.2",author:"@annasob, @rwaldron",website:"annasob.wordpress.com"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},text:{elem:"input",type:"text",label:"Text"},target:b+"-container"}},_setup:function(d){var a=document.getElementById(d.target);d._container=document.createElement("div");d._container.style.display="none";d._container.innerHTML= -d.text;if(!a&&g.plugin.debug)throw Error("target container doesn't exist");a&&a.appendChild(d._container)},start:function(d,a){a._container.style.display="inline"},end:function(d,a){a._container.style.display="none"},_teardown:function(d){document.getElementById(d.target)&&document.getElementById(d.target).removeChild(d._container)}})})})(Popcorn);(function(g,b){var d=false;g.plugin("facebook",{manifest:{about:{name:"Popcorn Facebook Plugin",version:"0.1",author:"Dan Ventura, Matthew Schranz: @mjschranz",website:"dsventura.blogspot.com, mschranz.wordpress.com"},options:{type:{elem:"select",options:["LIKE","LIKE-BOX","ACTIVITY","FACEPILE","LIVE-STREAM","SEND","COMMENTS"],label:"Type"},target:"facebook-container",start:{elem:"input",type:"number",label:"In"},end:{elem:"input",type:"number",label:"Out"},font:{elem:"input",type:"text",label:"font", -optional:true},xid:{elem:"input",type:"text",label:"Xid",optional:true},href:{elem:"input",type:"url",label:"Href",optional:true},site:{elem:"input",type:"url",label:"Site",optional:true},height:{elem:"input",type:"text",label:"Height",optional:true},width:{elem:"input",type:"text",label:"Width",optional:true},action:{elem:"select",options:["like","recommend"],label:"Action",optional:true},stream:{elem:"select",options:["false","true"],label:"Stream",optional:true},header:{elem:"select",options:["false", -"true"],label:"Header",optional:true},layout:{elem:"select",options:["standard","button_count","box_count"],label:"Layout",optional:true},max_rows:{elem:"input",type:"text",label:"Max_rows",optional:true},border_color:{elem:"input",type:"text",label:"Border_color",optional:true},event_app_id:{elem:"input",type:"text",label:"Event_app_id",optional:true},colorscheme:{elem:"select",options:["light","dark"],label:"Colorscheme",optional:true},show_faces:{elem:"select",options:["false","true"],label:"Showfaces", -optional:true},recommendations:{elem:"select",options:["false","true"],label:"Recommendations",optional:true},always_post_to_friends:{elem:"input",options:["false","true"],label:"Always_post_to_friends",optional:true},num_posts:{elem:"input",type:"text",label:"Number_of_Comments",optional:true}}},_setup:function(a){var c=document.getElementById(a.target),f=a.type;if(!document.getElementById("fb-root")){var h=document.createElement("div");h.setAttribute("id","fb-root");document.body.appendChild(h)}if(!d|| -a.event_app_id){d=true;g.getScript("//connect.facebook.net/en_US/all.js");b.fbAsyncInit=function(){FB.init({appId:a.event_app_id||"",status:true,cookie:true,xfbml:true})}}f=f.toLowerCase();if(!(["like","like-box","activity","facepile","live-stream","send","comments"].indexOf(f)>-1))throw Error("Facebook plugin type was invalid.");a._container=document.createElement("div");a._container.id="facebookdiv-"+g.guid();a._facebookdiv=document.createElement("fb:"+f);a._container.appendChild(a._facebookdiv); -a._container.style.display="none";f=f==="activity"?"site":"href";a._facebookdiv.setAttribute(f,a[f]||document.URL);f="width height layout show_faces stream header colorscheme maxrows border_color recommendations font always_post_to_friends xid num_posts".split(" ");g.forEach(f,function(p){a[p]!=null&&a._facebookdiv.setAttribute(p,a[p])});if(!c&&g.plugin.debug)throw Error("Facebook target container doesn't exist");c&&c.appendChild(a._container)},start:function(a,c){c._container.style.display=""},end:function(a, -c){c._container.style.display="none"},_teardown:function(a){var c=document.getElementById(a.target);c&&c.removeChild(a._container)}})})(Popcorn,this);var googleCallback; -(function(g){var b=1,d=false,a=false,c,f;googleCallback=function(h){if(typeof google!=="undefined"&&google.maps&&google.maps.Geocoder&&google.maps.LatLng){c=new google.maps.Geocoder;a=true}else setTimeout(function(){googleCallback(h)},1)};f=function(){if(document.body){d=true;g.getScript("//maps.google.com/maps/api/js?sensor=false&callback=googleCallback")}else setTimeout(function(){f()},1)};g.plugin("googlemap",function(h){var p,o,l,i=document.getElementById(h.target);d||f();p=document.createElement("div"); -p.id="actualmap"+b;p.style.width="100%";p.style.height="100%";b++;if(!i&&g.plugin.debug)throw Error("target container doesn't exist");i&&i.appendChild(p);var r=function(){if(a)if(h.location)c.geocode({address:h.location},function(k,j){if(j===google.maps.GeocoderStatus.OK){h.lat=k[0].geometry.location.lat();h.lng=k[0].geometry.location.lng();l=new google.maps.LatLng(h.lat,h.lng);o=new google.maps.Map(p,{mapTypeId:google.maps.MapTypeId[h.type]||google.maps.MapTypeId.HYBRID});o.getDiv().style.display= -"none"}});else{l=new google.maps.LatLng(h.lat,h.lng);o=new google.maps.Map(p,{mapTypeId:google.maps.MapTypeId[h.type]||google.maps.MapTypeId.HYBRID});o.getDiv().style.display="none"}else setTimeout(function(){r()},5)};r();return{start:function(k,j){var v=this,w,n=function(){if(o){o.getDiv().style.display="block";google.maps.event.trigger(o,"resize");o.setCenter(l);if(j.zoom&&typeof j.zoom!=="number")j.zoom=+j.zoom;j.zoom=j.zoom||8;o.setZoom(j.zoom);if(j.heading&&typeof j.heading!=="number")j.heading= -+j.heading;if(j.pitch&&typeof j.pitch!=="number")j.pitch=+j.pitch;if(j.type==="STREETVIEW"){o.setStreetView(w=new google.maps.StreetViewPanorama(p,{position:l,pov:{heading:j.heading=j.heading||0,pitch:j.pitch=j.pitch||0,zoom:j.zoom}}));var y=function(u,x){var A=google.maps.geometry.spherical.computeHeading;setTimeout(function(){var B=v.media.currentTime;if(typeof j.tween==="object"){for(var D=0,E=u.length;D<E;D++){var z=u[D];if(B>=z.interval*(D+1)/1E3&&(B<=z.interval*(D+2)/1E3||B>=z.interval*E/1E3)){s.setPosition(new google.maps.LatLng(z.position.lat, -z.position.lng));s.setPov({heading:z.pov.heading||A(z,u[D+1])||0,zoom:z.pov.zoom||0,pitch:z.pov.pitch||0})}}y(u,u[0].interval)}else{D=0;for(E=u.length;D<E;D++){z=j.interval;if(B>=z*(D+1)/1E3&&(B<=z*(D+2)/1E3||B>=z*E/1E3)){C.setPov({heading:A(u[D],u[D+1])||0,zoom:j.zoom,pitch:j.pitch||0});C.setPosition(e[D])}}y(e,j.interval)}},x)};if(j.location&&typeof j.tween==="string"){var C=w,e=[],m=new google.maps.DirectionsService,q=new google.maps.DirectionsRenderer(C);m.route({origin:j.location,destination:j.tween, -travelMode:google.maps.TravelMode.DRIVING},function(u,x){if(x==google.maps.DirectionsStatus.OK){q.setDirections(u);for(var A=u.routes[0].overview_path,B=0,D=A.length;B<D;B++)e.push(new google.maps.LatLng(A[B].lat(),A[B].lng()));j.interval=j.interval||1E3;y(e,10)}})}else if(typeof j.tween==="object"){var s=w;m=0;for(var t=j.tween.length;m<t;m++){j.tween[m].interval=j.tween[m].interval||1E3;y(j.tween,10)}}}}else setTimeout(function(){n()},13)};n()},end:function(){if(o)o.getDiv().style.display="none"}, -_teardown:function(k){(k=document.getElementById(k.target))&&k.removeChild(p);p=o=l=null}}},{about:{name:"Popcorn Google Map Plugin",version:"0.1",author:"@annasob",website:"annasob.wordpress.com"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"map-container",type:{elem:"select",options:["ROADMAP","SATELLITE","STREETVIEW","HYBRID","TERRAIN"],label:"Type",optional:true},zoom:{elem:"input",type:"text",label:"Zoom",optional:true},lat:{elem:"input", -type:"text",label:"Lat",optional:true},lng:{elem:"input",type:"text",label:"Lng",optional:true},location:{elem:"input",type:"text",label:"Location"},heading:{elem:"input",type:"text",label:"Heading",optional:true},pitch:{elem:"input",type:"text",label:"Pitch",optional:true}}})})(Popcorn);(function(g){g.plugin("image",{manifest:{about:{name:"Popcorn image Plugin",version:"0.1",author:"Scott Downe",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"number",label:"In"},end:{elem:"input",type:"number",label:"Out"},href:{elem:"input",type:"url",label:"anchor URL",optional:true},target:"image-container",src:{elem:"input",type:"url",label:"Source URL"},text:{elem:"input",type:"text",label:"TEXT",optional:true}}},_setup:function(b){var d=document.createElement("img"), -a=document.getElementById(b.target);b.anchor=document.createElement("a");b.anchor.style.position="relative";b.anchor.style.textDecoration="none";b.anchor.style.display="none";if(!a&&g.plugin.debug)throw Error("target container doesn't exist");a&&a.appendChild(b.anchor);d.addEventListener("load",function(){d.style.borderStyle="none";b.anchor.href=b.href||b.src||"#";b.anchor.target="_blank";var c,f;if(b.text){c=d.height/12+"px";f=document.createElement("div");g.extend(f.style,{color:"black",fontSize:c, -fontWeight:"bold",position:"relative",textAlign:"center",width:d.width+"px",zIndex:"10"});f.innerHTML=b.text||"";f.style.top=d.height/2-f.offsetHeight/2+"px";b.anchor.appendChild(f)}b.anchor.appendChild(d)},false);d.src=b.src},start:function(b,d){d.anchor.style.display="inline"},end:function(b,d){d.anchor.style.display="none"},_teardown:function(b){document.getElementById(b.target)&&document.getElementById(b.target).removeChild(b.anchor)}})})(Popcorn);(function(g){var b=function(d){var a=0,c=0,f=0,h=null,p=null,o=false,l=0,i=function(){},r=function(){d.background(0);c=f=0;h=p=null};d.draw=function(){i()};d.setup=function(){};d.construct=function(k,j,v){var w=function(){if(j){l=j.gml.tag.drawing.stroke;var n=(v.end-v.start)/(l.pt||function(C){for(var e=[],m=0,q=C.length;m<q;m++)e=e.concat(C[m].pt);return e}(l)).length,y=j.gml.tag;y=y.header&&y.header.client&&y.header.client.name;o=y==="Graffiti Analysis 2.0: DustTag"||y==="DustTag: Graffiti Analysis 2.0"|| -y==="Fat Tag - Katsu Edition";i=function(){if(k.currentTime<v.endDrawing){var C=(k.currentTime-v.start)/n;for(C<c&&r();c<=C;){if(!l)break;a=l[f]||l;var e=a.pt[c],m=c;if(h!=null){var q=e.x,s=e.y,t=void 0,u=void 0,x=void 0,A=void 0;if(o){t=p*d.height;u=d.width-h*d.width;x=s*d.height;A=d.width-q*d.width}else{t=h*d.width;u=p*d.height;x=q*d.width;A=s*d.height}d.stroke(0);d.strokeWeight(13);d.strokeCap(d.SQUARE);d.line(t,u,x,A);d.stroke(255);d.strokeWeight(12);d.strokeCap(d.ROUND);d.line(t,u,x,A)}h=e.x; -p=e.y;c===m&&c++}}}}else setTimeout(w,5)};d.size(640,640);d.frameRate(60);d.smooth();r();d.noLoop();w()}};g.plugin("gml",{_setup:function(d){var a=this,c=document.getElementById(d.target);d.endDrawing=d.endDrawing||d.end;d.container=document.createElement("canvas");d.container.style.display="none";d.container.setAttribute("id","canvas"+d.gmltag);if(!c&&g.plugin.debug)throw Error("target container doesn't exist");c&&c.appendChild(d.container);c=function(){g.getJSONP("//000000book.com/data/"+d.gmltag+ -".json?callback=",function(f){d.pjsInstance=new Processing(d.container,b);d.pjsInstance.construct(a.media,f,d);d._running&&d.pjsInstance.loop()},false)};window.Processing?c():g.getScript("//cloud.github.com/downloads/processing-js/processing-js/processing-1.3.6.min.js",c)},start:function(d,a){a.pjsInstance&&a.pjsInstance.loop();a.container.style.display="block"},end:function(d,a){a.pjsInstance&&a.pjsInstance.noLoop();a.container.style.display="none"},_teardown:function(d){d.pjsInstance&&d.pjsInstance.exit(); -document.getElementById(d.target)&&document.getElementById(d.target).removeChild(d.container)}})})(Popcorn);(function(g){var b={},d=function(a){if(a.artist){var c="";c="<h3>"+a.artist.name+"</h3>";c+="<a href='"+a.artist.url+"' target='_blank' style='float:left;margin:0 10px 0 0;'><img src='"+a.artist.image[2]["#text"]+"' alt=''></a>";c+="<p>"+a.artist.bio.summary+"</p>";c+="<hr /><p><h4>Tags</h4><ul>";g.forEach(a.artist.tags.tag,function(f){c+="<li><a href='"+f.url+"'>"+f.name+"</a></li>"});c+="</ul></p>";c+="<hr /><p><h4>Similar</h4><ul>";g.forEach(a.artist.similar.artist,function(f){c+="<li><a href='"+ -f.url+"'>"+f.name+"</a></li>"});c+="</ul></p>";b[a.artist.name.toLowerCase()].htmlString=c}};g.plugin("lastfm",function(){return{_setup:function(a){a._container=document.createElement("div");a._container.style.display="none";a._container.innerHTML="";a.artist=a.artist&&a.artist.toLowerCase()||"";var c=document.getElementById(a.target);if(!c&&g.plugin.debug)throw Error("target container doesn't exist");c&&c.appendChild(a._container);if(!b[a.artist]){b[a.artist]={count:0,htmlString:"Unknown Artist"}; -g.getJSONP("//ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist="+a.artist+"&api_key="+a.apikey+"&format=json&callback=lastFMcallback",d,false)}b[a.artist].count++},start:function(a,c){c._container.innerHTML=b[c.artist].htmlString;c._container.style.display="inline"},end:function(a,c){c._container.style.display="none";c._container.innerHTML=""},_teardown:function(a){--b[a.artist].count||delete b[a.artist];document.getElementById(a.target)&&document.getElementById(a.target).removeChild(a._container)}}}(), -{about:{name:"Popcorn LastFM Plugin",version:"0.1",author:"Steven Weerdenburg",website:"http://sweerdenburg.wordpress.com/"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"lastfm-container",artist:{elem:"input",type:"text",label:"Artist"}}})})(Popcorn);(function(g){g.plugin("lowerthird",{manifest:{about:{name:"Popcorn lowerthird Plugin",version:"0.1",author:"Scott Downe",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"lowerthird-container",salutation:{elem:"input",type:"text",label:"Text",optional:true},name:{elem:"input",type:"text",label:"Text"},role:{elem:"input",type:"text",label:"Text",optional:true}}},_setup:function(b){var d=document.getElementById(b.target); -if(!this.container){this.container=document.createElement("div");this.container.style.position="absolute";this.container.style.color="white";this.container.style.textShadow="black 2px 2px 6px";this.container.style.fontSize="24px";this.container.style.fontWeight="bold";this.container.style.paddingLeft="40px";this.container.style.width=this.video.offsetWidth+"px";this.container.style.left=this.position().left+"px";this.video.parentNode.appendChild(this.container)}if(b.target&&b.target!=="lowerthird-container"){b.container= -document.createElement("div");if(!d&&g.plugin.debug)throw Error("target container doesn't exist");d&&d.appendChild(b.container)}else b.container=this.container},start:function(b,d){d.container.innerHTML=(d.salutation?d.salutation+" ":"")+d.name+(d.role?"<br />"+d.role:"");this.container.style.top=this.position().top+this.video.offsetHeight-(40+this.container.offsetHeight)+"px"},end:function(b,d){for(;d.container.firstChild;)d.container.removeChild(d.container.firstChild)}})})(Popcorn);(function(g){var b=1,d=false;g.plugin("googlefeed",function(a){var c=function(){var o=false,l=0,i=document.getElementsByTagName("link"),r=i.length,k=document.head||document.getElementsByTagName("head")[0],j=document.createElement("link");if(window.GFdynamicFeedControl)d=true;else g.getScript("//www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js",function(){d=true});for(;l<r;l++)if(i[l].href==="//www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.css")o=true;if(!o){j.type= -"text/css";j.rel="stylesheet";j.href="//www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.css";k.insertBefore(j,k.firstChild)}};window.google?c():g.getScript("//www.google.com/jsapi",function(){google.load("feeds","1",{callback:function(){c()}})});var f=document.createElement("div"),h=document.getElementById(a.target),p=function(){if(d)a.feed=new GFdynamicFeedControl(a.url,f,{vertical:a.orientation.toLowerCase()==="vertical"?true:false,horizontal:a.orientation.toLowerCase()==="horizontal"? -true:false,title:a.title=a.title||"Blog"});else setTimeout(function(){p()},5)};if(!a.orientation||a.orientation.toLowerCase()!=="vertical"&&a.orientation.toLowerCase()!=="horizontal")a.orientation="vertical";f.style.display="none";f.id="_feed"+b;f.style.width="100%";f.style.height="100%";b++;if(!h&&g.plugin.debug)throw Error("target container doesn't exist");h&&h.appendChild(f);p();return{start:function(){f.setAttribute("style","display:inline")},end:function(){f.setAttribute("style","display:none")}, -_teardown:function(o){document.getElementById(o.target)&&document.getElementById(o.target).removeChild(f);delete o.feed}}},{about:{name:"Popcorn Google Feed Plugin",version:"0.1",author:"David Seifried",website:"dseifried.wordpress.com"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"feed-container",url:{elem:"input",type:"url",label:"url"},title:{elem:"input",type:"text",label:"title",optional:true},orientation:{elem:"select",options:["Vertical", -"Horizontal"],label:"orientation",optional:true}}})})(Popcorn);(function(g){var b={},d={},a={};g.plugin("rdio",function(){var c=function(f){var h=function(p){return"http://www.rdio.com/api/oembed/?format=json&url=http://www.rdio.com/%23"+{playlist:function(){return"/people/"+f.person+"/playlists/"+f.id+"/"},album:function(){return"/artist/"+f.artist+"/album/"}}[p]()+f[p]+"/&callback=_loadResults"}(f.type);g.getJSONP(h,function(p){var o=p.title,l=p.html;if(p&&o&&l)b[f.containerid].htmlString="<div>"+l+"</div>";else if(g.plugin.debug)throw Error("Did not receive data from server."); -},false)};return{_setup:function(f){var h=f.containerid=g.guid(),p=d[h]=document.createElement("div"),o=a[h]=document.getElementById(f.target);if(!o&&g.plugin.debug)throw Error("Target container could not be found.");p.style.display="none";p.innerHTML="";o.appendChild(p);b[h]={htmlString:f.playlist||"Unknown Source"||f.album||"Unknown Source"};c(f)},start:function(f,h){var p=h.containerid,o=d[p];o.innerHTML=b[p].htmlString;o.style.display="inline"},end:function(f,h){container=d[h.containerid];container.style.display= -"none";container.innerHTML=""},_teardown:function(f){f=f.containerid;var h=a[f];b[f]&&delete b[f];h&&h.removeChild(d[f]);delete a[f];delete d[f]}}}(),{manifest:{about:{name:"Popcorn Rdio Plugin",version:"0.1",author:"Denise Rigato"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"rdio",artist:{elem:"input",type:"text",label:"Artist"},album:{elem:"input",type:"text",label:"Album"},person:{elem:"input",type:"text",label:"Person"},id:{elem:"input", -type:"text",label:"Id"},playlist:{elem:"input",type:"text",label:"Playlist"}}}})})(Popcorn);(function(g){var b=0,d=function(a,c){var f=a.container=document.createElement("div"),h=f.style,p=a.media,o=function(){var l=a.position();h.fontSize="18px";h.width=p.offsetWidth+"px";h.top=l.top+p.offsetHeight-f.offsetHeight-40+"px";h.left=l.left+"px";setTimeout(o,10)};f.id=c||g.guid();h.position="absolute";h.color="white";h.textShadow="black 2px 2px 6px";h.fontWeight="bold";h.textAlign="center";o();a.media.parentNode.appendChild(f);return f};g.plugin("subtitle",{manifest:{about:{name:"Popcorn Subtitle Plugin", -version:"0.1",author:"Scott Downe",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"subtitle-container",text:{elem:"input",type:"text",label:"Text"}}},_setup:function(a){var c=document.createElement("div");c.id="subtitle-"+b++;c.style.display="none";!this.container&&(!a.target||a.target==="subtitle-container")&&d(this);a.container=a.target&&a.target!=="subtitle-container"?document.getElementById(a.target)|| -d(this,a.target):this.container;document.getElementById(a.container.id)&&document.getElementById(a.container.id).appendChild(c);a.innerContainer=c;a.showSubtitle=function(){a.innerContainer.innerHTML=a.text||""}},start:function(a,c){c.innerContainer.style.display="inline";c.showSubtitle(c,c.text)},end:function(a,c){c.innerContainer.style.display="none";c.innerContainer.innerHTML=""},_teardown:function(a){a.container.removeChild(a.innerContainer)}})})(Popcorn);(function(g){var b=[],d=function(){this.name="";this.contains={};this.toString=function(){var a=[],c;for(c in this.contains)this.contains.hasOwnProperty(c)&&a.push(" "+this.contains[c]);return a.toString()}};g.plugin("tagthisperson",function(){return{_setup:function(a){var c=false;if(!document.getElementById(a.target)&&g.plugin.debug)throw Error("target container doesn't exist");for(var f=0;f<b.length;f++)if(b[f].name===a.target){a._p=b[f];c=true;break}if(!c){a._p=new d;a._p.name=a.target;b.push(a._p)}}, -start:function(a,c){c._p.contains[c.person]=c.image?"<img src='"+c.image+"'/> ":"";c._p.contains[c.person]+=c.href?"<a href='"+c.href+"' target='_blank'> "+c.person+"</a>":c.person;document.getElementById(c.target).innerHTML=c._p.toString()},end:function(a,c){delete c._p.contains[c.person];document.getElementById(c.target).innerHTML=c._p.toString()}}}(),{about:{name:"Popcorn tagthisperson Plugin",version:"0.1",author:"@annasob",website:"annasob.wordpress.com"},options:{start:{elem:"input",type:"text", -label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"tagthisperson-container",person:{elem:"input",type:"text",label:"Name"},image:{elem:"input",type:"url",label:"Image Src",optional:true},href:{elem:"input",type:"url",label:"URL",optional:true}}})})(Popcorn);(function(g){var b=false;g.plugin("twitter",{manifest:{about:{name:"Popcorn Twitter Plugin",version:"0.1",author:"Scott Downe",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"number",label:"In"},end:{elem:"input",type:"number",label:"Out"},src:{elem:"input",type:"text",label:"Source"},target:"twitter-container",height:{elem:"input",type:"number",label:"Height",optional:true},width:{elem:"input",type:"number",label:"Width",optional:true}}},_setup:function(d){if(!window.TWTR&& -!b){b=true;g.getScript("//widgets.twimg.com/j/2/widget.js")}var a=document.getElementById(d.target);d.container=document.createElement("div");d.container.setAttribute("id",g.guid());d.container.style.display="none";if(!a&&g.plugin.debug)throw Error("target container doesn't exist");a&&a.appendChild(d.container);var c=d.src||"";a=d.width||250;var f=d.height||200,h=/^@/.test(c),p={version:2,id:d.container.getAttribute("id"),rpp:30,width:a,height:f,interval:6E3,theme:{shell:{background:"#ffffff",color:"#000000"}, -tweets:{background:"#ffffff",color:"#444444",links:"#1985b5"}},features:{loop:true,timestamp:true,avatars:true,hashtags:true,toptweets:true,live:true,scrollbar:false,behavior:"default"}},o=function(l){if(window.TWTR)if(h){p.type="profile";(new TWTR.Widget(p)).render().setUser(c).start()}else{p.type="search";p.search=c;p.subject=c;(new TWTR.Widget(p)).render().start()}else setTimeout(function(){o(l)},1)};o(this)},start:function(d,a){a.container.style.display="inline"},end:function(d,a){a.container.style.display= -"none"},_teardown:function(d){document.getElementById(d.target)&&document.getElementById(d.target).removeChild(d.container)}})})(Popcorn);(function(g){g.plugin("webpage",{manifest:{about:{name:"Popcorn Webpage Plugin",version:"0.1",author:"@annasob",website:"annasob.wordpress.com"},options:{id:{elem:"input",type:"text",label:"Id",optional:true},start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},src:{elem:"input",type:"url",label:"Src"},target:"iframe-container"}},_setup:function(b){var d=document.getElementById(b.target);b.src=b.src.replace(/^(https?:)?(\/\/)?/,"//");b._iframe=document.createElement("iframe"); -b._iframe.setAttribute("width","100%");b._iframe.setAttribute("height","100%");b._iframe.id=b.id;b._iframe.src=b.src;b._iframe.style.display="none";if(!d&&g.plugin.debug)throw Error("target container doesn't exist");d&&d.appendChild(b._iframe)},start:function(b,d){d._iframe.src=d.src;d._iframe.style.display="inline"},end:function(b,d){d._iframe.style.display="none"},_teardown:function(b){document.getElementById(b.target)&&document.getElementById(b.target).removeChild(b._iframe)}})})(Popcorn);var wikiCallback; -(function(g){g.plugin("wikipedia",{manifest:{about:{name:"Popcorn Wikipedia Plugin",version:"0.1",author:"@annasob",website:"annasob.wordpress.com"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},lang:{elem:"input",type:"text",label:"Language",optional:true},src:{elem:"input",type:"url",label:"Src"},title:{elem:"input",type:"text",label:"Title",optional:true},numberofwords:{elem:"input",type:"text",label:"Num Of Words",optional:true},target:"wikipedia-container"}}, -_setup:function(b){var d,a=g.guid();if(!b.lang)b.lang="en";b.numberofwords=b.numberofwords||200;window["wikiCallback"+a]=function(c){b._link=document.createElement("a");b._link.setAttribute("href",b.src);b._link.setAttribute("target","_blank");b._link.innerHTML=b.title||c.parse.displaytitle;b._desc=document.createElement("p");d=c.parse.text["*"].substr(c.parse.text["*"].indexOf("<p>"));d=d.replace(/((<(.|\n)+?>)|($(.*?)$ )|(\[(.*?)\]))/g,"");d=d.split(" ");b._desc.innerHTML=d.slice(0,d.length>= -b.numberofwords?b.numberofwords:d.length).join(" ")+" ...";b._fired=true};if(b.src)g.getScript("//"+b.lang+".wikipedia.org/w/api.php?action=parse&props=text&page="+b.src.slice(b.src.lastIndexOf("/")+1)+"&format=json&callback=wikiCallback"+a);else if(g.plugin.debug)throw Error("Wikipedia plugin needs a 'src'");},start:function(b,d){var a=function(){if(d._fired){if(d._link&&d._desc)if(document.getElementById(d.target)){document.getElementById(d.target).appendChild(d._link);document.getElementById(d.target).appendChild(d._desc); -d._added=true}}else setTimeout(function(){a()},13)};a()},end:function(b,d){if(d._added){document.getElementById(d.target).removeChild(d._link);document.getElementById(d.target).removeChild(d._desc)}},_teardown:function(b){if(b._added){b._link.parentNode&&document.getElementById(b.target).removeChild(b._link);b._desc.parentNode&&document.getElementById(b.target).removeChild(b._desc);delete b.target}}})})(Popcorn);(function(g){var b={text:function(d){var a=d.post,c=document.createElement("a"),f=document.createTextNode(a.title),h=document.createElement("div");c.setAttribute("href",a.post_url);c.appendChild(f);h.appendChild(c);h.innerHTML+=a.body;d._container.appendChild(h)},photo:function(d){for(var a=d.width||250,c=-1,f=[d.post.photos.length],h=[d.post.photos.length],p=document.createElement("div"),o=document.createElement("img"),l=d.post,i=0,r=l.photos.length;i<r;i++){for(var k=l.photos[i],j=k.alt_sizes,v= -0,w=j.length;v<w;v++){var n=j[v];if(n.width===a){h[i]=n.url;f[i]=k.caption;c=0;break}else if(n.width===250)c=v}c===-1&&g.error("Clearly your blog has a picture that is so tiny it isn't even 250px wide. Consider using a bigger picture or try a smaller size.");if(v===j.length)h[i]=j[c].url}a=0;for(c=h.length;a<c;a++){p.innerHTML+=f[a]+"<br/>";o.setAttribute("src",h[a]);o.setAttribute("alt","Pic"+a);p.appendChild(o);p.innerHTML+="<br/>"}p.innerHTML+="<br/>"+l.caption;d._container.appendChild(p)},audio:function(d){var a= -document.createElement("div"),c=document.createElement("a"),f=d.post;if(f.artist){var h=document.createElement("img");a.innerHTML+="Artist: "+f.artist+"<br/>";c.setAttribute("href",f.source_url);h.setAttribute("src",f.album_art);h.setAttribute("alt",f.album);c.appendChild(h);a.appendChild(c);a.innerHTML+="<hr/>"+f.track_number+" - "+f.track_name+"<br/>"}else{h=document.createTextNode(f.source_title);c.setAttribute("href",f.source_url);c.appendChild(h);a.appendChild(c);a.innerHTML+="<br/>"}a.innerHTML+= -f.player+" "+f.plays+"plays<br/>"+f.caption;d._container.appendChild(a)},video:function(d){for(var a=d.width||400,c=-1,f=d.post,h=document.createElement("div"),p,o=0,l=f.player.length;o<l;o++){var i=f.player[o];if(i.width===a){p=i.embed_code;c=0;break}else if(i.width===400)c=o}if(o===d.post.player.length)p=f.player[c].embed_code;c===-1&&g.error("Specified video size was not found and default was never found. Please try another width.");h.innerHTML+=p+"<br/>"+f.caption;d._container.appendChild(h)}, -chat:function(d){var a=d.post,c,f=document.createElement("div");f.innerHTML+="<strong><u>"+a.title+"</u></strong><br/><br/>";for(var h=0,p=a.dialogue.length;h<p;h++){c=a.dialogue[h];f.innerHTML+=c.label+" "+c.phrase+"<br/>"}d._container.appendChild(f)},quote:function(d){var a=document.createElement("div"),c=document.createElement("a"),f=d.post,h=document.createTextNode(f.text);c.setAttribute("href",f.post_url);c.appendChild(h);a.appendChild(c);a.innerHTML+="<br/><br/>Source: <b>"+f.source+"</b>"; -d._container.appendChild(a)},link:function(d){var a=document.createElement("div"),c=document.createElement("a"),f=d.post,h=document.createTextNode(f.title);c.setAttribute("href",f.post_url);c.appendChild(h);a.appendChild(c);a.innerHTML+="<br/>"+f.description;d._container.appendChild(a)},answer:function(d){var a=document.createElement("div"),c=document.createElement("a"),f=d.post,h=document.createTextNode(f.asking_name);a.innerHTML="Inquirer: ";c.setAttribute("href",f.asking_url);c.appendChild(h); -a.appendChild(c);a.innerHTML+="<br/><br/>Question: "+f.question+"<br/>Answer: "+f.answer;d._container.appendChild(a)}};g.plugin("tumblr",{manifest:{about:{name:"Popcorn Tumblr Plugin",version:"0.1",author:"Matthew Schranz, @mjschranz",website:"mschranz.wordpress.com"},options:{requestType:{elem:"select",options:["INFO","AVATAR","BLOGPOST"],label:"Type_Of_Plugin"},target:"tumblr-container",start:{elem:"input",type:"number",label:"Start_Time"},end:{elem:"input",type:"number",label:"End_Time"},base_hostname:{elem:"input", -type:"text",label:"User_Name"},api_key:{elem:"input",type:"text",label:"Application_Key",optional:true},size:{elem:"select",options:[16,24,30,40,48,64,96,128,512],label:"avatarSize",optional:true},blogId:{elem:"input",type:"number",label:"Blog_ID",optional:true},width:{elem:"input",type:"number",label:"Photo_Width",optional:true}}},_setup:function(d){var a=document.getElementById(d.target),c,f,h=this;d.requestType=d.requestType.toLowerCase();(!d.base_hostname||!d.api_key&&(d.requestType==="info"|| -d.requestType==="blogpost"))&&g.error("Must provide a blog URL to the plugin and an api_key for Blog Info and Blog Post requests.");!(["info","avatar","blogpost"].indexOf(d.requestType)>-1)&&g.error("Invalid tumblr plugin type.");d.requestType==="blogpost"&&d.blogId===undefined&&g.error("Error. BlogId required for blogpost requests");!a&&g.plugin.debug&&g.error("Target Tumblr container doesn't exist.");c=d.base_hostname.slice(d.base_hostname.indexOf("/")+2,d.base_hostname.length);f=d.base_hostname.slice(0, -d.base_hostname.indexOf("/")+2);c=f==="http://"||f==="https://"?c:d.base_hostname;if(c.indexOf("/")>-1)c=c.slice(0,c.indexOf("/"));d.base_hostname=c;d._container=document.createElement("div");d._container.id="tumblrdiv-"+g.guid();if(d.requestType==="avatar")d._container.innerHTML="<img src=http://api.tumblr.com/v2/blog/"+d.base_hostname+"/avatar/"+d.size+" alt='BlogAvatar' />";else{c=d.requestType==="blogpost"?"posts":"info";c="http://api.tumblr.com/v2/blog/"+d.base_hostname+"/"+c+"?api_key="+d.api_key+ -"&id="+d.blogId+"&jsonp=tumblrCallBack";this.listen("tumblrError",function(p){g.error(p)});g.getJSONP(c,function(p){if(p.meta.msg==="OK"){var o=document.createElement("div");if(d.requestType==="blogpost"){d.post=p.response.posts[0];var l=d.post.type;p=d.post.tags;o.innerHTML="Date Published: "+d.post.date.slice(0,d.post.date.indexOf(" "))+"<br/>";if(p.length!==0){o.innerHTML+="Tags: "+p[0];for(var i=1,r=p.length;i<r;i++)o.innerHTML+=", "+p[i]}else o.innerHTML+="Tags: No Tags Used";d._container.appendChild(o); -b[l](d)}else{l=document.createElement("a");p=p.response.blog;i=document.createTextNode(p.title);l.setAttribute("href",p.url);l.appendChild(i);o.appendChild(l);o.innerHTML+=p.description;d._container.appendChild(o)}}else h.trigger("tumblrError","Error. Request failed. Status code: "+p.meta.status+" - Message: "+p.meta.msg)},false)}d._container.style.display="none";a&&a.appendChild(d._container)},start:function(d,a){if(a._container)a._container.style.display=""},end:function(d,a){if(a._container)a._container.style.display= -"none"},_teardown:function(d){document.getElementById(d.target)&&document.getElementById(d.target).removeChild(d._container)}})})(Popcorn,this);(function(g){g.plugin("linkedin",{manifest:{about:{name:"Popcorn LinkedIn Plugin",version:"0.1",author:"Dan Ventura",website:"dsventura.blogspot.com"},options:{type:{elem:"input",type:"text",label:"Type"},url:{elem:"input",type:"text",label:"URL"},apikey:{elem:"input",type:"text",label:"API Key"},counter:{elem:"input",type:"text",label:"Counter"},memberid:{elem:"input",type:"text",label:"Member ID",optional:true},format:{elem:"input",type:"text",label:"Format",optional:true},companyid:{elem:"input", -type:"text",label:"Company ID",optional:true},modules:{elem:"input",type:"text",label:"Modules",optional:true},productid:{elem:"input",type:"text",label:"productid",optional:true},related:{elem:"input",type:"text",label:"related",optional:true},start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"linkedin-container"}},_setup:function(b){var d=b.apikey,a=document.getElementById(b.target),c=document.createElement("script");g.getScript("//platform.linkedin.com/in.js"); -b._container=document.createElement("div");b._container.appendChild(c);if(d)c.innerHTML="api_key: "+d;b.type=b.type&&b.type.toLowerCase()||"";var f=function(h){return{share:function(){c.setAttribute("type","IN/Share");h.counter&&c.setAttribute("data-counter",h.counter);h.url&&c.setAttribute("data-url",h.url)},memberprofile:function(){c.setAttribute("type","IN/MemberProfile");c.setAttribute("data-id",h.memberid);c.setAttribute("data-format",h.format||"inline");h.text&&h.format.toLowerCase()!=="inline"&& -c.setAttribute("data-text",h.text)},companyinsider:function(){c.setAttribute("type","IN/CompanyInsider");c.setAttribute("data-id",h.companyid);h.modules&&h._container.setAttribute("data-modules",h.modules)},companyprofile:function(){c.setAttribute("type","IN/CompanyProfile");c.setAttribute("data-id",h.companyid);c.setAttribute("data-format",h.format||"inline");h.text&&h.format.toLowerCase()!=="inline"&&c.setAttribute("data-text",h.text);h.related!==undefined&&c.setAttribute("data-related",h.related)}, -recommendproduct:function(){c.setAttribute("type","IN/RecommendProduct");c.setAttribute("data-company",h.companyid||"LinkedIn");c.setAttribute("data-product",h.productid||"201714");h.counter&&c.setAttribute("data-counter",h.counter)}}}(b);if(d)f[b.type]&&f[b.type]();else{b._container=document.createElement("p");b._container.innerHTML="Plugin requires a valid <a href='https://www.linkedin.com/secure/developer'>apikey</a>";if(!a&&g.plugin.debug)throw"target container doesn't exist";a&&a.appendChild(b._container)}if(!a&& -g.plugin.debug)throw Error("target container doesn't exist");a&&a.appendChild(b._container);b._container.style.display="none"},start:function(b,d){d._container.style.display="block"},end:function(b,d){d._container.style.display="none"},_teardown:function(b){var d=document.getElementById(b.target);d&&d.removeChild(b._container)}})})(Popcorn);(function(g){g.plugin("mustache",function(b){var d,a,c,f;g.getScript("http://mustache.github.com/extras/mustache.js");var h=!!b.dynamic,p=typeof b.template,o=typeof b.data,l=document.getElementById(b.target);if(!l&&g.plugin.debug)throw Error("target container doesn't exist");b.container=l||document.createElement("div");if(p==="function")if(h)c=b.template;else f=b.template(b);else if(p==="string")f=b.template;else if(g.plugin.debug)throw Error("Mustache Plugin Error: options.template must be a String or a Function."); -else f="";if(o==="function")if(h)d=b.data;else a=b.data(b);else if(o==="string")a=JSON.parse(b.data);else if(o==="object")a=b.data;else if(g.plugin.debug)throw Error("Mustache Plugin Error: options.data must be a String, Object, or Function.");else a="";return{start:function(i,r){var k=function(){if(window.Mustache){if(d)a=d(r);if(c)f=c(r);var j=Mustache.to_html(f,a).replace(/^\s*/mg,"");r.container.innerHTML=j}else setTimeout(function(){k()},10)};k()},end:function(i,r){r.container.innerHTML=""}, -_teardown:function(){d=a=c=f=null}}},{about:{name:"Popcorn Mustache Plugin",version:"0.1",author:"David Humphrey (@humphd)",website:"http://vocamus.net/dave"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"mustache-container",template:{elem:"input",type:"text",label:"Template"},data:{elem:"input",type:"text",label:"Data"},dynamic:{elem:"input",type:"text",label:"Dynamic",optional:true}}})})(Popcorn);(function(g){function b(a,c){if(a.map)a.map.div.style.display=c;else setTimeout(function(){b(a,c)},10)}var d=1;g.plugin("openmap",function(a){var c,f,h,p,o,l,i,r,k=document.getElementById(a.target);c=document.createElement("div");c.id="openmapdiv"+d;c.style.width="100%";c.style.height="100%";d++;if(!k&&g.plugin.debug)throw Error("target container doesn't exist");k&&k.appendChild(c);r=function(){if(window.OpenLayers){if(a.location){location=new OpenLayers.LonLat(0,0);g.getJSONP("//tinygeocoder.com/create-api.php?q="+ -a.location+"&callback=jsonp",function(v){f=new OpenLayers.LonLat(v[1],v[0]);a.map.setCenter(f)})}else f=new OpenLayers.LonLat(a.lng,a.lat);a.type=a.type||"ROADMAP";if(a.type==="SATELLITE"){a.map=new OpenLayers.Map({div:c,maxResolution:0.28125,tileSize:new OpenLayers.Size(512,512)});var j=new OpenLayers.Layer.WorldWind("LANDSAT","//worldwind25.arc.nasa.gov/tile/tile.aspx",2.25,4,{T:"105"});a.map.addLayer(j);p=new OpenLayers.Projection("EPSG:4326");h=new OpenLayers.Projection("EPSG:4326")}else if(a.type=== -"TERRAIN"){p=new OpenLayers.Projection("EPSG:4326");h=new OpenLayers.Projection("EPSG:4326");a.map=new OpenLayers.Map({div:c,projection:h});j=new OpenLayers.Layer.WMS("USGS Terraserver","//terraserver-usa.org/ogcmap.ashx?",{layers:"DRG"});a.map.addLayer(j)}else{h=new OpenLayers.Projection("EPSG:900913");p=new OpenLayers.Projection("EPSG:4326");f=f.transform(p,h);a.map=new OpenLayers.Map({div:c,projection:h,displayProjection:p});j=new OpenLayers.Layer.OSM;a.map.addLayer(j)}if(a.map)a.map.div.style.display= -"none"}else setTimeout(function(){r()},50)};r();return{_setup:function(j){window.OpenLayers||g.getScript("//openlayers.org/api/OpenLayers.js");var v=function(){if(j.map){j.zoom=j.zoom||2;if(j.zoom&&typeof j.zoom!=="number")j.zoom=+j.zoom;j.map.setCenter(f,j.zoom);if(j.markers){var w=OpenLayers.Util.extend({},OpenLayers.Feature.Vector.style["default"]),n=function(u){clickedFeature=u.feature;if(clickedFeature.attributes.text){i=new OpenLayers.Popup.FramedCloud("featurePopup",clickedFeature.geometry.getBounds().getCenterLonLat(), -new OpenLayers.Size(120,250),clickedFeature.attributes.text,null,true,function(){l.unselect(this.feature)});clickedFeature.popup=i;i.feature=clickedFeature;j.map.addPopup(i)}},y=function(u){feature=u.feature;if(feature.popup){i.feature=null;j.map.removePopup(feature.popup);feature.popup.destroy();feature.popup=null}},C=function(u){g.getJSONP("//tinygeocoder.com/create-api.php?q="+u.location+"&callback=jsonp",function(x){x=(new OpenLayers.Geometry.Point(x[1],x[0])).transform(p,h);var A=OpenLayers.Util.extend({}, -w);if(!u.size||isNaN(u.size))u.size=14;A.pointRadius=u.size;A.graphicOpacity=1;A.externalGraphic=u.icon;x=new OpenLayers.Feature.Vector(x,null,A);if(u.text)x.attributes={text:u.text};o.addFeatures([x])})};o=new OpenLayers.Layer.Vector("Point Layer",{style:w});j.map.addLayer(o);for(var e=0,m=j.markers.length;e<m;e++){var q=j.markers[e];if(q.text)if(!l){l=new OpenLayers.Control.SelectFeature(o);j.map.addControl(l);l.activate();o.events.on({featureselected:n,featureunselected:y})}if(q.location)C(q); -else{var s=(new OpenLayers.Geometry.Point(q.lng,q.lat)).transform(p,h),t=OpenLayers.Util.extend({},w);if(!q.size||isNaN(q.size))q.size=14;t.pointRadius=q.size;t.graphicOpacity=1;t.externalGraphic=q.icon;s=new OpenLayers.Feature.Vector(s,null,t);if(q.text)s.attributes={text:q.text};o.addFeatures([s])}}}}else setTimeout(function(){v()},13)};v()},start:function(j,v){b(v,"block")},end:function(j,v){b(v,"none")},_teardown:function(){k&&k.removeChild(c);c=map=f=h=p=o=l=i=null}}},{about:{name:"Popcorn OpenMap Plugin", -version:"0.3",author:"@mapmeld",website:"mapadelsur.blogspot.com"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"map-container",type:{elem:"select",options:["ROADMAP","SATELLITE","TERRAIN"],label:"Type",optional:true},zoom:{elem:"input",type:"text",label:"Zoom",optional:true},lat:{elem:"input",type:"text",label:"Lat",optional:true},lng:{elem:"input",type:"text",label:"Lng",optional:true},location:{elem:"input",type:"text",label:"Location"}, -markers:{elem:"input",type:"text",label:"List Markers",optional:true}}})})(Popcorn);document.addEventListener("click",function(g){g=g.target;if(g.nodeName==="A"||g.parentNode&&g.parentNode.nodeName==="A")Popcorn.instances.forEach(function(b){b.options.pauseOnLinkClicked&&b.pause()})},false);(function(g){var b={},d=0,a=document.createElement("span"),c=["webkit","Moz","ms","O",""],f=["Transform","TransitionDuration","TransitionTimingFunction"],h={},p;document.getElementsByTagName("head")[0].appendChild(a);for(var o=0,l=f.length;o<l;o++)for(var i=0,r=c.length;i<r;i++){p=c[i]+f[o];if(p in a.style){h[f[o].toLowerCase()]=p;break}}document.getElementsByTagName("head")[0].appendChild(a);g.plugin("wordriver",{manifest:{about:{name:"Popcorn WordRiver Plugin"},options:{start:{elem:"input",type:"text", -label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"wordriver-container",text:{elem:"input",type:"text",label:"Text"},color:{elem:"input",type:"text",label:"Color",optional:true}}},_setup:function(k){if(!document.getElementById(k.target)&&g.plugin.debug)throw Error("target container doesn't exist");k._duration=k.end-k.start;var j;if(!(j=b[k.target])){j=k.target;b[j]=document.createElement("div");var v=document.getElementById(j);v&&v.appendChild(b[j]);b[j].style.height="100%";b[j].style.position= -"relative";j=b[j]}k._container=j;k.word=document.createElement("span");k.word.style.position="absolute";k.word.style.whiteSpace="nowrap";k.word.style.opacity=0;k.word.style.MozTransitionProperty="opacity, -moz-transform";k.word.style.webkitTransitionProperty="opacity, -webkit-transform";k.word.style.OTransitionProperty="opacity, -o-transform";k.word.style.transitionProperty="opacity, transform";k.word.style[h.transitionduration]="1s, "+k._duration+"s";k.word.style[h.transitiontimingfunction]="linear"; -k.word.innerHTML=k.text;k.word.style.color=k.color||"black"},start:function(k,j){j._container.appendChild(j.word);j.word.style[h.transform]="";j.word.style.fontSize=~~(30+20*Math.random())+"px";d%=j._container.offsetWidth-j.word.offsetWidth;j.word.style.left=d+"px";d+=j.word.offsetWidth+10;j.word.style[h.transform]="translateY("+(j._container.offsetHeight-j.word.offsetHeight)+"px)";j.word.style.opacity=1;setTimeout(function(){j.word.style.opacity=0},(j.end-j.start-1||1)*1E3)},end:function(k,j){j.word.style.opacity= -0},_teardown:function(k){var j=document.getElementById(k.target);k.word.parentNode&&k._container.removeChild(k.word);b[k.target]&&!b[k.target].childElementCount&&j&&j.removeChild(b[k.target])&&delete b[k.target]}})})(Popcorn);(function(g){g.plugin("processing",function(b){var d=function(a){function c(f){var h=function(){a.listen("pause",function(){f.canvas.style.display==="inline"&&f.pjsInstance.noLoop()});a.listen("play",function(){f.canvas.style.display==="inline"&&f.pjsInstance.loop()})};if(f.sketch)g.xhr({url:f.sketch,dataType:"text",success:function(p){f.codeReady=false;p=Processing.compile(p);f.pjsInstance=new Processing(f.canvas,p);f.seeking=false;f._running&&!a.media.paused&&f.pjsInstance.loop()||f.pjsInstance.noLoop(); -a.listen("seeking",function(){f._running&&f.canvas.style.display==="inline"&&f.noPause&&f.pjsInstance.loop()});f.noPause=f.noPause||false;!f.noPause&&h();f.codeReady=true}});else if(g.plugin.debug)throw Error("Popcorn.Processing: options.sketch is undefined");}window.Processing?c(b):g.getScript("//cloud.github.com/downloads/processing-js/processing-js/processing-1.3.6.min.js",function(){c(b)})};return{_setup:function(a){a.codeReady=false;a.parentTarget=document.getElementById(a.target);if(!a.parentTarget&& -g.plugin.debug)throw Error("target container doesn't exist");var c=document.createElement("canvas");c.id=g.guid(a.target+"-sketch");c.style.display="none";a.canvas=c;a.parentTarget&&a.parentTarget.appendChild(a.canvas);d(this)},start:function(a,c){c.codeReady&&!this.media.paused&&c.pjsInstance.loop();c.canvas.style.display="inline"},end:function(a,c){c.pjsInstance&&c.pjsInstance.noLoop();c.canvas.style.display="none"},_teardown:function(a){a.pjsInstance&&a.pjsInstance.exit();a.parentTarget&&a.parentTarget.removeChild(a.canvas)}}}, -{about:{name:"Popcorn Processing Plugin",version:"0.1",author:"Christopher De Cairos, Benjamin Chalovich",website:"cadecairos.blogspot.com, ben1amin.wordpress.org"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:{elem:"input",type:"text",label:"Target"},sketch:{elem:"input",type:"url",label:"Sketch"},noPause:{elem:"select",options:["TRUE","FALSE"],label:"No Loop",optional:true}}})})(Popcorn);(function(g){var b=1;g.plugin("timeline",function(d){var a=document.getElementById(d.target),c=document.createElement("div"),f,h=true;if(a&&!a.firstChild){a.appendChild(f=document.createElement("div"));f.style.width="inherit";f.style.height="inherit";f.style.overflow="auto"}else f=a.firstChild;c.style.display="none";c.id="timelineDiv"+b;d.direction=d.direction||"up";if(d.direction.toLowerCase()==="down")h=false;if(a&&f)h?f.insertBefore(c,f.firstChild):f.appendChild(c);else if(g.plugin.debug)throw Error("target container doesn't exist"); -b++;c.innerHTML="<p><span id='big' style='font-size:24px; line-height: 130%;' >"+d.title+"</span><br /><span id='mid' style='font-size: 16px;'>"+d.text+"</span><br />"+d.innerHTML;return{start:function(p,o){c.style.display="block";if(o.direction==="down")f.scrollTop=f.scrollHeight},end:function(){c.style.display="none"},_teardown:function(){f&&c&&f.removeChild(c)&&!f.firstChild&&a.removeChild(f)}}},{about:{name:"Popcorn Timeline Plugin",version:"0.1",author:"David Seifried @dcseifried",website:"dseifried.wordpress.com"}, -options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"feed-container",title:{elem:"input",type:"text",label:"title"},text:{elem:"input",type:"text",label:"text"},innerHTML:{elem:"input",type:"text",label:"innerHTML",optional:true},direction:{elem:"input",type:"text",label:"direction",optional:true}}})})(Popcorn);(function(g,b){var d={};g.plugin("documentcloud",{manifest:{about:{name:"Popcorn Document Cloud Plugin",version:"0.1",author:"@humphd, @ChrisDeCairos",website:"http://vocamus.net/dave"},options:{start:{elem:"input",type:"text",label:"In"},end:{elem:"input",type:"text",label:"Out"},target:"documentcloud-container",width:{elem:"input",type:"text",label:"Width",optional:true},height:{elem:"input",type:"text",label:"Height",optional:true},src:{elem:"input",type:"text",label:"PDF URL"},preload:{elem:"input", -type:"boolean",label:"Preload",optional:true},page:{elem:"input",type:"number",label:"Page Number",optional:true},aid:{elem:"input",type:"number",label:"Annotation Id",optional:true}}},_setup:function(a){function c(){function i(u){a._key=u.api.getId();a._changeView=function(x){a.aid?x.pageSet.showAnnotation(x.api.getAnnotation(a.aid)):x.api.setCurrentPage(a.page)}}function r(){d[a._key]={num:1,id:a._containerId};h.loaded=true}h.loaded=false;var k=a.url.replace(/\.html$/,".js"),j=a.target,v=b.getElementById(j), -w=b.createElement("div"),n=g.position(v),y=a.width||n.width;n=a.height||n.height;var C=a.sidebar||true,e=a.text||true,m=a.pdf||true,q=a.showAnnotations||true,s=a.zoom||700,t=a.search||true;if(!function(u){var x=false;g.forEach(h.viewers,function(A){if(A.api.getSchema().canonicalURL===u){i(A);A=d[a._key];a._containerId=A.id;A.num+=1;x=true;h.loaded=true}});return x}(a.url)){w.id=a._containerId=g.guid(j);j="#"+w.id;v.appendChild(w);p.trigger("documentready");h.load(k,{width:y,height:n,sidebar:C,text:e, -pdf:m,showAnnotations:q,zoom:s,search:t,container:j,afterLoad:a.page||a.aid?function(u){i(u);a._changeView(u);w.style.visibility="hidden";u.elements.pages.hide();r()}:function(u){i(u);r();w.style.visibility="hidden";u.elements.pages.hide()}})}}function f(){window.DV.loaded?c():setTimeout(f,25)}var h=window.DV=window.DV||{},p=this;if(h.loading)f();else{h.loading=true;h.recordHit="//www.documentcloud.org/pixel.gif";var o=b.createElement("link"),l=b.getElementsByTagName("head")[0];o.rel="stylesheet"; -o.type="text/css";o.media="screen";o.href="//s3.documentcloud.org/viewer/viewer-datauri.css";l.appendChild(o);h.loaded=false;g.getScript("http://s3.documentcloud.org/viewer/viewer.js",function(){h.loading=false;c()})}},start:function(a,c){var f=b.getElementById(c._containerId),h=DV.viewers[c._key];(c.page||c.aid)&&h&&c._changeView(h);if(f&&h){f.style.visibility="visible";h.elements.pages.show()}},end:function(a,c){var f=b.getElementById(c._containerId);if(f&&DV.viewers[c._key]){f.style.visibility= -"hidden";DV.viewers[c._key].elements.pages.hide()}},_teardown:function(a){var c=b.getElementById(a._containerId);if((a=a._key)&&DV.viewers[a]&&--d[a].num===0){for(DV.viewers[a].api.unload();c.hasChildNodes();)c.removeChild(c.lastChild);c.parentNode.removeChild(c)}}})})(Popcorn,window.document);(function(g){g.parser("parseJSON","JSON",function(b){var d={title:"",remote:"",data:[]};g.forEach(b.data,function(a){d.data.push(a)});return d})})(Popcorn);(function(g){g.parser("parseSBV",function(b){var d={title:"",remote:"",data:[]},a=[],c=0,f=0,h=function(k){k=k.split(":");var j=k.length-1,v;try{v=parseInt(k[j-1],10)*60+parseFloat(k[j],10);if(j===2)v+=parseInt(k[0],10)*3600}catch(w){throw"Bad cue";}return v},p=function(k,j){var v={};v[k]=j;return v};b=b.text.split(/(?:\r\n|\r|\n)/gm);for(f=b.length;c<f;){var o={},l=[],i=b[c++].split(",");try{o.start=h(i[0]);for(o.end=h(i[1]);c<f&&b[c];)l.push(b[c++]);o.text=l.join("<br />");a.push(p("subtitle",o))}catch(r){for(;c< -f&&b[c];)c++}for(;c<f&&!b[c];)c++}d.data=a;return d})})(Popcorn);(function(g){g.parser("parseSRT",function(b){var d={title:"",remote:"",data:[]},a=[],c=0,f=0,h=0,p,o,l,i=function(k){k=k.split(":");try{var j=k[2].split(",");if(j.length===1)j=k[2].split(".");return parseFloat(k[0],10)*3600+parseFloat(k[1],10)*60+parseFloat(j[0],10)+parseFloat(j[1],10)/1E3}catch(v){return 0}},r=function(k,j){var v={};v[k]=j;return v};b=b.text.split(/(?:\r\n|\r|\n)/gm);f=b.length;for(c=0;c<f;c++){l={};o=[];l.id=parseInt(b[c++],10);p=b[c++].split(/[\t ]*--\>[\t ]*/);l.start=i(p[0]); -h=p[1].indexOf(" ");if(h!==-1)p[1]=p[1].substr(0,h);for(l.end=i(p[1]);c<f&&b[c];)o.push(b[c++]);l.text=o.join("\\N").replace(/\{(\\[\w]+$?([\w\d]+,?)+$?)+\}/gi,"");l.text=l.text.replace(/</g,"<").replace(/>/g,">");l.text=l.text.replace(/<(\/?(font|b|u|i|s))((\s+(\w|\w[\w\-]*\w)(\s*=\s*(?:\".*?\"|'.*?'|[^'\">\s]+))?)+\s*|\s*)(\/?)>/gi,"<$1$3$7>");l.text=l.text.replace(/\\N/gi,"<br />");a.push(r("subtitle",l))}d.data=a;return d})})(Popcorn);(function(g){function b(c,f){var h=c.substr(10).split(","),p;p={start:d(h[f.start]),end:d(h[f.end])};if(p.start===-1||p.end===-1)throw"Invalid time";var o=k.call(i,/\{(\\[\w]+$?([\w\d]+,?)+$?)+\}/gi,""),l=o.replace,i;i=h.length;k=[];for(var r=f.text;r<i;r++)k.push(h[r]);i=k.join(",");var k=i.replace;p.text=l.call(o,/\\N/gi,"<br />");return p}function d(c){var f=c.split(":");if(c.length!==10||f.length<3)return-1;return parseInt(f[0],10)*3600+parseInt(f[1],10)*60+parseFloat(f[2],10)}function a(c, -f){var h={};h[c]=f;return h}g.parser("parseSSA",function(c){var f={title:"",remote:"",data:[]},h=[],p=0,o;c=c.text.split(/(?:\r\n|\r|\n)/gm);for(o=c.length;p<o&&c[p]!=="[Events]";)p++;var l=c[++p].substr(8).split(", "),i={},r,k;k=0;for(r=l.length;k<r;k++)if(l[k]==="Start")i.start=k;else if(l[k]==="End")i.end=k;else if(l[k]==="Text")i.text=k;for(;++p<o&&c[p]&&c[p][0]!=="[";)try{h.push(a("subtitle",b(c[p],i)))}catch(j){}f.data=h;return f})})(Popcorn);(function(g){g.parser("parseTTML",function(b){var d={title:"",remote:"",data:[]},a,c=0,f,h=function(l,i){if(!l)return-1;var r=l.split(":"),k=r.length-1;if(k>=2)return parseInt(r[0],10)*3600+parseInt(r[k-1],10)*60+parseFloat(r[k],10);for(r=l.length-1;r>=0;r--)if(l[r]<="9"&&l[r]>="0")break;r++;k=l.substr(r);i=i||0;if(k==="h")k=3600;else if(k==="m")k=60;else if(k==="s")k=1;else if(k==="ms")k=0.0010;else return-1;return parseFloat(l.substr(0,r))*k+i},p=function(l,i){var r={};r[l]=i;return r},o=function(l, -i){for(var r=l.firstChild,k;r;){if(r.nodeType===1)if(r.nodeName==="p"){k=r;var j=i,v={};v.text=k.textContent.replace(/^[\s]+|[\s]+$/gm,"").replace(/(?:\r\n|\r|\n)/gm,"<br />");v.id=k.getAttribute("xml:id")||k.getAttribute("id");v.start=h(k.getAttribute("begin"),j);v.end=h(k.getAttribute("end"),j);v.target=f;if(v.end<0){v.end=h(k.getAttribute("duration"),0);if(v.end>=0)v.end+=v.start;else v.end=Number.MAX_VALUE}k=v;d.data.push(p("subtitle",k));c++}else if(r.nodeName==="div"){k=h(r.getAttribute("begin")); -if(k<0)k=i;o(r,k)}r=r.nextSibling}};if(!b.xml||!b.xml.documentElement||!(a=b.xml.documentElement.firstChild))return d;for(;a.nodeName!=="body";)a=a.nextSibling;f="";o(a,0);return d})})(Popcorn);(function(g){g.parser("parseTTXT",function(b){var d={title:"",remote:"",data:[]},a=function(o){o=o.split(":");var l=0;try{return parseFloat(o[0],10)*60*60+parseFloat(o[1],10)*60+parseFloat(o[2],10)}catch(i){l=0}return l},c=function(o,l){var i={};i[o]=l;return i};b=b.xml.lastChild.lastChild;for(var f=Number.MAX_VALUE,h=[];b;){if(b.nodeType===1&&b.nodeName==="TextSample"){var p={};p.start=a(b.getAttribute("sampleTime"));p.text=b.getAttribute("text");if(p.text){p.end=f-0.0010;h.push(c("subtitle",p))}f= -p.start}b=b.previousSibling}d.data=h.reverse();return d})})(Popcorn);(function(g){function b(a){var c=a.split(":");a=a.length;var f;if(a!==12&&a!==9)throw"Bad cue";a=c.length-1;try{f=parseInt(c[a-1],10)*60+parseFloat(c[a],10);if(a===2)f+=parseInt(c[0],10)*3600}catch(h){throw"Bad cue";}return f}function d(a,c){var f={};f[a]=c;return f}g.parser("parseVTT",function(a){var c={title:"",remote:"",data:[]},f=[],h=0,p=0,o,l;a=a.text.split(/(?:\r\n|\r|\n)/gm);p=a.length;if(p===0||a[0]!=="WEBVTT")return c;for(h++;h<p;){o=[];try{for(var i=h;i<p&&!a[i];)i++;h=i;var r=a[h++];i= -void 0;var k={};if(!r||r.indexOf("--\>")===-1)throw"Bad cue";i=r.replace(/--\>/," --\> ").split(/[\t ]+/);if(i.length<2)throw"Bad cue";k.id=r;k.start=b(i[0]);k.end=b(i[2]);for(l=k;h<p&&a[h];)o.push(a[h++]);l.text=o.join("<br />");f.push(d("subtitle",l))}catch(j){for(h=h;h<p&&a[h];)h++;h=h}}c.data=f;return c})})(Popcorn);(function(g){g.parser("parseXML","XML",function(b){var d={title:"",remote:"",data:[]},a={},c=function(i){i=i.split(":");if(i.length===1)return parseFloat(i[0],10);else if(i.length===2)return parseFloat(i[0],10)+parseFloat(i[1]/12,10);else if(i.length===3)return parseInt(i[0]*60,10)+parseFloat(i[1],10)+parseFloat(i[2]/12,10);else if(i.length===4)return parseInt(i[0]*3600,10)+parseInt(i[1]*60,10)+parseFloat(i[2],10)+parseFloat(i[3]/12,10)},f=function(i){for(var r={},k=0,j=i.length;k<j;k++){var v=i.item(k).nodeName, -w=i.item(k).nodeValue;if(v==="in")r.start=c(w);else if(v==="out")r.end=c(w);else if(v==="resourceid")g.extend(r,a[w]);else r[v]=w}return r},h=function(i,r){var k={};k[i]=r;return k},p=function(i,r,k){var j={};g.extend(j,r,f(i.attributes),{text:i.textContent});r=i.childNodes;if(r.length<1||r.length===1&&r[0].nodeType===3)if(k)a[j.id]=j;else d.data.push(h(i.nodeName,j));else for(i=0;i<r.length;i++)r[i].nodeType===1&&p(r[i],j,k)};b=b.documentElement.childNodes;for(var o=0,l=b.length;o<l;o++)if(b[o].nodeType=== -1)b[o].nodeName==="manifest"?p(b[o],{},true):p(b[o],{},false);return d})})(Popcorn);(function(g,b){function d(l,i){if(l.currentStyle)return l.currentStyle[i];else if(b.getComputedStyle)return document.defaultView.getComputedStyle(l,null).getPropertyValue(i)}function a(l){return'<div><a href="'+l.user.profile+'"><img width="16px height="16px" src="'+l.user.avatar+'"></img>'+l.user.name+"</a> at "+function(i){var r=h(i/60);i=p(i%60);return r+"."+(i<10?"0":"")+i}(l.start)+" "+function(i){function r(k,j){return k+" "+j+(k>1?"s":"")+" ago"}i=((new Date).getTime()-i.getTime())/1E3;if(i< -60)return r(p(i),"second");i/=60;if(i<60)return r(p(i),"minute");i/=60;if(i<24)return r(p(i),"hour");i/=24;if(i<30)return r(p(i),"day");if(i<365)return r(p(i/30),"month");return r(p(i/365),"year")}(l.date)+"<br />"+l.text+"</span>"}function c(l){if(b.swfobject&&b.soundcloud){var i={enable_api:true,object_id:l._playerId,url:l.src,show_comments:!l._options.api.key&&!l._options.api.commentdiv},r={id:l._playerId,name:l._playerId},k=document.createElement("div");k.setAttribute("id",l._playerId);l._container.appendChild(k); -swfobject.embedSWF("http://player.soundcloud.com/player.swf",l._playerId,l.offsetWidth,l.height,"9.0.0","expressInstall.swf",i,{allowscriptaccess:"always",wmode:"transparent"},r)}else setTimeout(function(){c(l)},15)}var f=Math.abs,h=Math.floor,p=Math.round,o={};g.soundcloud=function(l,i,r){g.getScript("http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js");g.getScript("http://popcornjs.org/code/players/soundcloud/lib/soundcloud.player.api.js",function(){var k=1;soundcloud.addEventListener("onPlayerReady", -function(j,v){var w=o[j.api_getFlashId()];w.swfObj=j;w.duration=j.api_getTrackDuration();w.currentTime=j.api_getTrackPosition();w.volume=w.previousVolume=j.api_getVolume()/100;w._mediaId=v.mediaId;w.dispatchEvent("load");w.dispatchEvent("canplay");w.dispatchEvent("durationchange");w.timeupdate()});soundcloud.addEventListener("onMediaStart",function(j){j=o[j.api_getFlashId()];j.played=1;j.dispatchEvent("playing")});soundcloud.addEventListener("onMediaPlay",function(j){if(k)k=0;else o[j.api_getFlashId()].dispatchEvent("play")}); -soundcloud.addEventListener("onMediaPause",function(j){o[j.api_getFlashId()].dispatchEvent("pause")});soundcloud.addEventListener("onMediaBuffering",function(j){j=o[j.api_getFlashId()];j.dispatchEvent("progress");if(j.readyState===0){j.readyState=3;j.dispatchEvent("readystatechange")}});soundcloud.addEventListener("onMediaDoneBuffering",function(j){o[j.api_getFlashId()].dispatchEvent("canplaythrough")});soundcloud.addEventListener("onMediaEnd",function(j){j=o[j.api_getFlashId()];j.paused=1;j.dispatchEvent("ended")}); -soundcloud.addEventListener("onMediaSeek",function(j){var v=o[j.api_getFlashId()];v.setCurrentTime(j.api_getTrackPosition());v.paused&&v.dispatchEvent("timeupdate")});soundcloud.addEventListener("onPlayerError",function(j){o[j.api_getFlashId()].dispatchEvent("error")})});return new g.soundcloud.init(l,i,r)};g.soundcloud.init=function(){function l(i){var r=i._options,k=i._container,j=k.getBoundingClientRect();i.width=r.width||d(k,"width")||"100%";i.height=r.height||d(k,"height")||"81px";i.src=r.src; -i.autoplay=r.autoplay;if(parseFloat(i.height,10)!==81)i.height="81px";i.offsetLeft=j.left;i.offsetTop=j.top;i.offsetHeight=parseFloat(i.height,10);i.offsetWidth=parseFloat(i.width,10);if(/[\d]+%/.test(i.width)){r=d(k,"width");i._container.style.width=i.width;i.offsetWidth=i._container.offsetWidth;i._container.style.width=r}if(/[\d]+%/.test(i.height)){r=d(k,"height");i._container.style.height=i.height;i.offsetHeight=i._container.offsetHeight;i._container.style.height=r}}return function(i,r,k){if(i)if(r){if(/file/.test(location.protocol))throw"Must run from a web server!"; -}else throw"Must supply a source!";else throw"Must supply an id!";if(!(this._container=document.getElementById(i)))throw"Could not find that container in the DOM!";k=k||{};k.api=k.api||{};k.target=i;k.src=r;k.api.commentformat=k.api.commentformat||a;this._mediaId=0;this._listeners={};this._playerId=g.guid(k.target);this._containerId=k.target;this._options=k;this._comments=[];this._popcorn=null;l(this);this.duration=0;this.volume=1;this.ended=this.currentTime=0;this.paused=1;this.readyState=0;this.playbackRate= -1;this.left=this.top=0;this.autoplay=null;this.played=0;this.addEventListener("load",function(){var j=this.getBoundingClientRect();this.top=j.top;this.left=j.left;this.offsetWidth=this.swfObj.offsetWidth;this.offsetHeight=this.swfObj.offsetHeight;this.offsetLeft=this.swfObj.offsetLeft;this.offsetTop=this.swfObj.offsetTop});o[this._playerId]=this;c(this)}}();g.soundcloud.init.prototype=g.soundcloud.prototype;g.extend(g.soundcloud.prototype,{setVolume:function(l){if(!(!l&&l!==0)){if(l<0)l=-l;if(l>1)l%= -1;this.volume=this.previousVolume=l;this.swfObj.api_setVolume(l*100);this.dispatchEvent("volumechange")}},setCurrentTime:function(l){if(!(!l&&l!==0)){this.currentTime=this.previousCurrentTime=l;this.ended=l>=this.duration;this.dispatchEvent("seeked")}},play:function(){if(this.swfObj){if(this.paused){this.paused=0;this.swfObj.api_play()}}else this.addEventListener("load",this.play)},pause:function(){if(this.swfObj){if(!this.paused){this.paused=1;this.swfObj.api_pause()}}else this.addEventListener("load", -this.pause)},mute:function(){if(this.swfObj)if(this.muted())if(this.paused)this.setVolume(this.oldVol);else this.volume=this.oldVol;else{this.oldVol=this.volume;if(this.paused)this.setVolume(0);else this.volume=0}else this.addEventListener("load",this.mute)},muted:function(){return this.volume===0},load:function(){if(this.swfObj){this.play();this.pause()}else this.addEventListener("load",this.load)},addEventListener:function(l,i){this._listeners[l]||(this._listeners[l]=[]);this._listeners[l].push(i); -return i},dispatchEvent:function(l){var i=this;l=l.type||l;l==="play"&&this.paused||l==="pause"&&!this.paused?this[l]():g.forEach(this._listeners[l],function(r){r.call(i)})},timeupdate:function(){var l=this,i=this.swfObj.api_getVolume()/100;if(f(this.currentTime-this.previousCurrentTime)>0.25)this.swfObj.api_seekTo(this.currentTime);else this.previousCurrentTime=this.currentTime=this.swfObj.api_getTrackPosition();if(i!==this.previousVolume)this.setVolume(i);else this.volume!==this.previousVolume&& -this.setVolume(this.volume);this.paused||this.dispatchEvent("timeupdate");l.ended||setTimeout(function(){l.timeupdate.call(l)},33)},getBoundingClientRect:function(){var l;if(this.swfObj){l=this.swfObj.getBoundingClientRect();return{bottom:l.bottom,left:l.left,right:l.right,top:l.top,width:l.width||l.right-l.left,height:l.height||l.bottom-l.top}}else{tmp=this._container.getBoundingClientRect();return{left:tmp.left,top:tmp.top,width:this.offsetWidth,height:this.offsetHeight,bottom:tmp.top+this.width, -right:tmp.top+this.height}}},registerPopcornWithPlayer:function(l){if(this.swfObj){this._popcorn=l;var i=this._options.api;if(i.key&&i.commentdiv){var r=this;g.xhr({url:"http://api.soundcloud.com/tracks/"+r._mediaId+"/comments.js?consumer_key="+i.key,success:function(k){g.forEach(k.json,function(j){r.addComment({start:j.timestamp/1E3,date:new Date(j.created_at),text:j.body,user:{name:j.user.username,profile:j.user.permalink_url,avatar:j.user.avatar_url}})})}})}}else this.addEventListener("load",function(){this.registerPopcornWithPlayer(l)})}}); -g.extend(g.soundcloud.prototype,{addComment:function(l,i){var r=this,k={start:l.start||0,date:l.date||new Date,text:l.text||"",user:{name:l.user.name||"",profile:l.user.profile||"",avatar:l.user.avatar||""},display:function(){return(i||r._options.api.commentformat)(k)}};this._comments.push(k);this._popcorn&&this._popcorn.subtitle({start:k.start,target:this._options.api.commentdiv,display:"inline",language:"en",text:k.display()})}})})(Popcorn,window);(function(){vimeo_player_loaded=function(g){vimeo_player_loaded[g]&&vimeo_player_loaded[g]()};vimeo_player_loaded.seek={};vimeo_player_loaded.loadProgress={};vimeo_player_loaded.play={};vimeo_player_loaded.pause={};Popcorn.player("vimeo",{_canPlayType:function(g,b){return/(?:http:\/\/www\.|http:\/\/|www\.|\.|^)(vimeo)/.test(b)&&g.toLowerCase()!=="video"},_setup:function(g){var b=this,d,a=document.createElement("div"),c=0,f=false,h=0,p,o;a.id=b.id+Popcorn.guid();b.appendChild(a);o=b.style.width?""+ -b.offsetWidth:"560";p=b.style.height?""+b.offsetHeight:"315";var l=function(){var i;i=b.src;var r=0,k=false;vimeo_player_loaded[a.id]=function(){d=document.getElementById(a.id);vimeo_player_loaded.seek[a.id]=function(w){if(w!==c){c=w;b.dispatchEvent("seeked");b.dispatchEvent("timeupdate")}};vimeo_player_loaded.play[a.id]=function(){if(b.paused){b.paused=false;b.dispatchEvent("play");b.dispatchEvent("playing");j()}};vimeo_player_loaded.pause[a.id]=function(){if(!b.paused){b.paused=true;b.dispatchEvent("pause")}}; -vimeo_player_loaded.loadProgress[a.id]=function(w){if(!k){k=true;b.dispatchEvent("loadstart")}w.percent===100&&b.dispatchEvent("canplaythrough")};d.api_addEventListener("seek","vimeo_player_loaded.seek."+a.id);d.api_addEventListener("loadProgress","vimeo_player_loaded.loadProgress."+a.id);d.api_addEventListener("play","vimeo_player_loaded.play."+a.id);d.api_addEventListener("pause","vimeo_player_loaded.pause."+a.id);var j=function(){if(!b.paused){c=d.api_getCurrentTime();b.dispatchEvent("timeupdate"); -setTimeout(j,10)}},v=function(){var w=d.api_getVolume()===0,n=d.api_getVolume();if(f!==w){f=w;b.dispatchEvent("volumechange")}if(h!==n){h=n;b.dispatchEvent("volumechange")}setTimeout(v,250)};b.play=function(){b.paused=false;b.dispatchEvent("play");b.dispatchEvent("playing");j();d.api_play()};b.pause=function(){if(!b.paused){b.paused=true;b.dispatchEvent("pause");d.api_pause()}};Popcorn.player.defineProperty(b,"currentTime",{set:function(w){if(!w)return c;c=+w;b.dispatchEvent("seeked");b.dispatchEvent("timeupdate"); -d.api_seekTo(c);return c},get:function(){return c}});Popcorn.player.defineProperty(b,"muted",{set:function(w){if(d.api_getVolume()===0!==w)if(w){r=d.api_getVolume();d.api_setVolume(0)}else d.api_setVolume(r)},get:function(){return d.api_getVolume()===0}});Popcorn.player.defineProperty(b,"volume",{set:function(w){if(!w||typeof w!=="number"||w<0||w>1)return d.api_getVolume()/100;if(d.api_getVolume()!==w){d.api_setVolume(w*100);h=d.api_getVolume();b.dispatchEvent("volumechange")}return d.api_getVolume()/ -100},get:function(){return d.api_getVolume()/100}});b.dispatchEvent("loadedmetadata");b.dispatchEvent("loadeddata");b.duration=d.api_getDuration();b.dispatchEvent("durationchange");v();b.readyState=4;b.dispatchEvent("canplaythrough")};i=/\d+$/.exec(i);i={clip_id:i?i[0]:0,api:1,js_swf_id:a.id};Popcorn.extend(i,g);swfobject.embedSWF("//vimeo.com/moogaloop.swf",a.id,o,p,"9.0.0","expressInstall.swf",i,{allowscriptaccess:"always",allowfullscreen:"true",wmode:"transparent"},{})};window.swfobject?l():Popcorn.getScript("//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", -l)}})})();var onYouTubePlayerReady=function(g){onYouTubePlayerReady[g]&&onYouTubePlayerReady[g]()};onYouTubePlayerReady.stateChangeEventHandler={};onYouTubePlayerReady.onErrorEventHandler={}; -Popcorn.player("youtube",{_canPlayType:function(g,b){return/(?:http:\/\/www\.|http:\/\/|www\.|\.|^)(youtu)/.test(b)&&g.toLowerCase()!=="video"},_setup:function(g){var b=this,d=false,a=document.createElement("div"),c=0,f=0,h=true,p=false,o=false,l=100;b.paused=undefined;a.id=b.id+Popcorn.guid();g._container=a;b.appendChild(a);var i=function(){var r,k,j,v,w;onYouTubePlayerReady[a.id]=function(){g.youtubeObject=document.getElementById(a.id);onYouTubePlayerReady.stateChangeEventHandler[a.id]=function(C){if(!g.destroyed)if(C=== -2)if(p&&f===c&&f!==g.youtubeObject.getCurrentTime()){p=false;g.youtubeObject.seekTo(c)}else{c=g.youtubeObject.getCurrentTime();b.dispatchEvent("timeupdate");!b.paused&&b.pause()}else if(C===1&&!h)b.paused&&b.play();else if(C===-1)g.youtubeObject.playVideo();else if(C===1&&h){h=false;if(b.paused===true)b.pause();else if(b.paused===false)b.play();else if(d)b.play();else d||b.pause();b.duration=g.youtubeObject.getDuration();b.dispatchEvent("durationchange");y();b.dispatchEvent("loadedmetadata");b.dispatchEvent("loadeddata"); -b.readyState=4;b.dispatchEvent("canplaythrough")}else C===0&&b.dispatchEvent("ended")};onYouTubePlayerReady.onErrorEventHandler[a.id]=function(C){[2,100,101,150].indexOf(C)!==-1&&b.dispatchEvent("error")};g.youtubeObject.addEventListener("onStateChange","onYouTubePlayerReady.stateChangeEventHandler."+a.id);g.youtubeObject.addEventListener("onError","onYouTubePlayerReady.onErrorEventHandler."+a.id);var n=function(){if(!g.destroyed)if(!b.paused){c=g.youtubeObject.getCurrentTime();b.dispatchEvent("timeupdate"); -setTimeout(n,10)}},y=function(){if(!g.destroyed){if(o!==g.youtubeObject.isMuted()){o=g.youtubeObject.isMuted();b.dispatchEvent("volumechange")}if(l!==g.youtubeObject.getVolume()){l=g.youtubeObject.getVolume();b.dispatchEvent("volumechange")}setTimeout(y,250)}};b.play=function(){if(!g.destroyed){if(b.paused!==false||g.youtubeObject.getPlayerState()!==1){b.paused=false;b.dispatchEvent("play");b.dispatchEvent("playing")}n();g.youtubeObject.playVideo()}};b.pause=function(){if(!g.destroyed)if(b.paused!== -true||g.youtubeObject.getPlayerState()!==2){b.paused=true;b.dispatchEvent("pause");g.youtubeObject.pauseVideo()}};Popcorn.player.defineProperty(b,"currentTime",{set:function(C){c=f=+C;p=true;if(g.destroyed)return c;b.dispatchEvent("seeked");b.dispatchEvent("timeupdate");g.youtubeObject.seekTo(c);return c},get:function(){return c}});Popcorn.player.defineProperty(b,"muted",{set:function(C){if(g.destroyed)return C;if(g.youtubeObject.isMuted()!==C){C?g.youtubeObject.mute():g.youtubeObject.unMute();o= -g.youtubeObject.isMuted();b.dispatchEvent("volumechange")}return g.youtubeObject.isMuted()},get:function(){if(g.destroyed)return 0;return g.youtubeObject.isMuted()}});Popcorn.player.defineProperty(b,"volume",{set:function(C){if(g.destroyed)return C;if(g.youtubeObject.getVolume()/100!==C){g.youtubeObject.setVolume(C*100);l=g.youtubeObject.getVolume();b.dispatchEvent("volumechange")}return g.youtubeObject.getVolume()/100},get:function(){if(g.destroyed)return 0;return g.youtubeObject.getVolume()/100}})}; -g.controls=+g.controls===0||+g.controls===1?g.controls:1;g.annotations=+g.annotations===1||+g.annotations===3?g.annotations:1;r={playerapiid:a.id};k=/^.*(?:\/|v=)(.{11})/.exec(b.src)[1];w=(b.src.split("?")[1]||"").replace(/v=.{11}/,"");d=/autoplay=1/.test(w);j=b.style.width?""+b.offsetWidth:"560";v=b.style.height?""+b.offsetHeight:"315";k={id:a.id,"data-youtube-player":"//www.youtube.com/e/"+k+"?"+w+"&enablejsapi=1&playerapiid="+a.id+"&version=3"};swfobject.embedSWF(k["data-youtube-player"],a.id, -j,v,"8",undefined,r,{wmode:"transparent",allowScriptAccess:"always"},k)};window.swfobject?i():Popcorn.getScript("//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js",i)},_teardown:function(g){g.destroyed=true;g.youtubeObject.stopVideo();g.youtubeObject.clearVideo();this.removeChild(document.getElementById(g._container.id))}}); +(function(r,f){function n(a,g){return function(){if(d.plugin.debug)return a.apply(this,arguments);try{return a.apply(this,arguments)}catch(l){d.plugin.errors.push({plugin:g,thrown:l,source:a.toString()});this.emit("pluginerror",d.plugin.errors)}}}if(f.addEventListener){var c=Array.prototype,b=Object.prototype,e=c.forEach,h=c.slice,i=b.hasOwnProperty,j=b.toString,p=r.Popcorn,m=[],o=false,q={events:{hash:{},apis:{}}},s=function(){return r.requestAnimationFrame||r.webkitRequestAnimationFrame||r.mozRequestAnimationFrame|| +r.oRequestAnimationFrame||r.msRequestAnimationFrame||function(a){r.setTimeout(a,16)}}(),d=function(a,g){return new d.p.init(a,g||null)};d.version="1.3";d.isSupported=true;d.instances=[];d.p=d.prototype={init:function(a,g){var l,k=this;if(typeof a==="function")if(f.readyState==="complete")a(f,d);else{m.push(a);if(!o){o=true;var t=function(){f.removeEventListener("DOMContentLoaded",t,false);for(var z=0,C=m.length;z<C;z++)m[z].call(f,d);m=null};f.addEventListener("DOMContentLoaded",t,false)}}else{if(typeof a=== +"string")try{l=f.querySelector(a)}catch(u){throw Error("Popcorn.js Error: Invalid media element selector: "+a);}this.media=l||a;l=this.media.nodeName&&this.media.nodeName.toLowerCase()||"video";this[l]=this.media;this.options=g||{};this.id=this.options.id||d.guid(l);if(d.byId(this.id))throw Error("Popcorn.js Error: Cannot use duplicate ID ("+this.id+")");this.isDestroyed=false;this.data={running:{cue:[]},timeUpdate:d.nop,disabled:{},events:{},hooks:{},history:[],state:{volume:this.media.volume},trackRefs:{}, +trackEvents:{byStart:[{start:-1,end:-1}],byEnd:[{start:-1,end:-1}],animating:[],startIndex:0,endIndex:0,previousUpdateTime:-1}};d.instances.push(this);var v=function(){if(k.media.currentTime<0)k.media.currentTime=0;k.media.removeEventListener("loadeddata",v,false);var z,C,E,B,w;z=k.media.duration;z=z!=z?Number.MAX_VALUE:z+1;d.addTrackEvent(k,{start:z,end:z});if(k.options.frameAnimation){k.data.timeUpdate=function(){d.timeUpdate(k,{});d.forEach(d.manifest,function(D,F){if(C=k.data.running[F]){B=C.length; +for(var I=0;I<B;I++){E=C[I];(w=E._natives)&&w.frame&&w.frame.call(k,{},E,k.currentTime())}}});k.emit("timeupdate");!k.isDestroyed&&s(k.data.timeUpdate)};!k.isDestroyed&&s(k.data.timeUpdate)}else{k.data.timeUpdate=function(D){d.timeUpdate(k,D)};k.isDestroyed||k.media.addEventListener("timeupdate",k.data.timeUpdate,false)}};Object.defineProperty(this,"error",{get:function(){return k.media.error}});k.media.readyState>=2?v():k.media.addEventListener("loadeddata",v,false);return this}}};d.p.init.prototype= +d.p;d.byId=function(a){for(var g=d.instances,l=g.length,k=0;k<l;k++)if(g[k].id===a)return g[k];return null};d.forEach=function(a,g,l){if(!a||!g)return{};l=l||this;var k,t;if(e&&a.forEach===e)return a.forEach(g,l);if(j.call(a)==="[object NodeList]"){k=0;for(t=a.length;k<t;k++)g.call(l,a[k],k,a);return a}for(k in a)i.call(a,k)&&g.call(l,a[k],k,a);return a};d.extend=function(a){var g=h.call(arguments,1);d.forEach(g,function(l){for(var k in l)a[k]=l[k]});return a};d.extend(d,{noConflict:function(a){if(a)r.Popcorn= +p;return d},error:function(a){throw Error(a);},guid:function(a){d.guid.counter++;return(a?a:"")+(+new Date+d.guid.counter)},sizeOf:function(a){var g=0,l;for(l in a)g++;return g},isArray:Array.isArray||function(a){return j.call(a)==="[object Array]"},nop:function(){},position:function(a){a=a.getBoundingClientRect();var g={},l=f.documentElement,k=f.body,t,u,v;t=l.clientTop||k.clientTop||0;u=l.clientLeft||k.clientLeft||0;v=r.pageYOffset&&l.scrollTop||k.scrollTop;l=r.pageXOffset&&l.scrollLeft||k.scrollLeft; +t=Math.ceil(a.top+v-t);u=Math.ceil(a.left+l-u);for(var z in a)g[z]=Math.round(a[z]);return d.extend({},g,{top:t,left:u})},disable:function(a,g){if(!a.data.disabled[g]){a.data.disabled[g]=true;for(var l=a.data.running[g].length-1,k;l>=0;l--){k=a.data.running[g][l];k._natives.end.call(a,null,k)}}return a},enable:function(a,g){if(a.data.disabled[g]){a.data.disabled[g]=false;for(var l=a.data.running[g].length-1,k;l>=0;l--){k=a.data.running[g][l];k._natives.start.call(a,null,k)}}return a},destroy:function(a){var g= +a.data.events,l=a.data.trackEvents,k,t,u,v;for(t in g){k=g[t];for(u in k)delete k[u];g[t]=null}for(v in d.registryByName)d.removePlugin(a,v);l.byStart.length=0;l.byEnd.length=0;if(!a.isDestroyed){a.data.timeUpdate&&a.media.removeEventListener("timeupdate",a.data.timeUpdate,false);a.isDestroyed=true}}});d.guid.counter=1;d.extend(d.p,function(){var a={};d.forEach("load play pause currentTime playbackRate volume duration preload playbackRate autoplay loop controls muted buffered readyState seeking paused played seekable ended".split(/\s+/g), +function(g){a[g]=function(l){var k;if(typeof this.media[g]==="function"){if(l!=null&&/play|pause/.test(g))this.media.currentTime=d.util.toSeconds(l);this.media[g]();return this}if(l!=null){k=this.media[g];this.media[g]=l;k!==l&&this.emit("attrchange",{attribute:g,previousValue:k,currentValue:l});return this}return this.media[g]}});return a}());d.forEach("enable disable".split(" "),function(a){d.p[a]=function(g){return d[a](this,g)}});d.extend(d.p,{roundTime:function(){return Math.round(this.media.currentTime)}, +exec:function(a,g,l){var k=arguments.length,t,u;try{u=d.util.toSeconds(a)}catch(v){}if(typeof u==="number")a=u;if(typeof a==="number"&&k===2){l=g;g=a;a=d.guid("cue")}else if(k===1)g=-1;else if(t=this.getTrackEvent(a)){if(typeof a==="string"&&k===2){if(typeof g==="number")l=t._natives.start;if(typeof g==="function"){l=g;g=t.start}}}else if(k>=2){if(typeof g==="string"){try{u=d.util.toSeconds(g)}catch(z){}g=u}if(typeof g==="number")l=d.nop();if(typeof g==="function"){l=g;g=-1}}d.addTrackEvent(this, +{id:a,start:g,end:g+1,_running:false,_natives:{start:l||d.nop,end:d.nop,type:"cue"}});return this},mute:function(a){a=a==null||a===true?"muted":"unmuted";if(a==="unmuted"){this.media.muted=false;this.media.volume=this.data.state.volume}if(a==="muted"){this.data.state.volume=this.media.volume;this.media.muted=true}this.emit(a);return this},unmute:function(a){return this.mute(a==null?false:!a)},position:function(){return d.position(this.media)},toggle:function(a){return d[this.data.disabled[a]?"enable": +"disable"](this,a)},defaults:function(a,g){if(d.isArray(a)){d.forEach(a,function(l){for(var k in l)this.defaults(k,l[k])},this);return this}if(!this.options.defaults)this.options.defaults={};this.options.defaults[a]||(this.options.defaults[a]={});d.extend(this.options.defaults[a],g);return this}});d.Events={UIEvents:"blur focus focusin focusout load resize scroll unload",MouseEvents:"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave click dblclick",Events:"loadstart progress suspend emptied stalled play pause error loadedmetadata loadeddata waiting playing canplay canplaythrough seeking seeked timeupdate ended ratechange durationchange volumechange"}; +d.Events.Natives=d.Events.UIEvents+" "+d.Events.MouseEvents+" "+d.Events.Events;q.events.apiTypes=["UIEvents","MouseEvents","Events"];(function(a,g){for(var l=q.events.apiTypes,k=a.Natives.split(/\s+/g),t=0,u=k.length;t<u;t++)g.hash[k[t]]=true;l.forEach(function(v){g.apis[v]={};for(var z=a[v].split(/\s+/g),C=z.length,E=0;E<C;E++)g.apis[v][z[E]]=true})})(d.Events,q.events);d.events={isNative:function(a){return!!q.events.hash[a]},getInterface:function(a){if(!d.events.isNative(a))return false;var g= +q.events,l=g.apiTypes;g=g.apis;for(var k=0,t=l.length,u,v;k<t;k++){v=l[k];if(g[v][a]){u=v;break}}return u},all:d.Events.Natives.split(/\s+/g),fn:{trigger:function(a,g){var l;if(this.data.events[a]&&d.sizeOf(this.data.events[a])){if(l=d.events.getInterface(a)){l=f.createEvent(l);l.initEvent(a,true,true,r,1);this.media.dispatchEvent(l);return this}d.forEach(this.data.events[a],function(k){k.call(this,g)},this)}return this},listen:function(a,g){var l=this,k=true,t=d.events.hooks[a],u;if(!this.data.events[a]){this.data.events[a]= +{};k=false}if(t){t.add&&t.add.call(this,{},g);if(t.bind)a=t.bind;if(t.handler){u=g;g=function(v){t.handler.call(l,v,u)}}k=true;if(!this.data.events[a]){this.data.events[a]={};k=false}}this.data.events[a][g.name||g.toString()+d.guid()]=g;!k&&d.events.all.indexOf(a)>-1&&this.media.addEventListener(a,function(v){d.forEach(l.data.events[a],function(z){typeof z==="function"&&z.call(l,v)})},false);return this},unlisten:function(a,g){if(this.data.events[a]&&this.data.events[a][g]){delete this.data.events[a][g]; +return this}this.data.events[a]=null;return this}},hooks:{canplayall:{bind:"canplaythrough",add:function(a,g){var l=false;if(this.media.readyState){g.call(this,a);l=true}this.data.hooks.canplayall={fired:l}},handler:function(a,g){if(!this.data.hooks.canplayall.fired){g.call(this,a);this.data.hooks.canplayall.fired=true}}}}};d.forEach([["trigger","emit"],["listen","on"],["unlisten","off"]],function(a){d.p[a[0]]=d.p[a[1]]=d.events.fn[a[0]]});d.addTrackEvent=function(a,g){var l,k;if(g.id)l=a.getTrackEvent(g.id); +if(l){k=true;g=d.extend({},l,g);a.removeTrackEvent(g.id)}if(g&&g._natives&&g._natives.type&&a.options.defaults&&a.options.defaults[g._natives.type])g=d.extend({},a.options.defaults[g._natives.type],g);if(g._natives){g._id=g.id||g._id||d.guid(g._natives.type);a.data.history.push(g._id)}g.start=d.util.toSeconds(g.start,a.options.framerate);g.end=d.util.toSeconds(g.end,a.options.framerate);var t=a.data.trackEvents.byStart,u=a.data.trackEvents.byEnd,v;for(v=t.length-1;v>=0;v--)if(g.start>=t[v].start){t.splice(v+ +1,0,g);break}for(t=u.length-1;t>=0;t--)if(g.end>u[t].end){u.splice(t+1,0,g);break}if(g.end>a.media.currentTime&&g.start<=a.media.currentTime){g._running=true;a.data.running[g._natives.type].push(g);a.data.disabled[g._natives.type]||g._natives.start.call(a,null,g)}v<=a.data.trackEvents.startIndex&&g.start<=a.data.trackEvents.previousUpdateTime&&a.data.trackEvents.startIndex++;t<=a.data.trackEvents.endIndex&&g.end<a.data.trackEvents.previousUpdateTime&&a.data.trackEvents.endIndex++;this.timeUpdate(a, +null,true);g._id&&d.addTrackEvent.ref(a,g);if(k){k=g._natives.type==="cue"?"cuechange":"trackchange";a.emit(k,{id:g.id,previousValue:{time:l.start,fn:l._natives.start},currentValue:{time:g.start,fn:g._natives.start}})}};d.addTrackEvent.ref=function(a,g){a.data.trackRefs[g._id]=g;return a};d.removeTrackEvent=function(a,g){for(var l,k,t=a.data.history.length,u=a.data.trackEvents.byStart.length,v=0,z=0,C=[],E=[],B=[],w=[];--u>-1;){l=a.data.trackEvents.byStart[v];k=a.data.trackEvents.byEnd[v];if(!l._id){C.push(l); +E.push(k)}if(l._id){l._id!==g&&C.push(l);k._id!==g&&E.push(k);if(l._id===g){z=v;l._natives._teardown&&l._natives._teardown.call(a,l)}}v++}u=a.data.trackEvents.animating.length;v=0;if(u)for(;--u>-1;){l=a.data.trackEvents.animating[v];l._id||B.push(l);l._id&&l._id!==g&&B.push(l);v++}z<=a.data.trackEvents.startIndex&&a.data.trackEvents.startIndex--;z<=a.data.trackEvents.endIndex&&a.data.trackEvents.endIndex--;a.data.trackEvents.byStart=C;a.data.trackEvents.byEnd=E;a.data.trackEvents.animating=B;for(u= +0;u<t;u++)a.data.history[u]!==g&&w.push(a.data.history[u]);a.data.history=w;d.removeTrackEvent.ref(a,g)};d.removeTrackEvent.ref=function(a,g){delete a.data.trackRefs[g];return a};d.getTrackEvents=function(a){var g=[];a=a.data.trackEvents.byStart;for(var l=a.length,k=0,t;k<l;k++){t=a[k];t._id&&g.push(t)}return g};d.getTrackEvents.ref=function(a){return a.data.trackRefs};d.getTrackEvent=function(a,g){return a.data.trackRefs[g]};d.getTrackEvent.ref=function(a,g){return a.data.trackRefs[g]};d.getLastTrackEventId= +function(a){return a.data.history[a.data.history.length-1]};d.timeUpdate=function(a,g){var l=a.media.currentTime,k=a.data.trackEvents.previousUpdateTime,t=a.data.trackEvents,u=t.endIndex,v=t.startIndex,z=t.byStart.length,C=t.byEnd.length,E=d.registryByName,B,w,D;if(k<=l){for(;t.byEnd[u]&&t.byEnd[u].end<=l;){B=t.byEnd[u];w=(k=B._natives)&&k.type;if(!k||E[w]||a[w]){if(B._running===true){B._running=false;D=a.data.running[w];D.splice(D.indexOf(B),1);if(!a.data.disabled[w]){k.end.call(a,g,B);a.emit("trackend", +d.extend({},B,{plugin:w,type:"trackend"}))}}u++}else{d.removeTrackEvent(a,B._id);return}}for(;t.byStart[v]&&t.byStart[v].start<=l;){B=t.byStart[v];w=(k=B._natives)&&k.type;if(!k||E[w]||a[w]){if(B.end>l&&B._running===false){B._running=true;a.data.running[w].push(B);if(!a.data.disabled[w]){k.start.call(a,g,B);a.emit("trackstart",d.extend({},B,{plugin:w,type:"trackstart"}))}}v++}else{d.removeTrackEvent(a,B._id);return}}}else if(k>l){for(;t.byStart[v]&&t.byStart[v].start>l;){B=t.byStart[v];w=(k=B._natives)&& +k.type;if(!k||E[w]||a[w]){if(B._running===true){B._running=false;D=a.data.running[w];D.splice(D.indexOf(B),1);if(!a.data.disabled[w]){k.end.call(a,g,B);a.emit("trackend",d.extend({},B,{plugin:w,type:"trackend"}))}}v--}else{d.removeTrackEvent(a,B._id);return}}for(;t.byEnd[u]&&t.byEnd[u].end>l;){B=t.byEnd[u];w=(k=B._natives)&&k.type;if(!k||E[w]||a[w]){if(B.start<=l&&B._running===false){B._running=true;a.data.running[w].push(B);if(!a.data.disabled[w]){k.start.call(a,g,B);a.emit("trackstart",d.extend({}, +B,{plugin:w,type:"trackstart"}))}}u--}else{d.removeTrackEvent(a,B._id);return}}}t.endIndex=u;t.startIndex=v;t.previousUpdateTime=l;t.byStart.length<z&&t.startIndex--;t.byEnd.length<C&&t.endIndex--};d.extend(d.p,{getTrackEvents:function(){return d.getTrackEvents.call(null,this)},getTrackEvent:function(a){return d.getTrackEvent.call(null,this,a)},getLastTrackEventId:function(){return d.getLastTrackEventId.call(null,this)},removeTrackEvent:function(a){d.removeTrackEvent.call(null,this,a);return this}, +removePlugin:function(a){d.removePlugin.call(null,this,a);return this},timeUpdate:function(a){d.timeUpdate.call(null,this,a);return this},destroy:function(){d.destroy.call(null,this);return this}});d.manifest={};d.registry=[];d.registryByName={};d.plugin=function(a,g,l){if(d.protect.natives.indexOf(a.toLowerCase())>=0)d.error("'"+a+"' is a protected function name");else{var k=["start","end"],t={},u=typeof g==="function",v=["_setup","_teardown","start","end","frame"],z=function(B,w){B=B||d.nop;w=w|| +d.nop;return function(){B.apply(this,arguments);w.apply(this,arguments)}};d.manifest[a]=l=l||g.manifest||{};v.forEach(function(B){g[B]=n(g[B]||d.nop,a)});var C=function(B,w){if(!w)return this;if(w.ranges&&d.isArray(w.ranges)){d.forEach(w.ranges,function(G){G=d.extend({},w,G);delete G.ranges;this[a](G)},this);return this}var D=w._natives={},F="",I;d.extend(D,B);w._natives.type=a;w._running=false;D.start=D.start||D["in"];D.end=D.end||D.out;if(w.once)D.end=z(D.end,function(){this.removeTrackEvent(w._id)}); +D._teardown=z(function(){var G=h.call(arguments),H=this.data.running[D.type];G.unshift(null);G[1]._running&&H.splice(H.indexOf(w),1)&&D.end.apply(this,G)},D._teardown);w.compose=w.compose&&w.compose.split(" ")||[];w.effect=w.effect&&w.effect.split(" ")||[];w.compose=w.compose.concat(w.effect);w.compose.forEach(function(G){F=d.compositions[G]||{};v.forEach(function(H){D[H]=z(D[H],F[H])})});w._natives.manifest=l;if(!("start"in w))w.start=w["in"]||0;if(!w.end&&w.end!==0)w.end=w.out||Number.MAX_VALUE; +if(!i.call(w,"toString"))w.toString=function(){var G=["start: "+w.start,"end: "+w.end,"id: "+(w.id||w._id)];w.target!=null&&G.push("target: "+w.target);return a+" ( "+G.join(", ")+" )"};if(!w.target){I="options"in l&&l.options;w.target=I&&"target"in I&&I.target}if(w._natives)w._id=d.guid(w._natives.type);w._natives._setup&&w._natives._setup.call(this,w);d.addTrackEvent(this,w);d.forEach(B,function(G,H){H!=="type"&&k.indexOf(H)===-1&&this.on(H,G)},this);return this};d.p[a]=t[a]=function(B,w){var D; +if(B&&!w)w=B;else if(D=this.getTrackEvent(B)){w=d.extend({},D,w);d.addTrackEvent(this,w);return this}else w.id=B;this.data.running[a]=this.data.running[a]||[];D=d.extend({},this.options.defaults&&this.options.defaults[a]||{},w);return C.call(this,u?g.call(this,D):g,D)};l&&d.extend(g,{manifest:l});var E={fn:t[a],definition:g,base:g,parents:[],name:a};d.registry.push(d.extend(t,E,{type:a}));d.registryByName[a]=E;return t}};d.plugin.errors=[];d.plugin.debug=d.version==="1.3";d.removePlugin=function(a, +g){if(!g){g=a;a=d.p;if(d.protect.natives.indexOf(g.toLowerCase())>=0){d.error("'"+g+"' is a protected function name");return}var l=d.registry.length,k;for(k=0;k<l;k++)if(d.registry[k].name===g){d.registry.splice(k,1);delete d.registryByName[g];delete d.manifest[g];delete a[g];return}}l=a.data.trackEvents.byStart;k=a.data.trackEvents.byEnd;var t=a.data.trackEvents.animating,u,v;u=0;for(v=l.length;u<v;u++){if(l[u]&&l[u]._natives&&l[u]._natives.type===g){l[u]._natives._teardown&&l[u]._natives._teardown.call(a, +l[u]);l.splice(u,1);u--;v--;if(a.data.trackEvents.startIndex<=u){a.data.trackEvents.startIndex--;a.data.trackEvents.endIndex--}}k[u]&&k[u]._natives&&k[u]._natives.type===g&&k.splice(u,1)}u=0;for(v=t.length;u<v;u++)if(t[u]&&t[u]._natives&&t[u]._natives.type===g){t.splice(u,1);u--;v--}};d.compositions={};d.compose=function(a,g,l){d.manifest[a]=l||g.manifest||{};d.compositions[a]=g};d.plugin.effect=d.effect=d.compose;var A=/^(?:\.|#|\[)/;d.dom={debug:false,find:function(a,g){var l=null;a=a.trim();g= +g||f;if(a){if(!A.test(a)){l=f.getElementById(a);if(l!==null)return l}try{l=g.querySelector(a)}catch(k){if(d.dom.debug)throw Error(k);}}return l}};var y=/\?/,x={url:"",data:"",dataType:"",success:d.nop,type:"GET",async:true,xhr:function(){return new r.XMLHttpRequest}};d.xhr=function(a){a.dataType=a.dataType&&a.dataType.toLowerCase()||null;if(a.dataType&&(a.dataType==="jsonp"||a.dataType==="script"))d.xhr.getJSONP(a.url,a.success,a.dataType==="script");else{a=d.extend({},x,a);a.ajax=a.xhr();if(a.ajax){if(a.type=== +"GET"&&a.data){a.url+=(y.test(a.url)?"&":"?")+a.data;a.data=null}a.ajax.open(a.type,a.url,a.async);a.ajax.send(a.data||null);return d.xhr.httpData(a)}}};d.xhr.httpData=function(a){var g,l=null,k,t=null;a.ajax.onreadystatechange=function(){if(a.ajax.readyState===4){try{l=JSON.parse(a.ajax.responseText)}catch(u){}g={xml:a.ajax.responseXML,text:a.ajax.responseText,json:l};if(!g.xml||!g.xml.documentElement){g.xml=null;try{k=new DOMParser;t=k.parseFromString(a.ajax.responseText,"text/xml");if(!t.getElementsByTagName("parsererror").length)g.xml= +t}catch(v){}}if(a.dataType)g=g[a.dataType];a.success.call(a.ajax,g)}};return g};d.xhr.getJSONP=function(a,g,l){var k=f.head||f.getElementsByTagName("head")[0]||f.documentElement,t=f.createElement("script"),u=false,v=[];v=/(=)\?(?=&|$)|\?\?/;var z,C;if(!l){C=a.match(/(callback=[^&]*)/);if(C!==null&&C.length){v=C[1].split("=")[1];if(v==="?")v="jsonp";z=d.guid(v);a=a.replace(/(callback=[^&]*)/,"callback="+z)}else{z=d.guid("jsonp");if(v.test(a))a=a.replace(v,"$1"+z);v=a.split(/\?(.+)?/);a=v[0]+"?";if(v[1])a+= +v[1]+"&";a+="callback="+z}window[z]=function(E){g&&g(E);u=true}}t.addEventListener("load",function(){l&&g&&g();u&&delete window[z];k.removeChild(t)},false);t.src=a;k.insertBefore(t,k.firstChild)};d.getJSONP=d.xhr.getJSONP;d.getScript=d.xhr.getScript=function(a,g){return d.xhr.getJSONP(a,g,true)};d.util={toSeconds:function(a,g){var l=/^([0-9]+:){0,2}[0-9]+([.;][0-9]+)?$/,k,t,u;if(typeof a==="number")return a;typeof a==="string"&&!l.test(a)&&d.error("Invalid time format");l=a.split(":");k=l.length- +1;t=l[k];if(t.indexOf(";")>-1){t=t.split(";");u=0;if(g&&typeof g==="number")u=parseFloat(t[1],10)/g;l[k]=parseInt(t[0],10)+u}k=l[0];return{1:parseFloat(k,10),2:parseInt(k,10)*60+parseFloat(l[1],10),3:parseInt(k,10)*3600+parseInt(l[1],10)*60+parseFloat(l[2],10)}[l.length||1]}};d.p.cue=d.p.exec;d.protect={natives:function(a){return Object.keys?Object.keys(a):function(g){var l,k=[];for(l in g)i.call(g,l)&&k.push(l);return k}(a)}(d.p).map(function(a){return a.toLowerCase()})};d.forEach({listen:"on",unlisten:"off", +trigger:"emit",exec:"cue"},function(a,g){var l=d.p[g];d.p[g]=function(){if(typeof console!=="undefined"&&console.warn){console.warn("Deprecated method '"+g+"', "+(a==null?"do not use.":"use '"+a+"' instead."));d.p[g]=l}return d.p[a].apply(this,[].slice.call(arguments))}});r.Popcorn=d}else{r.Popcorn={isSupported:false};for(c="byId forEach extend effects error guid sizeOf isArray nop position disable enable destroyaddTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId timeUpdate plugin removePlugin compose effect xhr getJSONP getScript".split(/\s+/);c.length;)r.Popcorn[c.shift()]= +function(){}}})(window,window.document);(function(r,f){var n=r.document,c=r.location,b=/:\/\//,e=c.href.replace(c.href.split("/").slice(-1)[0],""),h=function(j,p,m){j=j||0;p=(p||j||0)+1;m=m||1;p=Math.ceil((p-j)/m)||0;var o=0,q=[];for(q.length=p;o<p;){q[o++]=j;j+=m}return q};f.sequence=function(j,p){return new f.sequence.init(j,p)};f.sequence.init=function(j,p){this.parent=n.getElementById(j);this.seqId=f.guid("__sequenced");this.queue=[];this.playlist=[];this.inOuts={ofVideos:[],ofClips:[]};this.dims={width:0,height:0};this.active=0;this.playing= +this.cycling=false;this.times={last:0};this.events={};var m=this,o=0;f.forEach(p,function(q,s){var d=n.createElement("video");d.preload="auto";d.controls=true;d.style.display=s&&"none"||"";d.id=m.seqId+"-"+s;m.queue.push(d);var A=q["in"],y=q.out;m.inOuts.ofVideos.push({"in":A!==undefined&&A||1,out:y!==undefined&&y||0});m.inOuts.ofVideos[s].out=m.inOuts.ofVideos[s].out||m.inOuts.ofVideos[s]["in"]+2;d.src=!b.test(q.src)?e+q.src:q.src;d.setAttribute("data-sequence-owner",j);d.setAttribute("data-sequence-guid", +m.seqId);d.setAttribute("data-sequence-id",s);d.setAttribute("data-sequence-clip",[m.inOuts.ofVideos[s]["in"],m.inOuts.ofVideos[s].out].join(":"));m.parent.appendChild(d);m.playlist.push(f("#"+d.id))});m.inOuts.ofVideos.forEach(function(q){q={"in":o,out:o+(q.out-q["in"])};m.inOuts.ofClips.push(q);o=q.out+1});f.forEach(this.queue,function(q,s){function d(){if(!s){m.dims.width=q.videoWidth;m.dims.height=q.videoHeight}q.currentTime=m.inOuts.ofVideos[s]["in"]-0.5;q.removeEventListener("canplaythrough", +d,false);return true}q.addEventListener("canplaythrough",d,false);q.addEventListener("play",function(){m.playing=true},false);q.addEventListener("pause",function(){m.playing=false},false);q.addEventListener("timeupdate",function(A){A=A.srcElement||A.target;A=+(A.dataset&&A.dataset.sequenceId||A.getAttribute("data-sequence-id"));var y=Math.floor(q.currentTime);if(m.times.last!==y&&A===m.active){m.times.last=y;y===m.inOuts.ofVideos[A].out&&f.sequence.cycle.call(m,A)}},false)});return this};f.sequence.init.prototype= +f.sequence.prototype;f.sequence.cycle=function(j){this.queue||f.error("Popcorn.sequence.cycle is not a public method");var p=this.queue,m=this.inOuts.ofVideos,o=p[j],q=0,s;if(p[j+1])q=j+1;if(p[j+1]){p=p[q];m=m[q];f.extend(p,{width:this.dims.width,height:this.dims.height});s=this.playlist[q];o.pause();this.active=q;this.times.last=m["in"]-1;s.currentTime(m["in"]);s[q?"play":"pause"]();this.trigger("cycle",{position:{previous:j,current:q}});if(q){o.style.display="none";p.style.display=""}this.cycling= +false}else this.playlist[j].pause();return this};var i=["timeupdate","play","pause"];f.extend(f.sequence.prototype,{eq:function(j){return this.playlist[j]},remove:function(){this.parent.innerHTML=null},clip:function(j){return this.inOuts.ofVideos[j]},duration:function(){for(var j=0,p=this.inOuts.ofClips,m=0;m<p.length;m++)j+=p[m].out-p[m]["in"]+1;return j-1},play:function(){this.playlist[this.active].play();return this},exec:function(j,p){var m=this.active;this.inOuts.ofClips.forEach(function(o,q){if(j>= +o["in"]&&j<=o.out)m=q});j+=this.inOuts.ofVideos[m]["in"]-this.inOuts.ofClips[m]["in"];f.addTrackEvent(this.playlist[m],{start:j-1,end:j,_running:false,_natives:{start:p||f.nop,end:f.nop,type:"exec"}});return this},listen:function(j,p){var m=this,o=this.playlist,q=o.length,s=0;if(!p)p=f.nop;if(f.Events.Natives.indexOf(j)>-1)f.forEach(o,function(d){d.listen(j,function(A){A.active=m;if(i.indexOf(j)>-1)p.call(d,A);else++s===q&&p.call(d,A)})});else{this.events[j]||(this.events[j]={});o=p.name||f.guid("__"+ +j);this.events[j][o]=p}return this},unlisten:function(){},trigger:function(j,p){var m=this;if(!(f.Events.Natives.indexOf(j)>-1)){this.events[j]&&f.forEach(this.events[j],function(o){o.call(m,{type:j},p)});return this}}});f.forEach(f.manifest,function(j,p){f.sequence.prototype[p]=function(m){var o={},q=[],s,d,A,y,x;for(s=0;s<this.inOuts.ofClips.length;s++){q=this.inOuts.ofClips[s];d=h(q["in"],q.out);A=d.indexOf(m.start);y=d.indexOf(m.end);if(A>-1)o[s]=f.extend({},q,{start:d[A],clipIdx:A});if(y>-1)o[s]= +f.extend({},q,{end:d[y],clipIdx:y})}s=Object.keys(o).map(function(g){return+g});q=h(s[0],s[1]);for(s=0;s<q.length;s++){A={};y=q[s];var a=o[y];if(a){x=this.inOuts.ofVideos[y];d=a.clipIdx;x=h(x["in"],x.out);if(a.start){A.start=x[d];A.end=x[x.length-1]}if(a.end){A.start=x[0];A.end=x[d]}}else{A.start=this.inOuts.ofVideos[y]["in"];A.end=this.inOuts.ofVideos[y].out}this.playlist[y][p](f.extend({},m,A))}return this}})})(this,Popcorn);(function(r){document.addEventListener("DOMContentLoaded",function(){var f=document.querySelectorAll("[data-timeline-sources]");r.forEach(f,function(n,c){var b=f[c],e,h,i;if(!b.id)b.id=r.guid("__popcorn");if(b.nodeType&&b.nodeType===1){i=r("#"+b.id);e=(b.getAttribute("data-timeline-sources")||"").split(",");e[0]&&r.forEach(e,function(j){h=j.split("!");if(h.length===1){h=j.match(/(.*)[\/\\]([^\/\\]+\.\w+)$/)[2].split(".");h[0]="parse"+h[1].toUpperCase();h[1]=j}e[0]&&i[h[0]]&&i[h[0]](h[1])});i.autoplay()&& +i.play()}})},false)})(Popcorn);(function(r,f){function n(e){e=typeof e==="string"?e:[e.language,e.region].join("-");var h=e.split("-");return{iso6391:e,language:h[0]||"",region:h[1]||""}}var c=r.navigator,b=n(c.userLanguage||c.language);f.locale={get:function(){return b},set:function(e){b=n(e);f.locale.broadcast();return b},broadcast:function(e){var h=f.instances,i=h.length,j=0,p;for(e=e||"locale:changed";j<i;j++){p=h[j];e in p.data.events&&p.trigger(e)}}}})(this,this.Popcorn);(function(r){var f=Object.prototype.hasOwnProperty;r.parsers={};r.parser=function(n,c,b){if(r.protect.natives.indexOf(n.toLowerCase())>=0)r.error("'"+n+"' is a protected function name");else{if(typeof c==="function"&&!b){b=c;c=""}if(!(typeof b!=="function"||typeof c!=="string")){var e={};e[n]=function(h,i){if(!h)return this;var j=this;r.xhr({url:h,dataType:c,success:function(p){var m,o,q=0;p=b(p).data||[];if(m=p.length){for(;q<m;q++){o=p[q];for(var s in o)f.call(o,s)&&j[s]&&j[s](o[s])}i&&i()}}}); +return this};r.extend(r.p,e);return e}}}})(Popcorn);(function(r){var f=function(b,e){b=b||r.nop;e=e||r.nop;return function(){b.apply(this,arguments);e.apply(this,arguments)}},n=/^.*\.(ogg|oga|aac|mp3|wav)($|\?)/,c=/^.*\.(ogg|oga|aac|mp3|wav|ogg|ogv|mp4|webm)($|\?)/;r.player=function(b,e){if(!r[b]){e=e||{};var h=function(i,j,p){p=p||{};var m=new Date/1E3,o=m,q=0,s=0,d=1,A=false,y={},x=typeof i==="string"?r.dom.find(i):i,a={};Object.prototype.__defineGetter__||(a=x||document.createElement("div"));for(var g in x)if(!(g in a))if(typeof x[g]==="object")a[g]= +x[g];else if(typeof x[g]==="function")a[g]=function(k){return"length"in x[k]&&!x[k].call?x[k]:function(){return x[k].apply(x,arguments)}}(g);else r.player.defineProperty(a,g,{get:function(k){return function(){return x[k]}}(g),set:r.nop,configurable:true});var l=function(){m=new Date/1E3;if(!a.paused){a.currentTime+=m-o;a.dispatchEvent("timeupdate");setTimeout(l,10)}o=m};a.play=function(){this.paused=false;if(a.readyState>=4){o=new Date/1E3;a.dispatchEvent("play");l()}};a.pause=function(){this.paused= +true;a.dispatchEvent("pause")};r.player.defineProperty(a,"currentTime",{get:function(){return q},set:function(k){q=+k;a.dispatchEvent("timeupdate");return q},configurable:true});r.player.defineProperty(a,"volume",{get:function(){return d},set:function(k){d=+k;a.dispatchEvent("volumechange");return d},configurable:true});r.player.defineProperty(a,"muted",{get:function(){return A},set:function(k){A=+k;a.dispatchEvent("volumechange");return A},configurable:true});r.player.defineProperty(a,"readyState", +{get:function(){return s},set:function(k){return s=k},configurable:true});a.addEventListener=function(k,t){y[k]||(y[k]=[]);y[k].push(t);return t};a.removeEventListener=function(k,t){var u,v=y[k];if(v){for(u=y[k].length-1;u>=0;u--)t===v[u]&&v.splice(u,1);return t}};a.dispatchEvent=function(k){var t,u=k.type;if(!u){u=k;if(k=r.events.getInterface(u)){t=document.createEvent(k);t.initEvent(u,true,true,window,1)}}if(y[u])for(k=y[u].length-1;k>=0;k--)y[u][k].call(this,t,this)};a.src=j||"";a.duration=0;a.paused= +true;a.ended=0;p&&p.events&&r.forEach(p.events,function(k,t){a.addEventListener(t,k,false)});if(e._canPlayType(x.nodeName,j)!==false)if(e._setup)e._setup.call(a,p);else{a.readyState=4;a.dispatchEvent("loadedmetadata");a.dispatchEvent("loadeddata");a.dispatchEvent("canplaythrough")}else setTimeout(function(){a.dispatchEvent("error")},0);i=new r.p.init(a,p);if(e._teardown)i.destroy=f(i.destroy,function(){e._teardown.call(a,p)});return i};h.canPlayType=e._canPlayType=e._canPlayType||r.nop;r[b]=r.player.registry[b]= +h}};r.player.registry={};r.player.defineProperty=Object.defineProperty||function(b,e,h){b.__defineGetter__(e,h.get||r.nop);b.__defineSetter__(e,h.set||r.nop)};r.player.playerQueue=function(){var b=[],e=false;return{next:function(){e=false;b.shift();b[0]&&b[0]()},add:function(h){b.push(function(){e=true;h&&h()});!e&&b[0]()}}};r.smart=function(b,e,h){var i=["AUDIO","VIDEO"],j,p=r.dom.find(b),m;j=document.createElement("video");var o={ogg:"video/ogg",ogv:"video/ogg",oga:"audio/ogg",webm:"video/webm", +mp4:"video/mp4",mp3:"audio/mp3"};if(p){if(i.indexOf(p.nodeName)>-1&&!e){if(typeof e==="object")h=e;return r(p,h)}if(typeof e==="string")e=[e];b=0;for(srcLength=e.length;b<srcLength;b++){m=c.exec(e[b]);m=!m||!m[1]?false:j.canPlayType(o[m[1]]);if(m){e=e[b];break}for(var q in r.player.registry)if(r.player.registry.hasOwnProperty(q))if(r.player.registry[q].canPlayType(p.nodeName,e[b]))return r[q](p,e[b],h)}if(i.indexOf(p.nodeName)===-1){j=typeof e==="string"?e:e.length?e[0]:e;b=document.createElement(n.exec(j)? +i[0]:i[1]);b.controls=true;p.appendChild(b);p=b}h&&h.events&&h.events.error&&p.addEventListener("error",h.events.error,false);p.src=e;return r(p,h)}else r.error("Specified target "+b+" was not found.")}})(Popcorn);(function(r){var f=function(n,c){var b=0,e=0,h;r.forEach(c.classes,function(i,j){h=[];if(i==="parent")h[0]=document.querySelectorAll("#"+c.target)[0].parentNode;else h=document.querySelectorAll("#"+c.target+" "+i);b=0;for(e=h.length;b<e;b++)h[b].classList.toggle(j)})};r.compose("applyclass",{manifest:{about:{name:"Popcorn applyclass Effect",version:"0.1",author:"@scottdowne",website:"scottdowne.wordpress.com"},options:{}},_setup:function(n){n.classes={};n.applyclass=n.applyclass||"";for(var c=n.applyclass.replace(/\s/g, +"").split(","),b=[],e=0,h=c.length;e<h;e++){b=c[e].split(":");if(b[0])n.classes[b[0]]=b[1]||""}},start:f,end:f})})(Popcorn);(function(r){var f=/(?:http:\/\/www\.|http:\/\/|www\.|\.|^)(youtu|vimeo|soundcloud|baseplayer)/,n={},c={vimeo:false,youtube:false,soundcloud:false,module:false};Object.defineProperty(n,void 0,{get:function(){return c[void 0]},set:function(b){c[void 0]=b}});r.plugin("mediaspawner",{manifest:{about:{name:"Popcorn Media Spawner Plugin",version:"0.1",author:"Matthew Schranz, @mjschranz",website:"mschranz.wordpress.com"},options:{source:{elem:"input",type:"text",label:"Media Source","default":"http://www.youtube.com/watch?v=CXDstfD9eJ0"}, +caption:{elem:"input",type:"text",label:"Media Caption","default":"Popcorn Popping",optional:true},target:"mediaspawner-container",start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},autoplay:{elem:"input",type:"checkbox",label:"Autoplay Video",optional:true},width:{elem:"input",type:"number",label:"Media Width","default":400,units:"px",optional:true},height:{elem:"input",type:"number",label:"Media Height","default":200,units:"px",optional:true}}},_setup:function(b){function e(){function o(){if(j!== +"HTML5"&&!window.Popcorn[j])setTimeout(function(){o()},300);else{b.id=b._container.id;b._container.style.width=b.width+"px";b._container.style.height=b.height+"px";b.popcorn=r.smart("#"+b.id,b.source);j==="HTML5"&&b.popcorn.controls(true);b._container.style.width="0px";b._container.style.height="0px";b._container.style.visibility="hidden";b._container.style.overflow="hidden"}}if(j!=="HTML5"&&!window.Popcorn[j]&&!n[j]){n[j]=true;r.getScript("http://popcornjs.org/code/players/"+j+"/popcorn."+j+".js", +function(){o()})}else o()}function h(){window.Popcorn.player?e():setTimeout(function(){h()},300)}var i=document.getElementById(b.target)||{},j,p,m;if(p=f.exec(b.source)){j=p[1];if(j==="youtu")j="youtube"}else j="HTML5";b._type=j;b._container=document.createElement("div");p=b._container;p.id="mediaSpawnerdiv-"+r.guid();b.width=b.width||400;b.height=b.height||200;if(b.caption){m=document.createElement("div");m.innerHTML=b.caption;m.style.display="none";b._capCont=m;p.appendChild(m)}i&&i.appendChild(p); +if(!window.Popcorn.player&&!n.module){n.module=true;r.getScript("http://popcornjs.org/code/modules/player/popcorn.player.js",h)}else h()},start:function(b,e){if(e._capCont)e._capCont.style.display="";e._container.style.width=e.width+"px";e._container.style.height=e.height+"px";e._container.style.visibility="visible";e._container.style.overflow="visible";e.autoplay&&e.popcorn.play()},end:function(b,e){if(e._capCont)e._capCont.style.display="none";e._container.style.width="0px";e._container.style.height= +"0px";e._container.style.visibility="hidden";e._container.style.overflow="hidden";e.popcorn.pause()},_teardown:function(b){b.popcorn&&b.popcorn.destory&&b.popcorn.destroy();document.getElementById(b.target)&&document.getElementById(b.target).removeChild(b._container)}})})(Popcorn,this);(function(r){r.plugin("code",function(f){var n=false,c=this,b=function(){var e=function(h){return function(i,j){var p=function(){n&&i.call(c,j);n&&h(p)};p()}};return window.webkitRequestAnimationFrame?e(window.webkitRequestAnimationFrame):window.mozRequestAnimationFrame?e(window.mozRequestAnimationFrame):e(function(h){window.setTimeout(h,16)})}();if(!f.onStart||typeof f.onStart!=="function")f.onStart=r.nop;if(f.onEnd&&typeof f.onEnd!=="function")f.onEnd=undefined;if(f.onFrame&&typeof f.onFrame!== +"function")f.onFrame=undefined;return{start:function(e,h){h.onStart.call(c,h);if(h.onFrame){n=true;b(h.onFrame,h)}},end:function(e,h){if(h.onFrame)n=false;h.onEnd&&h.onEnd.call(c,h)}}},{about:{name:"Popcorn Code Plugin",version:"0.1",author:"David Humphrey (@humphd)",website:"http://vocamus.net/dave"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},onStart:{elem:"input",type:"function",label:"onStart"},onFrame:{elem:"input",type:"function",label:"onFrame", +optional:true},onEnd:{elem:"input",type:"function",label:"onEnd"}}})})(Popcorn);(function(r){var f=0;r.plugin("flickr",function(n){var c,b=document.getElementById(n.target),e,h,i,j,p=n.numberofimages||4,m=n.height||"50px",o=n.width||"50px",q=n.padding||"5px",s=n.border||"0px";c=document.createElement("div");c.id="flickr"+f;c.style.width="100%";c.style.height="100%";c.style.display="none";f++;b&&b.appendChild(c);var d=function(){if(e)setTimeout(function(){d()},5);else{h="http://api.flickr.com/services/rest/?method=flickr.people.findByUsername&";h+="username="+n.username+"&api_key="+ +n.apikey+"&format=json&jsoncallback=flickr";r.getJSONP(h,function(y){e=y.user.nsid;A()})}},A=function(){h="http://api.flickr.com/services/feeds/photos_public.gne?";if(e)h+="id="+e+"&";if(n.tags)h+="tags="+n.tags+"&";h+="lang=en-us&format=json&jsoncallback=flickr";r.xhr.getJSONP(h,function(y){var x=document.createElement("div");x.innerHTML="<p style='padding:"+q+";'>"+y.title+"<p/>";r.forEach(y.items,function(a,g){if(g<p){i=document.createElement("a");i.setAttribute("href",a.link);i.setAttribute("target", +"_blank");j=document.createElement("img");j.setAttribute("src",a.media.m);j.setAttribute("height",m);j.setAttribute("width",o);j.setAttribute("style","border:"+s+";padding:"+q);i.appendChild(j);x.appendChild(i)}else return false});c.appendChild(x)})};if(n.username&&n.apikey)d();else{e=n.userid;A()}return{start:function(){c.style.display="inline"},end:function(){c.style.display="none"},_teardown:function(y){document.getElementById(y.target)&&document.getElementById(y.target).removeChild(c)}}},{about:{name:"Popcorn Flickr Plugin", +version:"0.2",author:"Scott Downe, Steven Weerdenburg, Annasob",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},userid:{elem:"input",type:"text",label:"User ID",optional:true},tags:{elem:"input",type:"text",label:"Tags"},username:{elem:"input",type:"text",label:"Username",optional:true},apikey:{elem:"input",type:"text",label:"API Key",optional:true},target:"flickr-container",height:{elem:"input",type:"text", +label:"Height","default":"50px",optional:true},width:{elem:"input",type:"text",label:"Width","default":"50px",optional:true},padding:{elem:"input",type:"text",label:"Padding",optional:true},border:{elem:"input",type:"text",label:"Border","default":"5px",optional:true},numberofimages:{elem:"input",type:"number","default":4,label:"Number of Images"}}})})(Popcorn);(function(r){r.plugin("footnote",{manifest:{about:{name:"Popcorn Footnote Plugin",version:"0.2",author:"@annasob, @rwaldron",website:"annasob.wordpress.com"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},text:{elem:"input",type:"text",label:"Text"},target:"footnote-container"}},_setup:function(f){var n=r.dom.find(f.target);f._container=document.createElement("div");f._container.style.display="none";f._container.innerHTML=f.text;n.appendChild(f._container)}, +start:function(f,n){n._container.style.display="inline"},end:function(f,n){n._container.style.display="none"},_teardown:function(f){var n=r.dom.find(f.target);n&&n.removeChild(f._container)}})})(Popcorn);(function(r){function f(b){return String(b).replace(/&(?!\w+;)|[<>"']/g,function(e){return c[e]||e})}function n(b,e){var h=b.container=document.createElement("div"),i=h.style,j=b.media,p=function(){var m=b.position();i.fontSize="18px";i.width=j.offsetWidth+"px";i.top=m.top+j.offsetHeight-h.offsetHeight-40+"px";i.left=m.left+"px";setTimeout(p,10)};h.id=e||"";i.position="absolute";i.color="white";i.textShadow="black 2px 2px 6px";i.fontWeight="bold";i.textAlign="center";p();b.media.parentNode.appendChild(h); +return h}var c={"&":"&","<":"<",">":">",'"':""","'":"'"};r.plugin("text",{manifest:{about:{name:"Popcorn Text Plugin",version:"0.1",author:"@humphd"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},text:{elem:"input",type:"text",label:"Text","default":"Popcorn.js"},escape:{elem:"input",type:"checkbox",label:"Escape"},multiline:{elem:"input",type:"checkbox",label:"Multiline"}}},_setup:function(b){var e,h,i=b._container=document.createElement("div"); +i.style.display="none";if(b.target)if(e=r.dom.find(b.target)){if(["VIDEO","AUDIO"].indexOf(e.nodeName)>-1)e=n(this,b.target+"-overlay")}else e=n(this,b.target);else e=this.container?this.container:n(this);b._target=e;h=b.escape?f(b.text):b.text;h=b.multiline?h.replace(/\r?\n/gm,"<br>"):h;i.innerHTML=h||"";e.appendChild(i)},start:function(b,e){e._container.style.display="inline"},end:function(b,e){e._container.style.display="none"},_teardown:function(b){var e=b._target;e&&e.removeChild(b._container)}})})(Popcorn);var googleCallback; +(function(r){function f(i,j,p){i=i.type?i.type.toUpperCase():"HYBRID";var m;if(i==="STAMEN-WATERCOLOR"||i==="STAMEN-TERRAIN"||i==="STAMEN-TONER")m=i.replace("STAMEN-","").toLowerCase();p=new google.maps.Map(p,{mapTypeId:m?m:google.maps.MapTypeId[i],mapTypeControlOptions:{mapTypeIds:[]}});m&&p.mapTypes.set(m,new google.maps.StamenMapType(m));p.getDiv().style.display="none";return p}var n=1,c=false,b=false,e,h;googleCallback=function(i){if(typeof google!=="undefined"&&google.maps&&google.maps.Geocoder&& +google.maps.LatLng){e=new google.maps.Geocoder;r.getScript("//maps.stamen.com/js/tile.stamen.js",function(){b=true})}else setTimeout(function(){googleCallback(i)},1)};h=function(){if(document.body){c=true;r.getScript("//maps.google.com/maps/api/js?sensor=false&callback=googleCallback")}else setTimeout(function(){h()},1)};r.plugin("googlemap",function(i){var j,p,m,o=document.getElementById(i.target);i.type=i.type||"ROADMAP";i.zoom=i.zoom||1;i.lat=i.lat||0;i.lng=i.lng||0;c||h();j=document.createElement("div"); +j.id="actualmap"+n;j.style.width=i.width||"100%";j.style.height=i.height?i.height:o&&o.clientHeight?o.clientHeight+"px":"100%";n++;o&&o.appendChild(j);var q=function(){if(b){if(j)if(i.location)e.geocode({address:i.location},function(s,d){if(j&&d===google.maps.GeocoderStatus.OK){i.lat=s[0].geometry.location.lat();i.lng=s[0].geometry.location.lng();m=new google.maps.LatLng(i.lat,i.lng);p=f(i,m,j)}});else{m=new google.maps.LatLng(i.lat,i.lng);p=f(i,m,j)}}else setTimeout(function(){q()},5)};q();return{start:function(s, +d){var A=this,y,x=function(){if(p){d._map=p;p.getDiv().style.display="block";google.maps.event.trigger(p,"resize");p.setCenter(m);if(d.zoom&&typeof d.zoom!=="number")d.zoom=+d.zoom;p.setZoom(d.zoom);if(d.heading&&typeof d.heading!=="number")d.heading=+d.heading;if(d.pitch&&typeof d.pitch!=="number")d.pitch=+d.pitch;if(d.type==="STREETVIEW"){p.setStreetView(y=new google.maps.StreetViewPanorama(j,{position:m,pov:{heading:d.heading=d.heading||0,pitch:d.pitch=d.pitch||0,zoom:d.zoom}}));var a=function(z, +C){var E=google.maps.geometry.spherical.computeHeading;setTimeout(function(){var B=A.media.currentTime;if(typeof d.tween==="object"){for(var w=0,D=z.length;w<D;w++){var F=z[w];if(B>=F.interval*(w+1)/1E3&&(B<=F.interval*(w+2)/1E3||B>=F.interval*D/1E3)){u.setPosition(new google.maps.LatLng(F.position.lat,F.position.lng));u.setPov({heading:F.pov.heading||E(F,z[w+1])||0,zoom:F.pov.zoom||0,pitch:F.pov.pitch||0})}}a(z,z[0].interval)}else{w=0;for(D=z.length;w<D;w++){F=d.interval;if(B>=F*(w+1)/1E3&&(B<=F* +(w+2)/1E3||B>=F*D/1E3)){g.setPov({heading:E(z[w],z[w+1])||0,zoom:d.zoom,pitch:d.pitch||0});g.setPosition(l[w])}}a(l,d.interval)}},C)};if(d.location&&typeof d.tween==="string"){var g=y,l=[],k=new google.maps.DirectionsService,t=new google.maps.DirectionsRenderer(g);k.route({origin:d.location,destination:d.tween,travelMode:google.maps.TravelMode.DRIVING},function(z,C){if(C==google.maps.DirectionsStatus.OK){t.setDirections(z);for(var E=z.routes[0].overview_path,B=0,w=E.length;B<w;B++)l.push(new google.maps.LatLng(E[B].lat(), +E[B].lng()));d.interval=d.interval||1E3;a(l,10)}})}else if(typeof d.tween==="object"){var u=y;k=0;for(var v=d.tween.length;k<v;k++){d.tween[k].interval=d.tween[k].interval||1E3;a(d.tween,10)}}}d.onmaploaded&&d.onmaploaded(d,p)}else setTimeout(function(){x()},13)};x()},end:function(){if(p)p.getDiv().style.display="none"},_teardown:function(s){var d=document.getElementById(s.target);d&&d.removeChild(j);j=p=m=null;s._map=null}}},{about:{name:"Popcorn Google Map Plugin",version:"0.1",author:"@annasob", +website:"annasob.wordpress.com"},options:{start:{elem:"input",type:"start",label:"Start"},end:{elem:"input",type:"start",label:"End"},target:"map-container",type:{elem:"select",options:["ROADMAP","SATELLITE","STREETVIEW","HYBRID","TERRAIN","STAMEN-WATERCOLOR","STAMEN-TERRAIN","STAMEN-TONER"],label:"Map Type",optional:true},zoom:{elem:"input",type:"text",label:"Zoom","default":0,optional:true},lat:{elem:"input",type:"text",label:"Lat",optional:true},lng:{elem:"input",type:"text",label:"Lng",optional:true}, +location:{elem:"input",type:"text",label:"Location","default":"Toronto, Ontario, Canada"},heading:{elem:"input",type:"text",label:"Heading","default":0,optional:true},pitch:{elem:"input",type:"text",label:"Pitch","default":1,optional:true}}})})(Popcorn);(function(r){function f(b){function e(){var p=b.getBoundingClientRect(),m=i.getBoundingClientRect();if(m.left!==p.left)i.style.left=p.left+"px";if(m.top!==p.top)i.style.top=p.top+"px"}var h=-1,i=document.createElement("div"),j=getComputedStyle(b).zIndex;i.setAttribute("data-popcorn-helper-container",true);i.style.position="absolute";i.style.zIndex=isNaN(j)?n:j+1;document.body.appendChild(i);return{element:i,start:function(){h=setInterval(e,c)},stop:function(){clearInterval(h);h=-1},destroy:function(){document.body.removeChild(i); +h!==-1&&clearInterval(h)}}}var n=2E3,c=10;r.plugin("image",{manifest:{about:{name:"Popcorn image Plugin",version:"0.1",author:"Scott Downe",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},src:{elem:"input",type:"url",label:"Image URL","default":"http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png"},href:{elem:"input",type:"url",label:"Link","default":"http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png", +optional:true},target:"image-container",text:{elem:"input",type:"text",label:"Caption","default":"Popcorn.js",optional:true}}},_setup:function(b){var e=document.createElement("img"),h=document.getElementById(b.target);b.anchor=document.createElement("a");b.anchor.style.position="relative";b.anchor.style.textDecoration="none";b.anchor.style.display="none";if(h)if(["VIDEO","AUDIO"].indexOf(h.nodeName)>-1){b.trackedContainer=f(h);b.trackedContainer.element.appendChild(b.anchor)}else h&&h.appendChild(b.anchor); +e.addEventListener("load",function(){e.style.borderStyle="none";b.anchor.href=b.href||b.src||"#";b.anchor.target="_blank";var i,j;e.style.height=h.style.height;e.style.width=h.style.width;b.anchor.appendChild(e);if(b.text){i=e.height/12+"px";j=document.createElement("div");r.extend(j.style,{color:"black",fontSize:i,fontWeight:"bold",position:"relative",textAlign:"center",width:e.style.width||e.width+"px",zIndex:"10"});j.innerHTML=b.text||"";j.style.top=(e.style.height.replace("px","")||e.height)/ +2-j.offsetHeight/2+"px";b.anchor.insertBefore(j,e)}},false);e.src=b.src},start:function(b,e){e.anchor.style.display="inline";e.trackedContainer&&e.trackedContainer.start()},end:function(b,e){e.anchor.style.display="none";e.trackedContainer&&e.trackedContainer.stop()},_teardown:function(b){if(b.trackedContainer)b.trackedContainer.destroy();else b.anchor.parentNode&&b.anchor.parentNode.removeChild(b.anchor)}})})(Popcorn);(function(r){var f=1,n=false;r.plugin("googlefeed",function(c){var b=function(){var j=false,p=0,m=document.getElementsByTagName("link"),o=m.length,q=document.head||document.getElementsByTagName("head")[0],s=document.createElement("link");if(window.GFdynamicFeedControl)n=true;else r.getScript("//www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js",function(){n=true});for(;p<o;p++)if(m[p].href==="//www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.css")j=true;if(!j){s.type= +"text/css";s.rel="stylesheet";s.href="//www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.css";q.insertBefore(s,q.firstChild)}};window.google?b():r.getScript("//www.google.com/jsapi",function(){google.load("feeds","1",{callback:function(){b()}})});var e=document.createElement("div"),h=document.getElementById(c.target),i=function(){if(n)c.feed=new GFdynamicFeedControl(c.url,e,{vertical:c.orientation.toLowerCase()==="vertical"?true:false,horizontal:c.orientation.toLowerCase()==="horizontal"? +true:false,title:c.title=c.title||"Blog"});else setTimeout(function(){i()},5)};if(!c.orientation||c.orientation.toLowerCase()!=="vertical"&&c.orientation.toLowerCase()!=="horizontal")c.orientation="vertical";e.style.display="none";e.id="_feed"+f;e.style.width="100%";e.style.height="100%";f++;h&&h.appendChild(e);i();return{start:function(){e.setAttribute("style","display:inline")},end:function(){e.setAttribute("style","display:none")},_teardown:function(j){document.getElementById(j.target)&&document.getElementById(j.target).removeChild(e); +delete j.feed}}},{about:{name:"Popcorn Google Feed Plugin",version:"0.1",author:"David Seifried",website:"dseifried.wordpress.com"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},target:"feed-container",url:{elem:"input",type:"url",label:"Feed URL","default":"http://planet.mozilla.org/rss20.xml"},title:{elem:"input",type:"text",label:"Title","default":"Planet Mozilla",optional:true},orientation:{elem:"select",options:["Vertical","Horizontal"], +label:"Orientation","default":"Vertical",optional:true}}})})(Popcorn);(function(r){var f=0,n=function(c,b){var e=c.container=document.createElement("div"),h=e.style,i=c.media,j=function(){var p=c.position();h.fontSize="18px";h.width=i.offsetWidth+"px";h.top=p.top+i.offsetHeight-e.offsetHeight-40+"px";h.left=p.left+"px";setTimeout(j,10)};e.id=b||r.guid();h.position="absolute";h.color="white";h.textShadow="black 2px 2px 6px";h.fontWeight="bold";h.textAlign="center";j();c.media.parentNode.appendChild(e);return e};r.plugin("subtitle",{manifest:{about:{name:"Popcorn Subtitle Plugin", +version:"0.1",author:"Scott Downe",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"text",label:"Start"},end:{elem:"input",type:"text",label:"End"},target:"subtitle-container",text:{elem:"input",type:"text",label:"Text"}}},_setup:function(c){var b=document.createElement("div");b.id="subtitle-"+f++;b.style.display="none";!this.container&&(!c.target||c.target==="subtitle-container")&&n(this);c.container=c.target&&c.target!=="subtitle-container"?document.getElementById(c.target)|| +n(this,c.target):this.container;document.getElementById(c.container.id)&&document.getElementById(c.container.id).appendChild(b);c.innerContainer=b;c.showSubtitle=function(){c.innerContainer.innerHTML=c.text||""}},start:function(c,b){b.innerContainer.style.display="inline";b.showSubtitle(b,b.text)},end:function(c,b){b.innerContainer.style.display="none";b.innerContainer.innerHTML=""},_teardown:function(c){c.container.removeChild(c.innerContainer)}})})(Popcorn);(function(r){var f=false;r.plugin("twitter",{manifest:{about:{name:"Popcorn Twitter Plugin",version:"0.1",author:"Scott Downe",website:"http://scottdowne.wordpress.com/"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},src:{elem:"input",type:"text",label:"Tweet Source (# or @)","default":"@popcornjs"},target:"twitter-container",height:{elem:"input",type:"number",label:"Height","default":"200",optional:true},width:{elem:"input",type:"number",label:"Width", +"default":"250",optional:true}}},_setup:function(n){if(!window.TWTR&&!f){f=true;r.getScript("//widgets.twimg.com/j/2/widget.js")}var c=document.getElementById(n.target);n.container=document.createElement("div");n.container.setAttribute("id",r.guid());n.container.style.display="none";c&&c.appendChild(n.container);var b=n.src||"";c=n.width||250;var e=n.height||200,h=/^@/.test(b),i={version:2,id:n.container.getAttribute("id"),rpp:30,width:c,height:e,interval:6E3,theme:{shell:{background:"#ffffff",color:"#000000"}, +tweets:{background:"#ffffff",color:"#444444",links:"#1985b5"}},features:{loop:true,timestamp:true,avatars:true,hashtags:true,toptweets:true,live:true,scrollbar:false,behavior:"default"}},j=function(p){if(window.TWTR)if(h){i.type="profile";(new TWTR.Widget(i)).render().setUser(b).start()}else{i.type="search";i.search=b;i.subject=b;(new TWTR.Widget(i)).render().start()}else setTimeout(function(){j(p)},1)};j(this)},start:function(n,c){c.container.style.display="inline"},end:function(n,c){c.container.style.display= +"none"},_teardown:function(n){document.getElementById(n.target)&&document.getElementById(n.target).removeChild(n.container)}})})(Popcorn);(function(r){r.plugin("webpage",{manifest:{about:{name:"Popcorn Webpage Plugin",version:"0.1",author:"@annasob",website:"annasob.wordpress.com"},options:{id:{elem:"input",type:"text",label:"Id",optional:true},start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},src:{elem:"input",type:"url",label:"Webpage URL","default":"http://mozillapopcorn.org"},target:"iframe-container"}},_setup:function(f){var n=document.getElementById(f.target);f.src=f.src.replace(/^(https?:)?(\/\/)?/, +"//");f._iframe=document.createElement("iframe");f._iframe.setAttribute("width","100%");f._iframe.setAttribute("height","100%");f._iframe.id=f.id;f._iframe.src=f.src;f._iframe.style.display="none";n&&n.appendChild(f._iframe)},start:function(f,n){n._iframe.src=n.src;n._iframe.style.display="inline"},end:function(f,n){n._iframe.style.display="none"},_teardown:function(f){document.getElementById(f.target)&&document.getElementById(f.target).removeChild(f._iframe)}})})(Popcorn);var wikiCallback; +(function(r){r.plugin("wikipedia",{manifest:{about:{name:"Popcorn Wikipedia Plugin",version:"0.1",author:"@annasob",website:"annasob.wordpress.com"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},lang:{elem:"input",type:"text",label:"Language","default":"english",optional:true},src:{elem:"input",type:"url",label:"Wikipedia URL","default":"http://en.wikipedia.org/wiki/Cat"},title:{elem:"input",type:"text",label:"Title","default":"Cats",optional:true}, +numberofwords:{elem:"input",type:"number",label:"Number of Words","default":"200",optional:true},target:"wikipedia-container"}},_setup:function(f){var n,c=r.guid();if(!f.lang)f.lang="en";f.numberofwords=f.numberofwords||200;window["wikiCallback"+c]=function(b){f._link=document.createElement("a");f._link.setAttribute("href",f.src);f._link.setAttribute("target","_blank");f._link.innerHTML=f.title||b.parse.displaytitle;f._desc=document.createElement("p");n=b.parse.text["*"].substr(b.parse.text["*"].indexOf("<p>")); +n=n.replace(/((<(.|\n)+?>)|($(.*?)$ )|(\[(.*?)\]))/g,"");n=n.split(" ");f._desc.innerHTML=n.slice(0,n.length>=f.numberofwords?f.numberofwords:n.length).join(" ")+" ...";f._fired=true};f.src&&r.getScript("//"+f.lang+".wikipedia.org/w/api.php?action=parse&props=text&redirects&page="+f.src.slice(f.src.lastIndexOf("/")+1)+"&format=json&callback=wikiCallback"+c)},start:function(f,n){var c=function(){if(n._fired){if(n._link&&n._desc)if(document.getElementById(n.target)){document.getElementById(n.target).appendChild(n._link); +document.getElementById(n.target).appendChild(n._desc);n._added=true}}else setTimeout(function(){c()},13)};c()},end:function(f,n){if(n._added){document.getElementById(n.target).removeChild(n._link);document.getElementById(n.target).removeChild(n._desc)}},_teardown:function(f){if(f._added){f._link.parentNode&&document.getElementById(f.target).removeChild(f._link);f._desc.parentNode&&document.getElementById(f.target).removeChild(f._desc);delete f.target}}})})(Popcorn);(function(r){r.plugin("mustache",function(f){var n,c,b,e;r.getScript("http://mustache.github.com/extras/mustache.js");var h=!!f.dynamic,i=typeof f.template,j=typeof f.data,p=document.getElementById(f.target);f.container=p||document.createElement("div");if(i==="function")if(h)b=f.template;else e=f.template(f);else e=i==="string"?f.template:"";if(j==="function")if(h)n=f.data;else c=f.data(f);else c=j==="string"?JSON.parse(f.data):j==="object"?f.data:"";return{start:function(m,o){var q=function(){if(window.Mustache){if(n)c= +n(o);if(b)e=b(o);var s=Mustache.to_html(e,c).replace(/^\s*/mg,"");o.container.innerHTML=s}else setTimeout(function(){q()},10)};q()},end:function(m,o){o.container.innerHTML=""},_teardown:function(){n=c=b=e=null}}},{about:{name:"Popcorn Mustache Plugin",version:"0.1",author:"David Humphrey (@humphd)",website:"http://vocamus.net/dave"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},target:"mustache-container",template:{elem:"input",type:"text", +label:"Template"},data:{elem:"input",type:"text",label:"Data"},dynamic:{elem:"input",type:"checkbox",label:"Dynamic","default":true}}})})(Popcorn);(function(r){function f(c,b){if(c.map)c.map.div.style.display=b;else setTimeout(function(){f(c,b)},10)}var n=1;r.plugin("openmap",function(c){var b,e,h,i,j,p,m,o,q=document.getElementById(c.target);b=document.createElement("div");b.id="openmapdiv"+n;b.style.width="100%";b.style.height="100%";n++;q&&q.appendChild(b);o=function(){if(window.OpenLayers&&window.OpenLayers.Layer.Stamen){if(c.location){location=new OpenLayers.LonLat(0,0);r.getJSONP("//tinygeocoder.com/create-api.php?q="+c.location+"&callback=jsonp", +function(d){e=new OpenLayers.LonLat(d[1],d[0])})}else e=new OpenLayers.LonLat(c.lng,c.lat);c.type=c.type||"ROADMAP";switch(c.type){case "SATELLITE":c.map=new OpenLayers.Map({div:b,maxResolution:0.28125,tileSize:new OpenLayers.Size(512,512)});var s=new OpenLayers.Layer.WorldWind("LANDSAT","//worldwind25.arc.nasa.gov/tile/tile.aspx",2.25,4,{T:"105"});c.map.addLayer(s);i=new OpenLayers.Projection("EPSG:4326");h=new OpenLayers.Projection("EPSG:4326");break;case "TERRAIN":i=new OpenLayers.Projection("EPSG:4326"); +h=new OpenLayers.Projection("EPSG:4326");c.map=new OpenLayers.Map({div:b,projection:h});s=new OpenLayers.Layer.WMS("USGS Terraserver","//terraserver-usa.org/ogcmap.ashx?",{layers:"DRG"});c.map.addLayer(s);break;case "STAMEN-TONER":case "STAMEN-WATERCOLOR":case "STAMEN-TERRAIN":s=c.type.replace("STAMEN-","").toLowerCase();s=new OpenLayers.Layer.Stamen(s);i=new OpenLayers.Projection("EPSG:4326");h=new OpenLayers.Projection("EPSG:900913");e=e.transform(i,h);c.map=new OpenLayers.Map({div:b,projection:h, +displayProjection:i,controls:[new OpenLayers.Control.Navigation,new OpenLayers.Control.PanPanel,new OpenLayers.Control.ZoomPanel]});c.map.addLayer(s);break;default:h=new OpenLayers.Projection("EPSG:900913");i=new OpenLayers.Projection("EPSG:4326");e=e.transform(i,h);c.map=new OpenLayers.Map({div:b,projection:h,displayProjection:i});s=new OpenLayers.Layer.OSM;c.map.addLayer(s)}if(c.map){c.map.setCenter(e,c.zoom||10);c.map.div.style.display="none"}}else setTimeout(function(){o()},50)};o();return{_setup:function(s){window.OpenLayers|| +r.getScript("//openlayers.org/api/OpenLayers.js",function(){r.getScript("//maps.stamen.com/js/tile.stamen.js")});var d=function(){if(s.map){s.zoom=s.zoom||2;if(s.zoom&&typeof s.zoom!=="number")s.zoom=+s.zoom;s.map.setCenter(e,s.zoom);if(s.markers){var A=OpenLayers.Util.extend({},OpenLayers.Feature.Vector.style["default"]),y=function(v){clickedFeature=v.feature;if(clickedFeature.attributes.text){m=new OpenLayers.Popup.FramedCloud("featurePopup",clickedFeature.geometry.getBounds().getCenterLonLat(), +new OpenLayers.Size(120,250),clickedFeature.attributes.text,null,true,function(){p.unselect(this.feature)});clickedFeature.popup=m;m.feature=clickedFeature;s.map.addPopup(m)}},x=function(v){feature=v.feature;if(feature.popup){m.feature=null;s.map.removePopup(feature.popup);feature.popup.destroy();feature.popup=null}},a=function(v){r.getJSONP("//tinygeocoder.com/create-api.php?q="+v.location+"&callback=jsonp",function(z){z=(new OpenLayers.Geometry.Point(z[1],z[0])).transform(i,h);var C=OpenLayers.Util.extend({}, +A);if(!v.size||isNaN(v.size))v.size=14;C.pointRadius=v.size;C.graphicOpacity=1;C.externalGraphic=v.icon;z=new OpenLayers.Feature.Vector(z,null,C);if(v.text)z.attributes={text:v.text};j.addFeatures([z])})};j=new OpenLayers.Layer.Vector("Point Layer",{style:A});s.map.addLayer(j);for(var g=0,l=s.markers.length;g<l;g++){var k=s.markers[g];if(k.text)if(!p){p=new OpenLayers.Control.SelectFeature(j);s.map.addControl(p);p.activate();j.events.on({featureselected:y,featureunselected:x})}if(k.location)a(k); +else{var t=(new OpenLayers.Geometry.Point(k.lng,k.lat)).transform(i,h),u=OpenLayers.Util.extend({},A);if(!k.size||isNaN(k.size))k.size=14;u.pointRadius=k.size;u.graphicOpacity=1;u.externalGraphic=k.icon;t=new OpenLayers.Feature.Vector(t,null,u);if(k.text)t.attributes={text:k.text};j.addFeatures([t])}}}}else setTimeout(function(){d()},13)};d()},start:function(s,d){f(d,"block")},end:function(s,d){f(d,"none")},_teardown:function(){q&&q.removeChild(b);b=map=e=h=i=j=p=m=null}}},{about:{name:"Popcorn OpenMap Plugin", +version:"0.3",author:"@mapmeld",website:"mapadelsur.blogspot.com"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},target:"map-container",type:{elem:"select",options:["ROADMAP","SATELLITE","TERRAIN"],label:"Map Type",optional:true},zoom:{elem:"input",type:"number",label:"Zoom","default":2},lat:{elem:"input",type:"text",label:"Lat",optional:true},lng:{elem:"input",type:"text",label:"Lng",optional:true},location:{elem:"input",type:"text",label:"Location", +"default":"Toronto, Ontario, Canada"},markers:{elem:"input",type:"text",label:"List Markers",optional:true}}})})(Popcorn);document.addEventListener("click",function(r){r=r.target;if(r.nodeName==="A"||r.parentNode&&r.parentNode.nodeName==="A")Popcorn.instances.forEach(function(f){f.options.pauseOnLinkClicked&&f.pause()})},false);(function(r){var f={},n=0,c=document.createElement("span"),b=["webkit","Moz","ms","O",""],e=["Transform","TransitionDuration","TransitionTimingFunction"],h={},i;document.getElementsByTagName("head")[0].appendChild(c);for(var j=0,p=e.length;j<p;j++)for(var m=0,o=b.length;m<o;m++){i=b[m]+e[j];if(i in c.style){h[e[j].toLowerCase()]=i;break}}document.getElementsByTagName("head")[0].appendChild(c);r.plugin("wordriver",{manifest:{about:{name:"Popcorn WordRiver Plugin"},options:{start:{elem:"input",type:"number", +label:"Start"},end:{elem:"input",type:"number",label:"End"},target:"wordriver-container",text:{elem:"input",type:"text",label:"Text","default":"Popcorn.js"},color:{elem:"input",type:"text",label:"Color","default":"Green",optional:true}}},_setup:function(q){q._duration=q.end-q.start;var s;if(!(s=f[q.target])){s=q.target;f[s]=document.createElement("div");var d=document.getElementById(s);d&&d.appendChild(f[s]);f[s].style.height="100%";f[s].style.position="relative";s=f[s]}q._container=s;q.word=document.createElement("span"); +q.word.style.position="absolute";q.word.style.whiteSpace="nowrap";q.word.style.opacity=0;q.word.style.MozTransitionProperty="opacity, -moz-transform";q.word.style.webkitTransitionProperty="opacity, -webkit-transform";q.word.style.OTransitionProperty="opacity, -o-transform";q.word.style.transitionProperty="opacity, transform";q.word.style[h.transitionduration]="1s, "+q._duration+"s";q.word.style[h.transitiontimingfunction]="linear";q.word.innerHTML=q.text;q.word.style.color=q.color||"black"},start:function(q, +s){s._container.appendChild(s.word);s.word.style[h.transform]="";s.word.style.fontSize=~~(30+20*Math.random())+"px";n%=s._container.offsetWidth-s.word.offsetWidth;s.word.style.left=n+"px";n+=s.word.offsetWidth+10;s.word.style[h.transform]="translateY("+(s._container.offsetHeight-s.word.offsetHeight)+"px)";s.word.style.opacity=1;setTimeout(function(){s.word.style.opacity=0},(s.end-s.start-1||1)*1E3)},end:function(q,s){s.word.style.opacity=0},_teardown:function(q){var s=document.getElementById(q.target); +q.word.parentNode&&q._container.removeChild(q.word);f[q.target]&&!f[q.target].childElementCount&&s&&s.removeChild(f[q.target])&&delete f[q.target]}})})(Popcorn);(function(r){var f=1;r.plugin("timeline",function(n){var c=document.getElementById(n.target),b=document.createElement("div"),e,h=true;if(c&&!c.firstChild){c.appendChild(e=document.createElement("div"));e.style.width="inherit";e.style.height="inherit";e.style.overflow="auto"}else e=c.firstChild;b.style.display="none";b.id="timelineDiv"+f;n.direction=n.direction||"up";if(n.direction.toLowerCase()==="down")h=false;if(c&&e)h?e.insertBefore(b,e.firstChild):e.appendChild(b);f++;b.innerHTML="<p><span id='big' style='font-size:24px; line-height: 130%;' >"+ +n.title+"</span><br /><span id='mid' style='font-size: 16px;'>"+n.text+"</span><br />"+n.innerHTML;return{start:function(i,j){b.style.display="block";if(j.direction==="down")e.scrollTop=e.scrollHeight},end:function(){b.style.display="none"},_teardown:function(){e&&b&&e.removeChild(b)&&!e.firstChild&&c.removeChild(e)}}},{about:{name:"Popcorn Timeline Plugin",version:"0.1",author:"David Seifried @dcseifried",website:"dseifried.wordpress.com"},options:{start:{elem:"input",type:"number",label:"Start"}, +end:{elem:"input",type:"number",label:"End"},target:"feed-container",title:{elem:"input",type:"text",label:"Title"},text:{elem:"input",type:"text",label:"Text"},innerHTML:{elem:"input",type:"text",label:"HTML Code",optional:true},direction:{elem:"select",options:["DOWN","UP"],label:"Direction",optional:true}}})})(Popcorn);(function(r,f){var n={};r.plugin("documentcloud",{manifest:{about:{name:"Popcorn Document Cloud Plugin",version:"0.1",author:"@humphd, @ChrisDeCairos",website:"http://vocamus.net/dave"},options:{start:{elem:"input",type:"number",label:"Start"},end:{elem:"input",type:"number",label:"End"},target:"documentcloud-container",width:{elem:"input",type:"text",label:"Width",optional:true},height:{elem:"input",type:"text",label:"Height",optional:true},src:{elem:"input",type:"url",label:"PDF URL","default":"http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html"}, +preload:{elem:"input",type:"checkbox",label:"Preload","default":true},page:{elem:"input",type:"number",label:"Page Number",optional:true},aid:{elem:"input",type:"number",label:"Annotation Id",optional:true}}},_setup:function(c){function b(){function m(v){c._key=v.api.getId();c._changeView=function(z){c.aid?z.pageSet.showAnnotation(z.api.getAnnotation(c.aid)):z.api.setCurrentPage(c.page)}}function o(){n[c._key]={num:1,id:c._containerId};h.loaded=true}h.loaded=false;var q=c.url.replace(/\.html$/,".js"), +s=c.target,d=f.getElementById(s),A=f.createElement("div"),y=r.position(d),x=c.width||y.width;y=c.height||y.height;var a=c.sidebar||true,g=c.text||true,l=c.pdf||true,k=c.showAnnotations||true,t=c.zoom||700,u=c.search||true;if(!function(v){var z=false;r.forEach(h.viewers,function(C){if(C.api.getSchema().canonicalURL===v){m(C);C=n[c._key];c._containerId=C.id;C.num+=1;z=true;h.loaded=true}});return z}(c.url)){A.id=c._containerId=r.guid(s);s="#"+A.id;d.appendChild(A);i.trigger("documentready");h.load(q, +{width:x,height:y,sidebar:a,text:g,pdf:l,showAnnotations:k,zoom:t,search:u,container:s,afterLoad:c.page||c.aid?function(v){m(v);c._changeView(v);A.style.visibility="hidden";v.elements.pages.hide();o()}:function(v){m(v);o();A.style.visibility="hidden";v.elements.pages.hide()}})}}function e(){window.DV.loaded?b():setTimeout(e,25)}var h=window.DV=window.DV||{},i=this;if(h.loading)e();else{h.loading=true;h.recordHit="//www.documentcloud.org/pixel.gif";var j=f.createElement("link"),p=f.getElementsByTagName("head")[0]; +j.rel="stylesheet";j.type="text/css";j.media="screen";j.href="//s3.documentcloud.org/viewer/viewer-datauri.css";p.appendChild(j);h.loaded=false;r.getScript("http://s3.documentcloud.org/viewer/viewer.js",function(){h.loading=false;b()})}},start:function(c,b){var e=f.getElementById(b._containerId),h=DV.viewers[b._key];(b.page||b.aid)&&h&&b._changeView(h);if(e&&h){e.style.visibility="visible";h.elements.pages.show()}},end:function(c,b){var e=f.getElementById(b._containerId);if(e&&DV.viewers[b._key]){e.style.visibility= +"hidden";DV.viewers[b._key].elements.pages.hide()}},_teardown:function(c){var b=f.getElementById(c._containerId);if((c=c._key)&&DV.viewers[c]&&--n[c].num===0){for(DV.viewers[c].api.unload();b.hasChildNodes();)b.removeChild(b.lastChild);b.parentNode.removeChild(b)}}})})(Popcorn,window.document);(function(r){r.parser("parseJSON","JSON",function(f){var n={title:"",remote:"",data:[]};r.forEach(f.data,function(c){n.data.push(c)});return n})})(Popcorn);(function(r){r.parser("parseSBV",function(f){var n={title:"",remote:"",data:[]},c=[],b=0,e=0,h=function(q){q=q.split(":");var s=q.length-1,d;try{d=parseInt(q[s-1],10)*60+parseFloat(q[s],10);if(s===2)d+=parseInt(q[0],10)*3600}catch(A){throw"Bad cue";}return d},i=function(q,s){var d={};d[q]=s;return d};f=f.text.split(/(?:\r\n|\r|\n)/gm);for(e=f.length;b<e;){var j={},p=[],m=f[b++].split(",");try{j.start=h(m[0]);for(j.end=h(m[1]);b<e&&f[b];)p.push(f[b++]);j.text=p.join("<br />");c.push(i("subtitle",j))}catch(o){for(;b< +e&&f[b];)b++}for(;b<e&&!f[b];)b++}n.data=c;return n})})(Popcorn);(function(r){function f(c,b){var e={};e[c]=b;return e}function n(c){c=c.split(":");try{var b=c[2].split(",");if(b.length===1)b=c[2].split(".");return parseFloat(c[0],10)*3600+parseFloat(c[1],10)*60+parseFloat(b[0],10)+parseFloat(b[1],10)/1E3}catch(e){return 0}}r.parser("parseSRT",function(c){var b={title:"",remote:"",data:[]},e=[],h=0,i=0,j,p,m,o;c=c.text.split(/(?:\r\n|\r|\n)/gm);for(h=c.length-1;h>=0&&!c[h];)h--;m=h+1;for(h=0;h<m;h++){o={};p=[];o.id=parseInt(c[h++],10);j=c[h++].split(/[\t ]*--\>[\t ]*/); +o.start=n(j[0]);i=j[1].indexOf(" ");if(i!==-1)j[1]=j[1].substr(0,i);for(o.end=n(j[1]);h<m&&c[h];)p.push(c[h++]);o.text=p.join("\\N").replace(/\{(\\[\w]+$?([\w\d]+,?)+$?)+\}/gi,"");o.text=o.text.replace(/</g,"<").replace(/>/g,">");o.text=o.text.replace(/<(\/?(font|b|u|i|s))((\s+(\w|\w[\w\-]*\w)(\s*=\s*(?:\".*?\"|'.*?'|[^'\">\s]+))?)+\s*|\s*)(\/?)>/gi,"<$1$3$7>");o.text=o.text.replace(/\\N/gi,"<br />");e.push(f("subtitle",o))}b.data=e;return b})})(Popcorn);(function(r){function f(b,e){var h=b.substr(10).split(","),i;i={start:n(h[e.start]),end:n(h[e.end])};if(i.start===-1||i.end===-1)throw"Invalid time";var j=q.call(m,/\{(\\[\w]+$?([\w\d]+,?)+$?)+\}/gi,""),p=j.replace,m;m=h.length;q=[];for(var o=e.text;o<m;o++)q.push(h[o]);m=q.join(",");var q=m.replace;i.text=p.call(j,/\\N/gi,"<br />");return i}function n(b){var e=b.split(":");if(b.length!==10||e.length<3)return-1;return parseInt(e[0],10)*3600+parseInt(e[1],10)*60+parseFloat(e[2],10)}function c(b, +e){var h={};h[b]=e;return h}r.parser("parseSSA",function(b){var e={title:"",remote:"",data:[]},h=[],i=0,j;b=b.text.split(/(?:\r\n|\r|\n)/gm);for(j=b.length;i<j&&b[i]!=="[Events]";)i++;var p=b[++i].substr(8).split(", "),m={},o,q;q=0;for(o=p.length;q<o;q++)if(p[q]==="Start")m.start=q;else if(p[q]==="End")m.end=q;else if(p[q]==="Text")m.text=q;for(;++i<j&&b[i]&&b[i][0]!=="[";)try{h.push(c("subtitle",f(b[i],m)))}catch(s){}e.data=h;return e})})(Popcorn);(function(r){function f(i,j,p){var m=i.firstChild;i=n(i,p);p=[];for(var o;m;){if(m.nodeType===1)if(m.nodeName==="p")p.push(c(m,j,i));else if(m.nodeName==="div"){o=b(m.getAttribute("begin"));if(o<0)o=j;p.push.apply(p,f(m,o,i))}m=m.nextSibling}return p}function n(i,j){var p=i.getAttribute("region");return p!==null?p:j||""}function c(i,j,p){var m={};m.text=(i.textContent||i.text).replace(e,"").replace(h,"<br />");m.id=i.getAttribute("xml:id")||i.getAttribute("id");m.start=b(i.getAttribute("begin"),j); +m.end=b(i.getAttribute("end"),j);m.target=n(i,p);if(m.end<0){m.end=b(i.getAttribute("duration"),0);if(m.end>=0)m.end+=m.start;else m.end=Number.MAX_VALUE}return{subtitle:m}}function b(i,j){var p;if(!i)return-1;try{return r.util.toSeconds(i)}catch(m){for(var o=i.length-1;o>=0&&i[o]<="9"&&i[o]>="0";)o--;p=o;o=parseFloat(i.substring(0,p));p=i.substring(p);return o*({h:3600,m:60,s:1,ms:0.0010}[p]||-1)+(j||0)}}var e=/^[\s]+|[\s]+$/gm,h=/(?:\r\n|\r|\n)/gm;r.parser("parseTTML",function(i){var j={title:"", +remote:"",data:[]};if(!i.xml||!i.xml.documentElement)return j;i=i.xml.documentElement.firstChild;if(!i)return j;for(;i.nodeName!=="body";)i=i.nextSibling;if(i)j.data=f(i,0);return j})})(Popcorn);(function(r){r.parser("parseTTXT",function(f){var n={title:"",remote:"",data:[]},c=function(j){j=j.split(":");var p=0;try{return parseFloat(j[0],10)*60*60+parseFloat(j[1],10)*60+parseFloat(j[2],10)}catch(m){p=0}return p},b=function(j,p){var m={};m[j]=p;return m};f=f.xml.lastChild.lastChild;for(var e=Number.MAX_VALUE,h=[];f;){if(f.nodeType===1&&f.nodeName==="TextSample"){var i={};i.start=c(f.getAttribute("sampleTime"));i.text=f.getAttribute("text");if(i.text){i.end=e-0.0010;h.push(b("subtitle",i))}e= +i.start}f=f.previousSibling}n.data=h.reverse();return n})})(Popcorn);(function(r){function f(c){var b=c.split(":");c=c.length;var e;if(c!==12&&c!==9)throw"Bad cue";c=b.length-1;try{e=parseInt(b[c-1],10)*60+parseFloat(b[c],10);if(c===2)e+=parseInt(b[0],10)*3600}catch(h){throw"Bad cue";}return e}function n(c,b){var e={};e[c]=b;return e}r.parser("parseVTT",function(c){var b={title:"",remote:"",data:[]},e=[],h=0,i=0,j,p;c=c.text.split(/(?:\r\n|\r|\n)/gm);i=c.length;if(i===0||c[0]!=="WEBVTT")return b;for(h++;h<i;){j=[];try{for(var m=h;m<i&&!c[m];)m++;h=m;var o=c[h++];m= +void 0;var q={};if(!o||o.indexOf("--\>")===-1)throw"Bad cue";m=o.replace(/--\>/," --\> ").split(/[\t ]+/);if(m.length<2)throw"Bad cue";q.id=o;q.start=f(m[0]);q.end=f(m[2]);for(p=q;h<i&&c[h];)j.push(c[h++]);p.text=j.join("<br />");e.push(n("subtitle",p))}catch(s){for(h=h;h<i&&c[h];)h++;h=h}}b.data=e;return b})})(Popcorn);(function(r){r.parser("parseXML","XML",function(f){var n={title:"",remote:"",data:[]},c={},b=function(m){m=m.split(":");if(m.length===1)return parseFloat(m[0],10);else if(m.length===2)return parseFloat(m[0],10)+parseFloat(m[1]/12,10);else if(m.length===3)return parseInt(m[0]*60,10)+parseFloat(m[1],10)+parseFloat(m[2]/12,10);else if(m.length===4)return parseInt(m[0]*3600,10)+parseInt(m[1]*60,10)+parseFloat(m[2],10)+parseFloat(m[3]/12,10)},e=function(m){for(var o={},q=0,s=m.length;q<s;q++){var d=m.item(q).nodeName, +A=m.item(q).nodeValue,y=c[A];if(d==="in")o.start=b(A);else if(d==="out")o.end=b(A);else if(d==="resourceid")for(var x in y){if(y.hasOwnProperty(x))if(!o[x]&&x!=="id")o[x]=y[x]}else o[d]=A}return o},h=function(m,o){var q={};q[m]=o;return q},i=function(m,o,q){var s={};r.extend(s,o,e(m.attributes),{text:m.textContent||m.text});o=m.childNodes;if(o.length<1||o.length===1&&o[0].nodeType===3)if(q)c[s.id]=s;else n.data.push(h(m.nodeName,s));else for(m=0;m<o.length;m++)o[m].nodeType===1&&i(o[m],s,q)};f=f.documentElement.childNodes; +for(var j=0,p=f.length;j<p;j++)if(f[j].nodeType===1)f[j].nodeName==="manifest"?i(f[j],{},true):i(f[j],{},false);return n})})(Popcorn);(function(){var r=false,f=false;Popcorn.player("soundcloud",{_canPlayType:function(n,c){return/(?:http:\/\/www\.|http:\/\/|www\.|\.|^)(soundcloud)/.test(c)&&n.toLowerCase()!=="video"},_setup:function(n){function c(){r=true;SC.initialize({client_id:"PRaNFlda6Bhf5utPjUsptg"});SC.get("/resolve",{url:e.src},function(A){e.width=e.style.width?""+e.offsetWidth:"560";e.height=e.style.height?""+e.offsetHeight:"315";h.scrolling="no";h.frameborder="no";h.id="soundcloud-"+Popcorn.guid();h.src="http://w.soundcloud.com/player/?url="+ +A.uri+"&show_artwork=false&buying=false&liking=false&sharing=false";h.width="100%";h.height="100%";n.loadListener=function(){n.widget=o=SC.Widget(h.id);o.bind(SC.Widget.Events.FINISH,function(){e.pause();e.dispatchEvent("ended")});o.bind(SC.Widget.Events.PLAY_PROGRESS,function(y){j=y.currentPosition/1E3;e.dispatchEvent("timeupdate")});o.bind(SC.Widget.Events.PLAY,function(){p=m=false;e.dispatchEvent("play");e.dispatchEvent("playing");e.currentTime=j;d.next()});o.bind(SC.Widget.Events.PAUSE,function(){p= +m=true;e.dispatchEvent("pause");d.next()});o.bind(SC.Widget.Events.READY,function(){o.getDuration(function(y){q=y/1E3;e.style.visibility="visible";e.dispatchEvent("durationchange");e.readyState=4;e.dispatchEvent("readystatechange");e.dispatchEvent("loadedmetadata");e.dispatchEvent("loadeddata");e.dispatchEvent("canplaythrough");e.dispatchEvent("load");!e.paused&&e.play()});o.getVolume(function(y){i=y/100})})};h.addEventListener("load",n.loadListener,false);e.appendChild(h)})}function b(){if(f)(function A(){setTimeout(function(){r? +c():A()},100)})();else{f=true;Popcorn.getScript("http://w.soundcloud.com/player/api.js",function(){Popcorn.getScript("http://connect.soundcloud.com/sdk.js",function(){c()})})}}var e=this,h=document.createElement("iframe"),i=1,j=0,p=true,m=true,o,q=0,s=false,d=Popcorn.player.playerQueue();n._container=h;e.style.visibility="hidden";e.play=function(){p=false;d.add(function(){if(m)o&&o.play();else d.next()})};e.pause=function(){p=true;d.add(function(){if(m)d.next();else o&&o.pause()})};Object.defineProperties(e, +{muted:{set:function(A){if(A){o&&o.getVolume(function(y){i=y/100});o&&o.setVolume(0);s=true}else{o&&o.setVolume(i*100);s=false}e.dispatchEvent("volumechange")},get:function(){return s}},volume:{set:function(A){o&&o.setVolume(A*100);i=A;e.dispatchEvent("volumechange")},get:function(){return s?0:i}},currentTime:{set:function(A){j=A;o&&o.seekTo(A*1E3);e.dispatchEvent("seeked");e.dispatchEvent("timeupdate")},get:function(){return j}},duration:{get:function(){return q}},paused:{get:function(){return p}}}); +r?c():b()},_teardown:function(n){var c=n.widget,b=SC.Widget.Events,e=n._container;n.destroyed=true;if(c)for(var h in b)c&&c.unbind(b[h]);else e.removeEventListener("load",n.loadEventListener,false)}})})();(function(){function r(n){var c=r.options;n=c.parser[c.strictMode?"strict":"loose"].exec(n);for(var b={},e=14;e--;)b[c.key[e]]=n[e]||"";b[c.q.name]={};b[c.key[12]].replace(c.q.parser,function(h,i,j){if(i)b[c.q.name][i]=j});return b}function f(n,c){return/player.vimeo.com\/video\/\d+/.test(c)||/vimeo.com\/\d+/.test(c)}r.options={strictMode:false,key:["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],q:{name:"queryKey", +parser:/(?:^|&)([^&=]*)=?([^&]*)/g},parser:{strict:/^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,loose:/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/}};Popcorn.player("vimeo",{_canPlayType:f,_setup:function(n){function c(l,k){var t=y.src.split("?")[0],u=JSON.stringify({method:l, +value:k});if(t.substr(0,2)==="//")t=window.location.protocol+t;y.contentWindow?y.contentWindow.postMessage(u,t):o.unload()}function b(l){if(l.origin==="http://player.vimeo.com"){var k;try{k=JSON.parse(l.data)}catch(t){console.warn(t)}if(k.player_id==m){k.method&&a[k.method]&&a[k.method](k);k.event&&g[k.event]&&g[k.event](k)}}}function e(){d||(d=setInterval(function(){o.dispatchEvent("timeupdate")},i));s||(s=setInterval(function(){c("getCurrentTime")},j))}function h(){if(d){clearInterval(d);d=0}if(s){clearInterval(s); +s=0}}var i=250,j=16,p={MEDIA_ERR_ABORTED:1,MEDIA_ERR_NETWORK:2,MEDIA_ERR_DECODE:3,MEDIA_ERR_SRC_NOT_SUPPORTED:4},m,o=this,q={q:[],queue:function(l){this.q.push(l);this.process()},process:function(){if(A)for(;this.q.length;)this.q.shift()()}},s,d,A,y=document.createElement("iframe"),x={error:null,src:o.src,NETWORK_EMPTY:0,NETWORK_IDLE:1,NETWORK_LOADING:2,NETWORK_NO_SOURCE:3,networkState:0,HAVE_NOTHING:0,HAVE_METADATA:1,HAVE_CURRENT_DATA:2,HAVE_FUTURE_DATA:3,HAVE_ENOUGH_DATA:4,readyState:0,seeking:false, +currentTime:0,duration:NaN,paused:true,ended:false,autoplay:false,loop:false,volume:1,muted:false,width:0,height:0};Popcorn.forEach("error networkState readyState seeking duration paused ended".split(" "),function(l){Object.defineProperty(o,l,{get:function(){return x[l]}})});Object.defineProperties(o,{src:{get:function(){return x.src},set:function(l){x.src=l;o.load()}},currentTime:{get:function(){return x.currentTime},set:function(l){q.queue(function(){c("seekTo",l)});x.seeking=true;o.dispatchEvent("seeking")}}, +autoplay:{get:function(){return x.autoplay},set:function(l){x.autoplay=!!l}},loop:{get:function(){return x.loop},set:function(l){x.loop=!!l;q.queue(function(){c("setLoop",loop)})}},volume:{get:function(){return x.volume},set:function(l){x.volume=l;q.queue(function(){c("setVolume",x.muted?0:x.volume)});o.dispatchEvent("volumechange")}},muted:{get:function(){return x.muted},set:function(l){x.muted=!!l;q.queue(function(){c("setVolume",x.muted?0:x.volume)});o.dispatchEvent("volumechange")}},width:{get:function(){return y.width}, +set:function(l){y.width=l}},height:{get:function(){return y.height},set:function(l){y.height=l}}});var a={getCurrentTime:function(l){x.currentTime=parseFloat(l.value)},getDuration:function(l){x.duration=parseFloat(l.value);if(!isNaN(x.duration)){x.readyState=4;o.dispatchEvent("durationchange");o.dispatchEvent("loadedmetadata");o.dispatchEvent("loadeddata");o.dispatchEvent("canplay");o.dispatchEvent("canplaythrough")}},getVolume:function(l){x.volume=parseFloat(l.value)}},g={ready:function(){c("addEventListener", +"loadProgress");c("addEventListener","playProgress");c("addEventListener","play");c("addEventListener","pause");c("addEventListener","finish");c("addEventListener","seek");c("getDuration");A=true;q.process();o.dispatchEvent("loadstart")},loadProgress:function(l){o.dispatchEvent("progress");x.duration=parseFloat(l.data.duration)},playProgress:function(l){x.currentTime=parseFloat(l.data.seconds)},play:function(){if(x.seeking){x.seeking=false;o.dispatchEvent("seeked")}x.paused=false;x.ended=false;e(); +o.dispatchEvent("play")},pause:function(){x.paused=true;h();o.dispatchEvent("pause")},finish:function(){x.ended=true;h();o.dispatchEvent("ended")},seek:function(l){x.currentTime=parseFloat(l.data.seconds);x.seeking=false;x.ended=false;o.dispatchEvent("timeupdate");o.dispatchEvent("seeked")}};o.load=function(){A=false;m=Popcorn.guid();var l=r(x.src),k={},t=[],u={api:1,player_id:m};if(f(o.nodeName,l.source)){Popcorn.extend(k,n);Popcorn.extend(k,l.queryKey);Popcorn.extend(k,u);l="http://player.vimeo.com/video/"+ +/\d+$/.exec(l.path)+"?";for(var v in k)k.hasOwnProperty(v)&&t.push(encodeURIComponent(v)+"="+encodeURIComponent(k[v]));l+=t.join("&");x.loop=!!l.match(/loop=1/);x.autoplay=!!l.match(/autoplay=1/);y.width=o.style.width?o.style.width:500;y.height=o.style.height?o.style.height:281;y.frameBorder=0;y.webkitAllowFullScreen=true;y.mozAllowFullScreen=true;y.allowFullScreen=true;y.src=l;o.appendChild(y)}else{l=x.MEDIA_ERR_SRC_NOT_SUPPORTED;x.error={};Popcorn.extend(x.error,p);x.error.code=l;o.dispatchEvent("error")}}; +o.unload=function(){h();window.removeEventListener("message",b,false)};o.play=function(){q.queue(function(){c("play")})};o.pause=function(){q.queue(function(){c("pause")})};setTimeout(function(){window.addEventListener("message",b,false);o.load()},0)},_teardown:function(){this.unload&&this.unload()}})})();(function(r,f){r.onYouTubePlayerAPIReady=function(){onYouTubePlayerAPIReady.ready=true;for(var c=0;c<onYouTubePlayerAPIReady.waiting.length;c++)onYouTubePlayerAPIReady.waiting[c]()};if(r.YT){r.quarantineYT=r.YT;r.YT=null}onYouTubePlayerAPIReady.waiting=[];var n=false;f.player("youtube",{_canPlayType:function(c,b){return typeof b==="string"&&/(?:http:\/\/www\.|http:\/\/|www\.|\.|^)(youtu)/.test(b)&&c.toLowerCase()!=="video"},_setup:function(c){if(!r.YT&&!n){n=true;f.getScript("//youtube.com/player_api")}var b= +this,e=false,h=document.createElement("div"),i=0,j=true,p=false,m=0,o=false,q=100,s=f.player.playerQueue(),d=function(){f.player.defineProperty(b,"currentTime",{set:function(y){if(!c.destroyed){p=true;i=Math.round(+y*100)/100}},get:function(){return i}});f.player.defineProperty(b,"paused",{get:function(){return j}});f.player.defineProperty(b,"muted",{set:function(y){if(c.destroyed)return y;if(c.youtubeObject.isMuted()!==y){y?c.youtubeObject.mute():c.youtubeObject.unMute();o=c.youtubeObject.isMuted(); +b.dispatchEvent("volumechange")}return c.youtubeObject.isMuted()},get:function(){if(c.destroyed)return 0;return c.youtubeObject.isMuted()}});f.player.defineProperty(b,"volume",{set:function(y){if(c.destroyed)return y;if(c.youtubeObject.getVolume()/100!==y){c.youtubeObject.setVolume(y*100);q=c.youtubeObject.getVolume();b.dispatchEvent("volumechange")}return c.youtubeObject.getVolume()/100},get:function(){if(c.destroyed)return 0;return c.youtubeObject.getVolume()/100}});b.play=function(){if(!c.destroyed){j= +false;s.add(function(){if(c.youtubeObject.getPlayerState()!==1){p=false;c.youtubeObject.playVideo()}else s.next()})}};b.pause=function(){if(!c.destroyed){j=true;s.add(function(){c.youtubeObject.getPlayerState()!==2?c.youtubeObject.pauseVideo():s.next()})}}};h.id=b.id+f.guid();c._container=h;b.appendChild(h);var A=function(){var y,x,a,g,l=true,k=function(){if(!c.destroyed){if(p)if(i===c.youtubeObject.getCurrentTime()){p=false;b.dispatchEvent("seeked");b.dispatchEvent("timeupdate")}else c.youtubeObject.seekTo(i); +else{i=c.youtubeObject.getCurrentTime();b.dispatchEvent("timeupdate")}setTimeout(k,250)}},t=function(z){var C=c.youtubeObject.getDuration();if(isNaN(C)||C===0)setTimeout(function(){t(z*2)},z*1E3);else{b.duration=C;b.dispatchEvent("durationchange");b.dispatchEvent("loadedmetadata");b.dispatchEvent("loadeddata");b.readyState=4;k();b.dispatchEvent("canplaythrough")}};c.controls=+c.controls===0||+c.controls===1?c.controls:1;c.annotations=+c.annotations===1||+c.annotations===3?c.annotations:1;y=/^.*(?:\/|v=)(.{11})/.exec(b.src)[1]; +x=(b.src.split("?")[1]||"").replace(/v=.{11}/,"");x=x.replace(/&t=(?:(\d+)m)?(?:(\d+)s)?/,function(z,C,E){C|=0;E|=0;m=+E+C*60;return""});x=x.replace(/&start=(\d+)?/,function(z,C){C|=0;m=C;return""});e=/autoplay=1/.test(x);x=x.split(/[\&\?]/g);a={wmode:"transparent"};for(var u=0;u<x.length;u++){g=x[u].split("=");a[g[0]]=g[1]}c.youtubeObject=new YT.Player(h.id,{height:"100%",width:"100%",wmode:"transparent",playerVars:a,videoId:y,events:{onReady:function(){q=b.volume;o=b.muted;v();j=b.paused;d();c.youtubeObject.playVideo(); +b.currentTime=m},onStateChange:function(z){if(!(c.destroyed||z.data===-1))if(z.data===2){j=true;b.dispatchEvent("pause");s.next()}else if(z.data===1&&!l){j=false;b.dispatchEvent("play");b.dispatchEvent("playing");s.next()}else if(z.data===0)b.dispatchEvent("ended");else if(z.data===1&&l){l=false;if(e||!b.paused)j=false;j&&c.youtubeObject.pauseVideo();t(0.025)}},onError:function(z){if([2,100,101,150].indexOf(z.data)!==-1){b.error={customCode:z.data};b.dispatchEvent("error")}}}});var v=function(){if(!c.destroyed){if(o!== +c.youtubeObject.isMuted()){o=c.youtubeObject.isMuted();b.dispatchEvent("volumechange")}if(q!==c.youtubeObject.getVolume()){q=c.youtubeObject.getVolume();b.dispatchEvent("volumechange")}setTimeout(v,250)}}};onYouTubePlayerAPIReady.ready?A():onYouTubePlayerAPIReady.waiting.push(A)},_teardown:function(c){c.destroyed=true;var b=c.youtubeObject;if(b){b.stopVideo();b.clearVideo&&b.clearVideo()}this.removeChild(document.getElementById(c._container.id))}})})(window,Popcorn); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/AdaptivePlayer.js --- a/web/res/metadataplayer/AdaptivePlayer.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/AdaptivePlayer.js Sun Apr 21 21:54:24 2013 +0200 @@ -6,7 +6,7 @@ IriSP.Widgets.AdaptivePlayer.prototype.defaults = { mime_type: "video/mp4", - normal_player: "PopcornPlayer", + normal_player: "HtmlPlayer", fallback_player: "JwpPlayer" } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Annotation.css --- a/web/res/metadataplayer/Annotation.css Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Annotation.css Sun Apr 21 21:54:24 2013 +0200 @@ -6,10 +6,6 @@ margin: 0; } -.Ldt-Annotation-Highlight { - background: #ffa0fc; -} - .Ldt-Annotation-Widget.Ldt-Annotation-ShowTop { border-top-style: solid; padding-top: 1px; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Annotation.js --- a/web/res/metadataplayer/Annotation.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Annotation.js Sun Apr 21 21:54:24 2013 +0200 @@ -76,17 +76,12 @@ return; } var title = currentAnnotation.title, - description = currentAnnotation.description.replace(/(^\s+|\s+$)/g,''); - if (currentAnnotation.found) { - var rgxp = _this.source.getAnnotations().regexp || /^$/, - repl = '<span class="Ldt-Annotation-Highlight">$1</span>'; - title = title.replace(rgxp,repl); - description = description.replace(rgxp,repl).replace(/[\n\r]+/gm,'<br />'); - } - _this.$.find(".Ldt-Annotation-Title").html(title || "(" + _this.l10n.untitled + ")"); + description = currentAnnotation.description.replace(/(^\s+|\s+$)/g,''), + rx = (currentAnnotation.found ? (_this.source.getAnnotations().regexp || false) : false); + _this.$.find(".Ldt-Annotation-Title").html(IriSP.textFieldHtml(title,rx) || "(" + _this.l10n.untitled + ")"); if (description) { _this.$.find(".Ldt-Annotation-Description-Block").removeClass("Ldt-Annotation-EmptyBlock"); - _this.$.find(".Ldt-Annotation-Description").html(description); + _this.$.find(".Ldt-Annotation-Description").html(IriSP.textFieldHtml(description,rx)); } else { _this.$.find(".Ldt-Annotation-Description-Block").addClass("Ldt-Annotation-EmptyBlock"); } @@ -156,7 +151,7 @@ this.insertSubwidget(this.$.find(".Ldt-Annotation-Social"), { type: "Social" }, "socialWidget"); } - this.insertSubwidget(this.$.find(".Ldt-Annotation-Arrow"), { type: "Arrow" }, "arrow"); + this.insertSubwidget(this.$.find(".Ldt-Annotation-Arrow"), { type: "Arrow", width: this.width }, "arrow"); this.onMediaEvent("timeupdate",timeupdate); this.onMdpEvent("Annotation.hide","hide"); this.onMdpEvent("Annotation.show","show"); @@ -172,6 +167,16 @@ this.source.getAnnotations().on("found", highlightTitleAndDescription); this.source.getAnnotations().on("not-found", highlightTitleAndDescription); this.source.getAnnotations().on("search-cleared", highlightTitleAndDescription); + IriSP.attachDndData(this.$.find("h3"), function() { + return { + title: currentAnnotation.title, + description: currentAnnotation.description, + image: currentAnnotation.thumbnail, + uri: (typeof currentAnnotation.url !== "undefined" + ? currentAnnotation.url + : (document.location.href.replace(/#.*$/,'') + '#id=' + currentAnnotation.id)) + } + }); } IriSP.Widgets.Annotation.prototype.sendBounds = function() { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/AnnotationsList.css --- a/web/res/metadataplayer/AnnotationsList.css Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/AnnotationsList.css Sun Apr 21 21:54:24 2013 +0200 @@ -1,9 +1,6 @@ /* AnnotationsListWidget */ .Ldt-AnnotationsListWidget { - border: none; margin: 0; padding: 0; - overflow: auto; - max-height: 480px; } .Ldt-AnnotationsListWidget a { text-decoration: none; @@ -28,9 +25,6 @@ .Ldt-AnnotationsList-li.selected { background-image: url(img/pinstripe-grey.png); } -.Ldt-AnnotationsList-highlight { - background: #FFA0FC; -} .Ldt-AnnotationsList-ThumbContainer { float: left; width: 80px; @@ -57,14 +51,25 @@ margin: 2px 2px 0 82px; font-weight: bold; } -h3.Ldt-AnnotationsList-Title a { + +.Ldt-AnnotationsList-Title a { color: #0068c4; } + p.Ldt-AnnotationsList-Description { margin: 2px 0 2px 82px; font-size: 12px; color: #333333; } + +.Ldt-AnnotationsList-Description a { + color: #0068c4; +} + +.Ldt-AnnotationsList-Description a:hover { + text-decoration: underline; color: #800000; +} + ul.Ldt-AnnotationsList-Tags { list-style: none; padding: 0; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/AnnotationsList.js --- a/web/res/metadataplayer/AnnotationsList.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/AnnotationsList.js Sun Apr 21 21:54:24 2013 +0200 @@ -65,15 +65,15 @@ IriSP.Widgets.AnnotationsList.prototype.annotationTemplate = '<li class="Ldt-AnnotationsList-li Ldt-TraceMe" trace-info="annotation-id:{{id}}, media-id:{{media_id}}" style="{{specific_style}}">' + '<div class="Ldt-AnnotationsList-ThumbContainer">' - + '<a href="{{url}}">' + + '<a href="{{url}}" draggable="true">' + '<img class="Ldt-AnnotationsList-Thumbnail" src="{{thumbnail}}" />' + '</a>' + '</div>' + '<div class="Ldt-AnnotationsList-Duration">{{begin}} - {{end}}</div>' - + '<h3 class="Ldt-AnnotationsList-Title">' - + '<a href="{{url}}">{{title}}</a>' + + '<h3 class="Ldt-AnnotationsList-Title" draggable="true">' + + '<a href="{{url}}">{{{htitle}}}</a>' + '</h3>' - + '<p class="Ldt-AnnotationsList-Description">{{description}}</p>' + + '<p class="Ldt-AnnotationsList-Description">{{{hdescription}}}</p>' + '{{#tags.length}}' + '<ul class="Ldt-AnnotationsList-Tags">' + '{{#tags}}' @@ -180,11 +180,12 @@ annotationType : _annotation.annotationType.id } ) - : '#id=' + _annotation.id + : document.location.href.replace(/#.*$/,'') + '#id=' + _annotation.id ) ); var _title = (_annotation.title || "").replace(_annotation.description,''), - _description = _annotation.description; + _description = _annotation.description, + _thumbnail = (typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail ? _annotation.thumbnail : _this.default_thumbnail); if (!_annotation.title) { _title = _annotation.creator; } @@ -202,11 +203,11 @@ var _data = { id : _annotation.id, media_id : _annotation.getMedia().id, - title : _title, - description : _description, + htitle : IriSP.textFieldHtml(_title), + hdescription : IriSP.textFieldHtml(_description), begin : _annotation.begin.toString(), end : _annotation.end.toString(), - thumbnail : typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail ? _annotation.thumbnail : _this.default_thumbnail, + thumbnail : _thumbnail, url : _url, tags : _annotation.getTagTexts(), specific_style : (typeof _bgcolor !== "undefined" ? "background-color: " + _bgcolor : ""), @@ -229,6 +230,12 @@ _annotation.trigger("unselect"); }) .appendTo(_this.list_$); + IriSP.attachDndData(_el.find("[draggable]"), { + title: _title, + description: _description, + uri: _url, + image: _annotation.thumbnail + }); _el.on("remove", function() { _annotation.off("select", _onselect); _annotation.off("unselect", _onunselect); @@ -265,10 +272,11 @@ }); if (this.source.getAnnotations().searching) { + var rx = _this.source.getAnnotations().regexp || false; this.$.find(".Ldt-AnnotationsList-Title a, .Ldt-AnnotationsList-Description").each(function() { var _$ = IriSP.jQuery(this); - _$.html(_$.text().replace(/(^\s+|\s+$)/g,'').replace(_this.source.getAnnotations().regexp, '<span class="Ldt-AnnotationsList-highlight">$1</span>')) - }) + _$.html(IriSP.textFieldHtml(_$.text(), rx)); + }); } } diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/AutoPlayer.js --- a/web/res/metadataplayer/AutoPlayer.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/AutoPlayer.js Sun Apr 21 21:54:24 2013 +0200 @@ -27,7 +27,7 @@ }, { regexp: /\.(ogg|ogv|webm)$/, - type: "PopcornPlayer" + type: "HtmlPlayer" }, { regexp: /^(https?:\/\/)?(www\.)?youtube\.com/, @@ -57,7 +57,7 @@ if (_opts.type === "AdaptivePlayer") { var _canPlayType = document.createElement('video').canPlayType("video/mp4"); - _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? "PopcornPlayer" : "JwpPlayer"; + _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? "HtmlPlayer" : "JwpPlayer"; } if (_rtmprgx.test(this.video)) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/HtmlPlayer.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/res/metadataplayer/HtmlPlayer.js Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,127 @@ +IriSP.Widgets.HtmlPlayer = function(player, config) { + IriSP.Widgets.Widget.call(this, player, config); +}; + +IriSP.Widgets.HtmlPlayer.prototype = new IriSP.Widgets.Widget(); + + +IriSP.Widgets.HtmlPlayer.prototype.defaults = { +} + +IriSP.Widgets.HtmlPlayer.prototype.draw = function() { + + + if (typeof this.video === "undefined") { + this.video = this.media.video; + } + + if (this.url_transform) { + this.video = this.url_transform(this.video); + } + + var videoEl = IriSP.jQuery('<video>'); + videoEl.attr({ + width : this.width, + height : this.height || undefined + }); + if(typeof this.video === "string"){ + videoEl.attr("src",this.video); + } else { + for (var i = 0; i < this.video.length; i++) { + var _srcNode = IriSP.jQuery('<source>'); + _srcNode.attr({ + src: this.video[i].src, + type: this.video[i].type + }); + videoEl.append(_srcNode); + } + } + this.$.html(videoEl); + if (this.autostart || this.autoplay) { + videoEl.attr("autoplay", true); + } + + var mediaEl = videoEl[0], + media = this.media; + + // Binding functions to Popcorn + media.on("setcurrenttime", function(_milliseconds) { + try { + mediaEl.currentTime = (_milliseconds / 1000); + } catch (err) { + + } + }); + + media.on("setvolume", function(_vol) { + media.volume = _vol; + try { + mediaEl.volume = _vol; + } catch (err) { + + } + }); + + media.on("setmuted", function(_muted) { + media.muted = _muted; + try { + mediaEl.muted = _muted; + } catch (err) { + + } + }); + + media.on("setplay", function() { + try { + mediaEl.play(); + } catch (err) { + + } + }); + + media.on("setpause", function() { + try { + mediaEl.pause(); + } catch (err) { + + } + }); + + // Binding Popcorn events to media + function getVolume() { + media.muted = mediaEl.muted; + media.volume = mediaEl.volume; + } + + videoEl.on("loadedmetadata", function() { + getVolume(); + media.trigger("loadedmetadata"); + media.trigger("volumechange"); + }) + + videoEl.on("timeupdate", function() { + media.trigger("timeupdate", new IriSP.Model.Time(1000*mediaEl.currentTime)); + }); + + videoEl.on("volumechange", function() { + getVolume(); + media.trigger("volumechange"); + }) + + videoEl.on("play", function() { + media.trigger("play"); + }); + + videoEl.on("pause", function() { + media.trigger("pause"); + }); + + videoEl.on("seeking", function() { + media.trigger("seeking"); + }); + + videoEl.on("seeked", function() { + media.trigger("seeked"); + }); + +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/JwpPlayer.js --- a/web/res/metadataplayer/JwpPlayer.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/JwpPlayer.js Sun Apr 21 21:54:24 2013 +0200 @@ -36,7 +36,9 @@ _opts.flashplayer = IriSP.getLib("jwPlayerSWF"); _opts["controlbar.position"] = "none"; _opts.width = this.width; - _opts.height = this.height || Math.floor(.643*this.width); + if (this.height) { + _opts.height = this.height; + } for (var i = 0; i < _props.length; i++) { if (typeof this[_props[i]] !== "undefined") { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/LdtPlayer-core.css --- a/web/res/metadataplayer/LdtPlayer-core.css Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/LdtPlayer-core.css Sun Apr 21 21:54:24 2013 +0200 @@ -12,4 +12,8 @@ /* font-family: Arial, Helvetica, sans-serif; */ color: black; font-size: 12px; -} \ No newline at end of file +} + +.Ldt-Highlight { + background: #ffa0fc; +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/LdtPlayer-core.js --- a/web/res/metadataplayer/LdtPlayer-core.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/LdtPlayer-core.js Sun Apr 21 21:54:24 2013 +0200 @@ -119,21 +119,24 @@ _this.widgets.push(null); _this.loadWidget(widgetconf, function(widget) { _this.widgets[key] = widget; + if (widget.isLoaded()) { + _this.trigger("widget-loaded"); + } }); }); this.$.find('.Ldt-Loader').detach(); - var endload = false; + this.widgetsLoaded = false; this.on("widget-loaded", function() { - if (endload) { + if (_this.widgetsLoaded) { return; } var isloaded = !IriSP._(_this.widgets).any(function(w) { return !(w && w.isLoaded()) }); if (isloaded) { - endload = true; + _this.widgetsLoaded = true; _this.trigger("widgets-loaded"); } }); @@ -243,11 +246,99 @@ } } +IriSP.textFieldHtml = function(_text, _regexp, _extend) { + var list = [], + positions = [], + text = _text.replace(/(^\s+|\s+$)/g,''); + + function addToList(_rx, _startHtml, _endHtml) { + while(true) { + var result = _rx.exec(text); + if (!result) { + break; + } + var end = _rx.lastIndex, + start = result.index; + list.push({ + start: start, + end: end, + startHtml: (typeof _startHtml === "function" ? _startHtml(result) : _startHtml), + endHtml: (typeof _endHtml === "function" ? _endHtml(result) : _endHtml) + }); + positions.push(start); + positions.push(end); + } + } + + if (_regexp) { + addToList(_regexp, '<span class="Ldt-Highlight">', '</span>'); + } + + addToList(/(https?:\/\/)?\w+\.\w+\S+/gm, function(matches) { + return '<a href="' + (matches[1] ? '' : 'http://') + matches[0] + '" target="_blank">' + }, '</a>'); + addToList(/@([\d\w]{1,15})/gm, function(matches) { + return '<a href="http://twitter.com/' + matches[1] + '" target="_blank">' + }, '</a>'); + addToList(/\*[^*]+\*/gm, '<b>', '</b>'); + addToList(/[\n\r]+/gm, '', '<br />'); + + IriSP._(_extend).each(function(x) { + addToList.apply(null, x); + }); + + positions = IriSP._(positions) + .chain() + .uniq() + .sortBy(function(p) { return parseInt(p) }) + .value(); + + var res = "", lastIndex = 0; + + for (var i = 0; i < positions.length; i++) { + var pos = positions[i]; + res += text.substring(lastIndex, pos); + for (var j = list.length - 1; j >= 0; j--) { + var item = list[j]; + if (item.start < pos && item.end >= pos) { + res += item.endHtml; + } + } + for (var j = 0; j < list.length; j++) { + var item = list[j]; + if (item.start <= pos && item.end > pos) { + res += item.startHtml; + } + } + lastIndex = pos; + } + + res += text.substring(lastIndex); + + return res; + +} + IriSP.log = function() { if (typeof console !== "undefined" && typeof IriSP.logging !== "undefined" && IriSP.logging) { console.log.apply(console, arguments); } } + +IriSP.attachDndData = function(jqSel, data) { + jqSel.attr("draggable", "true").on("dragstart", function(_event) { + var d = (typeof data === "function" ? data.call(this) : data); + try { + IriSP._(d).each(function(v, k) { + if (v) { + _event.originalEvent.dataTransfer.setData("text/x-iri-" + k, v); + } + }); + } catch(err) { + _event.originalEvent.dataTransfer.setData("Text", JSON.stringify(d)); + } + }); +} /* TODO: Separate Project-specific data from Source */ /* model.js is where data is stored in a standard form, whatever the serializer */ @@ -269,11 +360,12 @@ var uidbase = rand16(8) + "-" + rand16(4) + "-", uidincrement = Math.floor(Math.random()*0x10000); var charsub = [ - [ 'a', 'á', 'à', 'â', 'ä' ], - [ 'c', 'ç' ], - [ 'e', 'é', 'è', 'ê', 'ë' ], - [ 'i', 'í', 'ì', 'î', 'ï' ], - [ 'o', 'ó', 'ò', 'ô', 'ö' ] + '[aáàâä]', + '[cç]', + '[eéèêë]', + '[iíìîï]', + '[oóòôö]', + '[uùûü]' ]; var removeChars = [ @@ -321,10 +413,7 @@ remrx = new RegExp(remsrc,"gm"), txt = _text.toLowerCase().replace(remrx,"") res = [], - charsrc = ns._(charsub).map(function(c) { - return "(" + c.join("|") + ")"; - }), - charsrx = ns._(charsrc).map(function(c) { + charsrx = ns._(charsub).map(function(c) { return new RegExp(c); }), src = ""; @@ -333,7 +422,7 @@ src += remsrc + "*"; } var l = txt[j]; - ns._(charsrc).each(function(v, k) { + ns._(charsub).each(function(v, k) { l = l.replace(charsrx[k], v); }); src += l; @@ -473,7 +562,7 @@ */ Model.List.prototype.searchByTitle = function(_text, _iexact) { var _iexact = _iexact || false, - _rgxp = Model.regexpFromTextOrArray(_text, true); + _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact); return this.filter(function(_element) { return _rgxp.test(_element.title); }); @@ -481,7 +570,7 @@ Model.List.prototype.searchByDescription = function(_text, _iexact) { var _iexact = _iexact || false, - _rgxp = Model.regexpFromTextOrArray(_text, true); + _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact); return this.filter(function(_element) { return _rgxp.test(_element.description); }); @@ -489,9 +578,10 @@ Model.List.prototype.searchByTextFields = function(_text, _iexact) { var _iexact = _iexact || false, - _rgxp = Model.regexpFromTextOrArray(_text, true); + _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact); return this.filter(function(_element) { - return _rgxp.test(_element.description) || _rgxp.test(_element.title); + var keywords = (_element.keywords || _element.getTagTexts() || []).join(", "); + return _rgxp.test(_element.description) || _rgxp.test(_element.title) || _rgxp.test(keywords); }); } @@ -676,7 +766,7 @@ } _res += pad(2, _hms.minutes) + ':' + pad(2, _hms.seconds); if (showCs) { - _res += "." + Math.round(_hms.milliseconds / 100) + _res += "." + Math.floor(_hms.milliseconds / 100) } return _res; } @@ -797,6 +887,7 @@ this.volume = .5; this.paused = true; this.muted = false; + this.loadedMetadata = false; var _this = this; this.on("play", function() { _this.paused = false; @@ -821,6 +912,9 @@ _this.trigger("enter-annotation",_a); }); }); + this.on("loadedmetadata", function() { + _this.loadedMetadata = true; + }) } Model.Playable.prototype = new Model.Element(); @@ -1064,17 +1158,6 @@ Model.Mashup.prototype = new Model.Playable(); -Model.Mashup.prototype.checkLoaded = function() { - var loaded = !!this.segments.length; - this.getMedias().forEach(function(_m) { - loaded = loaded && _m.loaded; - }); - this.loaded = loaded; - if (loaded) { - this.trigger("loadedmetadata"); - } -} - Model.Mashup.prototype.updateTimes = function() { var _time = 0; this.segments.forEach(function(_segment) { @@ -1252,12 +1335,12 @@ Model.Source.prototype.getList = function(_listId, _global) { _global = (typeof _global !== "undefined" && _global); - if (_global || typeof this.contents[_listId] === "undefined") { + if (_global) { return this.directory.getGlobalList().filter(function(_e) { return (_e.elementType === _listId); }); } else { - return this.contents[_listId]; + return this.contents[_listId] || new IriSP.Model.List(this.directory); } } @@ -1391,6 +1474,7 @@ url: this.url, dataType: dataType, data: urlparams, + traditional: true, success: function(_result) { _this.deSerialize(_result); _this.handleCallbacks(); @@ -1441,6 +1525,9 @@ return Model; })(IriSP); + +/* END model.js */ + IriSP.language = 'en'; IriSP.libFiles = { @@ -1479,7 +1566,8 @@ underscore : "http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.3.3/underscore-min.js", Mustache : "http://cdnjs.cloudflare.com/ajax/libs/mustache.js/0.5.0-dev/mustache.min.js", raphael : "http://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js", - json : "http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js" + json : "http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js", + popcorn: "http://cdn.popcornjs.org/code/dist/popcorn-complete.min.js" }, useCdn : false } @@ -1491,6 +1579,9 @@ noCss: true, requires: [ "popcorn" ] }, + HtmlPlayer: { + noCss: true + }, JwpPlayer: { noCss: true, requires: [ "jwplayer" ] @@ -1582,8 +1673,16 @@ _this[_key] = _value; }); + this.$ = IriSP.jQuery('#' + this.container); + if (typeof this.width === "undefined") { - this.width = player.config.width; + this.width = this.$.width(); + } else { + this.$.css("width", this.width); + } + + if (typeof this.height !== "undefined") { + this.$.css("height", this.height); } /* Setting this.player at the end in case it's been overriden @@ -1591,26 +1690,7 @@ */ this.player = player; - /* Getting metadata */ - this.source = player.loadMetadata(this.metadata); - - /* Call draw when loaded */ - this.source.onLoad(function() { - if (_this.media_id) { - _this.media = this.getElement(_this.media_id); - } else { - var _mediaopts = { - is_mashup: _this.is_mashup || false - } - _this.media = this.getCurrentMedia(_mediaopts); - } - - _this.draw(); - player.trigger("widget-loaded"); - }); - /* Adding classes and html attributes */ - this.$ = IriSP.jQuery('#' + this.container); this.$.addClass("Ldt-TraceMe Ldt-Widget").attr("widget-type", _type); this.l10n = ( @@ -1623,6 +1703,31 @@ ) ); + /* Loading Metadata if required */ + + if (this.metadata) { + /* Getting metadata */ + this.source = player.loadMetadata(this.metadata); + + /* Call draw when loaded */ + this.source.onLoad(function() { + if (_this.media_id) { + _this.media = this.getElement(_this.media_id); + } else { + var _mediaopts = { + is_mashup: _this.is_mashup || false + } + _this.media = this.getCurrentMedia(_mediaopts); + } + + _this.draw(); + player.trigger("widget-loaded"); + }); + } else { + this.draw(); + } + + }; IriSP.Widgets.Widget.prototype.defaults = {} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Mediafragment.js --- a/web/res/metadataplayer/Mediafragment.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Mediafragment.js Sun Apr 21 21:54:24 2013 +0200 @@ -4,9 +4,10 @@ this.last_hash_value = ""; window.onhashchange = this.functionWrapper("goToHash"); if (typeof window.addEventListener !== "undefined") { + var _this = this; window.addEventListener('message', function(_msg) { if (/^#/.test(_msg.data)) { - this.setWindowHash(_msg.data); + _this.setWindowHash(_msg.data); } }) }; @@ -17,15 +18,18 @@ IriSP.Widgets.Mediafragment.prototype = new IriSP.Widgets.Widget(); IriSP.Widgets.Mediafragment.prototype.draw = function() { - this.onMediaEvent("pause","setHashToTime"); - this.onMediaEvent("seeked","setHashToTime"); - this.goToHash(); + this.onMediaEvent("setpause","setHashToTime"); var _this = this; this.getWidgetAnnotations().forEach(function(_annotation) { _annotation.on("click", function() { _this.setHashToAnnotation(_annotation.id); }) - }) + }); + if (this.media.loadedMetadata) { + this.goToHash(); + } else { + this.onMediaEvent("loadedmetadata","goToHash"); + } } IriSP.Widgets.Mediafragment.prototype.setWindowHash = function(_hash) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/MultiSegments.js --- a/web/res/metadataplayer/MultiSegments.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/MultiSegments.js Sun Apr 21 21:54:24 2013 +0200 @@ -79,7 +79,8 @@ line.segmentWidget, IriSP._({ type: "Segments", - annotation_type: _anntype + annotation_type: _anntype, + width: _this.width }).extend(segmentsopts) ); @@ -87,7 +88,8 @@ line.annotationWidget, IriSP._({ type: "Annotation", - annotation_type: _anntype + annotation_type: _anntype, + width: _this.width }).extend(annotationopts) ); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Polemic.js --- a/web/res/metadataplayer/Polemic.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Polemic.js Sun Apr 21 21:54:24 2013 +0200 @@ -19,7 +19,7 @@ IriSP.Widgets.Polemic.prototype.defaults = { element_width : 5, element_height : 5, - max_elements : 15, + max_elements: 20, annotation_type : "tweet", defaultcolor : "#585858", foundcolor : "#fc00ff", @@ -113,7 +113,7 @@ function displayAnnotation(_elx, _ely, _pol, _col, _annotation) { var _html = Mustache.to_html( - '<div class="Ldt-Polemic-TweetDiv Ldt-TraceMe" trace-info="annotation-id:{{id}}, media-id={{media_id}}, polemic={{polemic}}" polemic-color="{{color}}"' + '<div class="Ldt-Polemic-TweetDiv Ldt-TraceMe" trace-info="annotation-id:{{id}}, media-id:{{media_id}}, polemic:{{polemic}}, time:{{time}}" polemic-color="{{color}}"' + ' tweet-title="{{title}}" annotation-id="{{id}}" style="width: {{width}}px; height: {{height}}px; top: {{top}}px; left: {{left}}px; background: {{color}}"></div>', { id: _annotation.id, @@ -124,7 +124,8 @@ color: _col, width: (_this.element_width-1), height: _this.element_height, - title: _annotation.title + title: _annotation.title, + time: _annotation.begin.toString() }); var _el = IriSP.jQuery(_html); _el.mouseover(function() { @@ -134,13 +135,23 @@ }).click(function() { _annotation.trigger("click"); }); + IriSP.attachDndData(_el, { + title: _annotation.title, + description: _annotation.description, + image: _annotation.thumbnail, + uri: (typeof _annotation.url !== "undefined" + ? _annotation.url + : (document.location.href.replace(/#.*$/,'') + '#id=' + _annotation.id)) + }); _annotation.on("select", function() { - _this.tooltip.show( - Math.floor(_elx + (_this.element_width - 1) / 2), - _ely, - _annotation.title, - _col - ); + if (_this.tooltip) { + _this.tooltip.show( + + Math.floor(_elx + (_this.element_width - 1) / 2), + + _ely, + _annotation.title, + _col + ); + } _this.$tweets.each(function() { var _e = IriSP.jQuery(this); _e.css( @@ -150,7 +161,9 @@ }); }); _annotation.on("unselect", function() { - _this.tooltip.hide(); + if (_this.tooltip) { + _this.tooltip.hide(); + } _this.$tweets.css("opacity",1); }); _annotation.on("found", function() { @@ -268,12 +281,16 @@ _html = '<p>' + _this.l10n.from_ + _el.attr("begin-time") + _this.l10n._to_ + _el.attr("end-time") + '</p>'; for (var _i = 0; _i <= _this.polemics.length; _i++) { var _color = _i ? _this.polemics[_i - 1].color : _this.defaultcolor; - _html += '<div class="Ldt-Tooltip-Color" style="background: ' + _color + '"></div><p>' + _nums[_i] + _this.l10n._annotations + '</p>' + _html += '<div class="Ldt-Tooltip-AltColor" style="background: ' + _color + '"></div><p>' + _nums[_i] + _this.l10n._annotations + '</p>' } - _this.tooltip.show(_el.attr("pos-x"), _el.attr("pos-y"), _html); + if (_this.tooltip) { + _this.tooltip.show(+ _el.attr("pos-x"), + _el.attr("pos-y"), _html); + } }) .mouseout(function() { - _this.tooltip.hide(); + if (_this.tooltip) { + _this.tooltip.hide(); + } }) } @@ -289,7 +306,15 @@ this.$.append('<div class="Ldt-Polemic-Tooltip"></div>'); - this.insertSubwidget(this.$.find(".Ldt-Polemic-Tooltip"), { type: "Tooltip" }, "tooltip"); + this.insertSubwidget( + this.$.find(".Ldt-Polemic-Tooltip"), + { + type: "Tooltip", + min_x: 0, + max_x: this.width + }, + "tooltip" + ); } IriSP.Widgets.Polemic.prototype.onTimeupdate = function(_time) { diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/PopcornPlayer.js --- a/web/res/metadataplayer/PopcornPlayer.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/PopcornPlayer.js Sun Apr 21 21:54:24 2013 +0200 @@ -7,7 +7,6 @@ /* A Popcorn-based player for HTML5 Video, Youtube and Vimeo */ IriSP.Widgets.PopcornPlayer.prototype.defaults = { - aspect_ratio: 14/9 } IriSP.Widgets.PopcornPlayer.prototype.draw = function() { @@ -21,13 +20,6 @@ this.video = this.url_transform(this.video); } - if (!this.height) { - this.height = Math.floor(this.width/this.aspect_ratio); - this.$.css({ - height: this.height - }); - } - if (/^(https?:\/\/)?(www\.)?vimeo\.com/.test(this.video)) { /* VIMEO */ @@ -62,7 +54,7 @@ _videoEl.attr({ id : _tmpId, width : this.width, - height : this.height + height : this.height || undefined }); if(typeof this.video === "string"){ _videoEl.attr("src",this.video); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Segments.js --- a/web/res/metadataplayer/Segments.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Segments.js Sun Apr 21 21:54:24 2013 +0200 @@ -22,7 +22,7 @@ + '<div class="Ldt-Segments-Tooltip"></div>'; IriSP.Widgets.Segments.prototype.annotationTemplate = - '<div class="Ldt-Segments-Segment Ldt-TraceMe" trace-info="segment-id:{{id}}, media-id:{{media_id}}" segment-text="{{text}}"' + '<div class="Ldt-Segments-Segment Ldt-TraceMe" trace-info="segment-id:{{id}}, media-id:{{media_id}}, from:{{from}}, to:{{to}}" segment-text="{{text}}"' + 'style="top:{{top}}px; height:{{height}}px; left:{{left}}px; width:{{width}}px; background:{{medcolor}}" data-base-color="{{color}}" data-low-color="{{lowcolor}}" data-medium-color="{{medcolor}}"></div>' @@ -83,7 +83,9 @@ top: _top, height: _this.line_height - 1, id : _annotation.id, - media_id : _annotation.getMedia().id + media_id : _annotation.getMedia().id, + from: _annotation.begin.toString(), + to: _annotation.end.toString() }; var _html = Mustache.to_html(_this.annotationTemplate, _data), _el = IriSP.jQuery(_html); @@ -96,7 +98,15 @@ .click(function() { _annotation.trigger("click"); }) - .appendTo(list_$) + .appendTo(list_$); + IriSP.attachDndData(_el, { + title: _annotation.title, + description: _annotation.description, + uri: (typeof _annotation.url !== "undefined" + ? _annotation.url + : (document.location.href.replace(/#.*$/,'') + '#id=' + _annotation.id)), + image: _annotation.thumbnail + }); _annotation.on("select", function() { _this.$segments.each(function() { var _segment = IriSP.jQuery(this); @@ -108,10 +118,14 @@ background: _el.hasClass("found") ? _this.found_color: color, "z-index": ++zindex }); - _this.tooltip.show( _center, _top, _data.text, _data.color ); + if (_this.tooltip) { + _this.tooltip.show( _center, _top, _data.text, _data.color ); + } }); _annotation.on("unselect", function() { - _this.tooltip.hide(); + if (_this.tooltip) { + _this.tooltip.hide(); + } _this.$segments.each(function() { var _segment = IriSP.jQuery(this); _segment.css("background", _segment.hasClass("found") ? _this.found_color : _segment.attr(searching ? "data-low-color" : "data-medium-color")); @@ -131,7 +145,15 @@ background : this.background, margin: "1px 0" }); - this.insertSubwidget(this.$.find(".Ldt-Segments-Tooltip"), { type: "Tooltip" }, "tooltip"); + this.insertSubwidget( + this.$.find(".Ldt-Segments-Tooltip"), + { + type: "Tooltip", + min_x: 0, + max_x: this.width + }, + "tooltip" + ); this.$segments = this.$.find('.Ldt-Segments-Segment'); this.source.getAnnotations().on("search", function() { searching = true; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Slideshare.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/res/metadataplayer/Slideshare.css Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,28 @@ +/* Slideshare widget */ + +.Ldt-SlideShare h2, .Ldt-SlideShare-Container { + border: 1px solid #FFFFFF; + list-style: none outside none; + margin: 0 1px 1px; + position: relative; + +} + +.Ldt-SlideShare h2 { + background: none repeat scroll 0 0 #EFEFEF; + cursor: pointer; + color: #555555; + font-size: 16px; + font-weight: bold; + padding: 4px; +} + +.Ldt-SlideShare hr { + display: none; +} + +.Ldt-SlideShare-Container { + background: url("../css/twcx-img/bgdeplie.png") repeat-x scroll center top #EFEFEF; + font-size: 12px; + padding: 0; +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Slideshare.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/res/metadataplayer/Slideshare.js Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,117 @@ +/* TODO: Add Slide synchronization */ + +IriSP.Widgets.Slideshare = function(player, config) { + IriSP.Widgets.Widget.call(this, player, config); +} + +IriSP.Widgets.Slideshare.prototype = new IriSP.Widgets.Widget(); + +IriSP.Widgets.Slideshare.prototype.defaults = { + annotation_type: "slide", + sync: true, +} + +IriSP.Widgets.Slideshare.prototype.messages = { + fr: { + slides_ : "Diapositives" + }, + en: { + slides_ : "Slides" + } +} + +IriSP.Widgets.Slideshare.prototype.template = + '<div class="Ldt-SlideShare"><h2>{{l10n.slides_}}</h2><hr /><div class="Ldt-SlideShare-Container"></div></div>'; + +IriSP.Widgets.Slideshare.prototype.draw = function() { + + function insertSlideshare(_presentation, _slide) { + if (_lastEmbedded === _presentation) { + if (_embedObject && typeof _embedObject.jumpTo === "function") { + _embedObject.jumpTo(parseInt(_slide)); + } + } else { + _lastEmbedded = _presentation; + var _id = IriSP.Model.getUID(), + _params = { + allowScriptAccess: "always" + } + _atts = { + id: _id + }, + _flashvars = { + doc : _presentation, + startSlide : _slide + }; + $container.html('<div id="' + _id + '"></div>'); + swfobject.embedSWF( + "http://static.slidesharecdn.com/swf/ssplayer2.swf", + _id, + _this.embed_width, + _this.embed_height, + "8", + null, + _flashvars, + _params, + _atts + ); + _embedObject = document.getElementById(_id); + } + $container.show(); + } + + var _annotations = this.getWidgetAnnotations(); + if (!_annotations.length) { + this.$.hide(); + } else { + this.renderTemplate(); + var _lastPres = "", + _embedObject = null, + _oembedCache = {}, + _lastEmbedded = "", + _this = this + $container = this.$.find(".Ldt-SlideShare-Container"); + + this.embed_width = this.embed_width || $container.innerWidth(); + this.embed_height = this.embed_height || Math.floor(this.embed_width * 3/4); + + _annotations.forEach(function(_a) { + _a.on("leave", function() { + $container.hide(); + _lastPres = ""; + }); + _a.on("enter", function() { + var _description = _a.description, + _isurl = /^https?:\/\//.test(_description), + _presentation = _description.replace(/#.*$/,''), + _slidematch = _description.match(/(#|\?|&)id=(\d+)/), + _slide = parseInt(_slidematch && _slidematch.length > 2 ? _slidematch[2] : 1); + if (_presentation !== _lastPres) { + if (_isurl) { + if (typeof _oembedCache[_presentation] === "undefined") { + var _ajaxUrl = "http://www.slideshare.net/api/oembed/1?url=" + + encodeURIComponent(_presentation) + + "&format=jsonp&callback=?"; + IriSP.jQuery.getJSON(_ajaxUrl, function(_oembedData) { + var _presmatch = _oembedData.html.match(/doc=([a-z0-9\-_%]+)/i); + if (_presmatch && _presmatch.length > 1) { + _oembedCache[_presentation] = _presmatch[1]; + insertSlideshare(_presmatch[1], _slide); + } + }); + } else { + insertSlideshare(_oembedCache[_presentation], _slide); + } + } else { + insertSlideshare(_presentation, _slide); + } + } + if (_this.sync && _embedObject && typeof _embedObject.jumpTo === "function") { + _embedObject.jumpTo(parseInt(_slide)); + } + _lastPres = _presentation; + + }) + }) + } +} diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Social.js --- a/web/res/metadataplayer/Social.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Social.js Sun Apr 21 21:54:24 2013 +0200 @@ -18,7 +18,7 @@ } IriSP.Widgets.Social.prototype.template = - '<span class="Ldt-Social">{{#show_url}}<div class="Ldt-Social-Url-Container"><a href="#" target="_blank" class="Ldt-Social-Square Ldt-Social-Url Ldt-TraceMe" title="{{l10n.share_link}}">' + '<span class="Ldt-Social">{{#show_url}}<div class="Ldt-Social-Url-Container"><a href="#" draggable="true" target="_blank" class="Ldt-Social-Square Ldt-Social-Url Ldt-TraceMe" title="{{l10n.share_link}}">' + '</a><div class="Ldt-Social-UrlPop"><input class="Ldt-Social-Input"/><div class="Ldt-Social-CopyBtn">{{l10n.copy}}</div></div></div>{{/show_url}}' + '{{#show_fb}}<a href="#" target="_blank" class="Ldt-Social-Fb Ldt-Social-Ext Ldt-TraceMe" title="{{l10n.share_on}} Facebook"></a>{{/show_fb}}' + '{{#show_twitter}}<a href="#" target="_blank" class="Ldt-Social-Twitter Ldt-Social-Ext Ldt-TraceMe" title="{{l10n.share_on}} Twitter"></a>{{/show_twitter}}' @@ -48,6 +48,9 @@ this.$.find(".Ldt-Social-Url").click(function() { _this.toggleCopy(); return false; + }).on("dragstart", function(e) { + e.originalEvent.dataTransfer.setData("text/x-iri-title",_this.text); + e.originalEvent.dataTransfer.setData("text/x-iri-uri",_this.url); }); this.$.find(".Ldt-Social-Input").focus(function() { this.select(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Tagcloud.css --- a/web/res/metadataplayer/Tagcloud.css Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Tagcloud.css Sun Apr 21 21:54:24 2013 +0200 @@ -2,13 +2,9 @@ * */ .Ldt-Tagcloud-Container { - border: 1px solid #b7b7b7; - padding: 1px; - margin: 0; } ul.Ldt-Tagcloud-List { - background: url(img/pinstripe.png); padding: 5px; margin: 0; list-style: none; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Tooltip.css --- a/web/res/metadataplayer/Tooltip.css Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Tooltip.css Sun Apr 21 21:54:24 2013 +0200 @@ -1,31 +1,123 @@ -/* ToolTip Widget */ +.Ldt-Tooltip { + position: absolute; + height: 0; width: 0; + z-index: 100000; +} + +.Ldt-Tooltip-Main { + position: absolute; bottom: 0; left: -96px; +} + +.Ldt-Tooltip-Corner-NW, +.Ldt-Tooltip-Corner-NE, +.Ldt-Tooltip-Corner-SW, +.Ldt-Tooltip-Corner-SE { + position: absolute; width: 6px; height: 6px; background: url(img/tooltip-corners.png); +} + +.Ldt-Tooltip-Corner-NW, +.Ldt-Tooltip-Corner-SW { + left: 0; +} + +.Ldt-Tooltip-Corner-NE, +.Ldt-Tooltip-Corner-SE { + right: 0; +} + +.Ldt-Tooltip-Corner-NW, +.Ldt-Tooltip-Corner-NE { + top: 0; +} + +.Ldt-Tooltip-Corner-SW, +.Ldt-Tooltip-Corner-SE { + bottom: 10px; +} + +.Ldt-Tooltip-Corner-NW { + background-position: top left; +} + +.Ldt-Tooltip-Corner-NE { + background-position: top right; +} -.Ldt-Tooltip { - position: absolute; - z-index: 10000000000; - background: transparent url("img/white_arrow_long.png"); - font-size: 12px; - padding: 15px 15px 20px; - color: black; - font-family: Arial, Helvetica, sans-serif; - overflow:hidden; +.Ldt-Tooltip-Corner-SW { + background-position: bottom left; +} + +.Ldt-Tooltip-Corner-SE { + background-position: bottom right; +} + +.Ldt-Tooltip-Border-Top, +.Ldt-Tooltip-Border-SW, +.Ldt-Tooltip-Border-SE { + position: absolute; height: 6px; background: url(img/tooltip-h-borders.png); +} + +.Ldt-Tooltip-Border-Top { + left: 6px; right: 6px; +} + +.Ldt-Tooltip-Border-SW, +.Ldt-Tooltip-Border-SE { + bottom: 10px; background-position: bottom; +} + +.Ldt-Tooltip-Border-SW { + left: 6px; +} + +.Ldt-Tooltip-Border-SE { + right: 6px; +} + +.Ldt-Tooltip-Tip { + position: absolute; height: 16px; width: 22px; + background: url(img/tooltip-tip.png); + bottom: 0; +} + +.Ldt-Tooltip-Border-Left, +.Ldt-Tooltip-Border-Right { + position: absolute; width: 6px; background: url(img/tooltip-v-borders.png); + top: 6px; bottom: 16px; +} + +.Ldt-Tooltip-Border-Left { + left: 0; background-position: left; +} + +.Ldt-Tooltip-Border-Right { + right: 0; background-position: right; } .Ldt-Tooltip-Inner { - height: 115px; + min-height: 30px; + max-height: 140px; width: 180px; overflow: hidden; + margin: 6px 6px 16px; + background: url(img/tooltip-gradient.png) bottom; } + .Ldt-Tooltip-Color { - float: left; margin: 2px 4px 2px 0; width: 10px; height: 10px; + float: left; margin: 8px 2px 2px 8px; width: 10px; height: 10px; +} + +.Ldt-Tooltip-AltColor { + float: left; margin: 2px 2px 2px 3px; width: 10px; height: 10px; } .Ldt-Tooltip img { - max-width: 140px; max-height: 70px; margin: 0 20px; + max-width: 140px; max-height: 80px; margin: 2px 20px; } .Ldt-Tooltip p { - margin: 2px 0; - font-size: 12px; -} + margin: 6px 8px; + font-size: 12px; + line-height: 14px; +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Tooltip.js --- a/web/res/metadataplayer/Tooltip.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Tooltip.js Sun Apr 21 21:54:24 2013 +0200 @@ -5,17 +5,35 @@ IriSP.Widgets.Tooltip.prototype = new IriSP.Widgets.Widget(); -IriSP.Widgets.Tooltip.prototype.template = '<div class="Ldt-Tooltip"><div class="Ldt-Tooltip-Inner"><div class="Ldt-Tooltip-Color"></div><div class="Ldt-Tooltip-Text"></div></div></div>'; +IriSP.Widgets.Tooltip.prototype.defaults = { + +}; + +IriSP.Widgets.Tooltip.prototype.template = + '<div class="Ldt-Tooltip"><div class="Ldt-Tooltip-Main"><div class="Ldt-Tooltip-Corner-NW"></div>' + + '<div class="Ldt-Tooltip-Border-Top"></div><div class="Ldt-Tooltip-Corner-NE"></div>' + + '<div class="Ldt-Tooltip-Border-Left"></div><div class="Ldt-Tooltip-Border-Right"></div>' + + '<div class="Ldt-Tooltip-Corner-SW"></div><div class="Ldt-Tooltip-Border-SW"></div>' + + '<div class="Ldt-Tooltip-Tip"></div><div class="Ldt-Tooltip-Border-SE"></div>' + + '<div class="Ldt-Tooltip-Corner-SE"></div><div class="Ldt-Tooltip-Inner">' + + '<div class="Ldt-Tooltip-Color"></div><p class="Ldt-Tooltip-Text"></p></div></div></div>'; IriSP.Widgets.Tooltip.prototype.draw = function() { _this = this; - this.$.html(this.template); + this.renderTemplate(); this.$.parent().css({ "position" : "relative" }); - this.$tip = this.$.find(".Ldt-Tooltip"); + this.$tooltip = this.$.find(".Ldt-Tooltip"); + this.$tip = this.$.find(".Ldt-Tooltip-Tip"); + this.$sw = this.$.find(".Ldt-Tooltip-Border-SW"); + this.$se = this.$.find(".Ldt-Tooltip-Border-SE"); + this.__halfWidth = Math.floor(this.$.find(".Ldt-Tooltip-Main").width()/2); + this.__borderWidth = this.$.find(".Ldt-Tooltip-Border-Left").width(); + this.__tipDelta = this.__halfWidth - Math.floor(this.$tip.width()/2); + this.__maxShift = this.__tipDelta - this.__borderWidth; this.$.mouseover(function() { - _this.$tip.hide(); + _this.$tooltip.hide(); }); this.hide(); }; @@ -30,13 +48,33 @@ this.$.find(".Ldt-Tooltip-Text").html(text); - this.$tip.show(); + this.$tooltip.show(); + + var shift = 0; + + if (typeof this.min_x !== "undefined" && (x - this.__halfWidth < this.min_x)) { + shift = Math.max(x - this.__halfWidth - this.min_x, - this.__maxShift); + } + + if (typeof this.max_x !== "undefined" && (+x + this.__halfWidth > this.max_x)) { + shift = Math.min(+ x + this.__halfWidth - this.max_x, this.__maxShift); + } + + this.$tooltip.css({ + "left" : (x - shift) + "px", + "top" : y + "px" + }); this.$tip.css({ - "left" : Math.floor(x - this.$tip.outerWidth() / 2) + "px", - "top" : Math.floor(y - this.$tip.outerHeight()) + "px" + "left": (this.__tipDelta + shift) + "px" + }); + this.$sw.css({ + "width": (this.__tipDelta + shift - this.__borderWidth) + "px" + }); + this.$se.css({ + "width": (this.__tipDelta - shift - this.__borderWidth) + "px" }); }; IriSP.Widgets.Tooltip.prototype.hide = function() { - this.$tip.hide(); + this.$tooltip.hide(); }; diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Trace.js --- a/web/res/metadataplayer/Trace.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Trace.js Sun Apr 21 21:54:24 2013 +0200 @@ -16,22 +16,11 @@ } IriSP.Widgets.Trace.prototype.draw = function() { - this.lastEvent = ""; if (typeof window.tracemanager === "undefined") { console.log("Tracemanager not found"); return; } var _this = this, - _mdplisteners = { - "search.open" : 0, - "search.closed" : 0, - "search" : 0, - "search.cleared" : 0, - "search.matchFound" : 0, - "search.noMatchFound" : 0, - "search.triggeredSearch" : 0, - "TraceWidget.MouseEvents" : 0 - } _medialisteners = { "play" : 0, "pause" : 0, @@ -39,17 +28,12 @@ "seeked" : 0, "play" : 0, "pause" : 0, - "timeupdate" : 2000 + "timeupdate" : 10000 + }, + _annlisteners = { + search: 0, + "search-cleared": 0 }; - IriSP._(_mdplisteners).each(function(_ms, _listener) { - var _f = function(_arg) { - _this.eventHandler(_listener, _arg); - } - if (_ms) { - _f = IriSP._.throttle(_f, _ms); - } - _this.onMdpEvent(_listener, _f); - }); IriSP._(_medialisteners).each(function(_ms, _listener) { var _f = function(_arg) { _this.eventHandler(_listener, _arg); @@ -59,6 +43,16 @@ } _this.media.on(_listener, _f); }); + var _annotations = this.source.getAnnotations(); + IriSP._(_annlisteners).each(function(_ms, _listener) { + var _f = function(_arg) { + _this.eventHandler(_listener, _arg); + } + if (_ms) { + _f = IriSP._.throttle(_f, _ms); + } + _annotations.on(_listener, _f); + }); if (!this.tracer) { @@ -71,59 +65,33 @@ } + + this.tracer.trace("TraceWidgetInit", {}); this.mouseLocation = ''; - IriSP.jQuery(".Ldt-Widget").on("click mouseover mouseout", ".Ldt-TraceMe", function(_e) { + IriSP.jQuery(".Ldt-Widget").on("click mouseenter mouseleave", ".Ldt-TraceMe", function(_e) { var _target = IriSP.jQuery(this); - var _widget = IriSP.jQuery(this).attr("widget-type"), + var _widget = _target.attr("widget-type") || _target.parents(".Ldt-Widget").attr("widget-type"), _data = { "type": _e.type, - "x": _e.clientX, - "y": _e.clientY, "widget": _widget }, _targetEl = _target[0], _class = _targetEl.className, _name = _targetEl.localName, _id = _targetEl.id, - _value = _targetEl.value, - _traceInfo = _target.attr("trace-info"), - _lastTarget = _name + (_id && _id.length ? '#' + IriSP.jqEscape(_id) : '') + (_class && _class.length ? ('.' + IriSP.jqEscape(_class).replace(/\s/g,'.')).replace(/\.Ldt-(Widget|TraceMe)/g,'') : ''); - _data.target = _lastTarget - if (typeof _traceInfo == "string" && _traceInfo.length) { + _value = _target.val(), + _traceInfo = _target.attr("trace-info"); + _data.target = _name + (_id && _id.length ? '#' + IriSP.jqEscape(_id) : '') + (_class && _class.length ? ('.' + IriSP.jqEscape(_class).replace(/\s/g,'.')).replace(/\.Ldt-(Widget|TraceMe)/g,'') : ''); + if (typeof _traceInfo == "string" && _traceInfo) { _data.traceInfo = _traceInfo; - _lastTarget += ( ";" + _traceInfo ); } if (typeof _value == "string" && _value.length) { _data.value = _value; } - switch(_e.type) { - case "mouseover": - if (_this.lastTarget != _lastTarget) { - _this.player.trigger('TraceWidget.MouseEvents', _data); - } else { - if (typeof _this.moTimeout != "undefined") { - clearTimeout(_this.moTimeout); - _this.moTimeout = undefined; - } - } - break; - case "mouseout": - if (typeof _this.moTimeout != "undefined") { - clearTimeout(_this.moTimeout); - } - _this.moTimeout = setTimeout(function() { - if (_lastTarget != _this.lastTarget) { - _this.player.trigger('TraceWidget.MouseEvents', _data); - } - },100); - break; - default: - _this.player.trigger('TraceWidget.MouseEvents', _data); - } - _this.lastTarget = _lastTarget; + _this.eventHandler('UIEvent', _data); }); } @@ -136,7 +104,7 @@ _arg = {} } switch(_listener) { - case 'IriSP.TraceWidget.MouseEvents': + case 'UIEvent': _traceName += _arg.widget + '_' + _arg.type; delete _arg.widget; delete _arg.type; @@ -152,7 +120,6 @@ default: _traceName += _listener.replace('.','_'); } - this.lastEvent = _traceName; if (typeof this.extend === "object" && this.extend) { IriSP._(_arg).extend(this.extend); } @@ -160,4 +127,4 @@ if (this.js_console && typeof window.console !== "undefined" && typeof console.log !== "undefined") { console.log("tracer.trace('" + _traceName + "', " + JSON.stringify(_arg) + ");"); } -} +} \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/Tweet.js --- a/web/res/metadataplayer/Tweet.js Sun Apr 21 10:07:03 2013 +0200 +++ b/web/res/metadataplayer/Tweet.js Sun Apr 21 21:54:24 2013 +0200 @@ -6,7 +6,7 @@ IriSP.Widgets.Tweet.prototype = new IriSP.Widgets.Widget(); IriSP.Widgets.Tweet.prototype.defaults = { - hide_timeout: 5000, + hide_timeout: 10000, polemics : [ { "keywords" : [ "++" ], @@ -93,87 +93,51 @@ IriSP.Widgets.Tweet.prototype.show = function(_tweet) { if (typeof _tweet !== "undefined" && typeof _tweet.source !== "undefined") { - var _entities = []; - for (var _i = 0; _i < _tweet.source.entities.hashtags.length; _i++) { - var _hash = _tweet.source.entities.hashtags[_i]; - _entities.push({ - is_link: true, - text: '#' + _hash.text, - url: 'http://twitter.com/search?q=%23' + encodeURIComponent(_hash.text), - indices: _hash.indices - }); - } - for (var _i = 0; _i < _tweet.source.entities.urls.length; _i++) { - var _url = _tweet.source.entities.urls[_i], - _displayurl = (typeof _url.display_url !== "undefined" && _url.display_url !== null ? _url.display_url : _url.url), - _linkurl = (typeof _url.expanded_url !== "undefined" && _url.expanded_url !== null ? _url.expanded_url : _url.url); - _displayurl = _displayurl.replace(/^\w+:\/\//,''); - if (!/^\w+:\/\//.test(_linkurl)) { - _linkurl = 'http://' + _linkurl; - } - _entities.push({ - is_link: true, - text: _displayurl, - url: _linkurl, - indices: _url.indices - }); - } - for (var _i = 0; _i < _tweet.source.entities.user_mentions.length; _i++) { - var _user = _tweet.source.entities.user_mentions[_i]; - _entities.push({ - is_link: true, - text: '@' + _user.screen_name, - url: 'http://twitter.com/' + encodeURIComponent(_user.screen_name), - indices: _user.indices - }); - } - for (var _i = 0; _i < this.polemics.length; _i++) { - for (var _j = 0; _j < this.polemics[_i].keywords.length; _j++) { - var _p = _tweet.source.text.indexOf(this.polemics[_i].keywords[_j]); - while (_p !== -1) { - var _end = (_p + this.polemics[_i].keywords[_j].length); - _entities.push({ - is_link: false, - text: this.polemics[_i].keywords[_j], - color: this.polemics[_i].color, - indices: [_p, _end] - }); - _p = _tweet.source.text.indexOf(this.polemics[_i].keywords[_j], _end); - } - } - } - _entities = IriSP._(_entities).sortBy(function(_entity) { + var extend = [ + [ + /#(\w+)/gm, + function(matches) { + return '<a href="http://twitter.com/search?q=%23' + matches[1] + '" target="_blank">' + }, + '</a>' + ] + ]; + var _urls = IriSP._(_tweet.source.entities.urls).sortBy(function(_entity) { return _entity.indices[0]; }); + var _currentPos = 0, _txt = ''; - for (var _i = 0; _i < _entities.length; _i++) { - if (_entities[_i].indices[0] >= _currentPos) { - _txt += _tweet.source.text.substring(_currentPos, _entities[_i].indices[0]); - _currentPos = _entities[_i].indices[1]; - if (_entities[_i].is_link) { - _txt += '<a href="' + _entities[_i].url + '" target="_blank">'; - } else { - _txt += '<span style="background:' + _entities[_i].color + '">'; - } - _txt += _entities[_i].text; - if (_entities[_i].is_link) { - _txt += '</a>'; - } else { - _txt += '</span>'; - } + IriSP._(_urls).each(function(_url) { + if (_url.indices[0] >= _currentPos) { + _txt += _tweet.source.text.substring(_currentPos, _url.indices[0]); + _txt += (typeof _url.expanded_url !== "undefined" && _url.expanded_url !== null ? _url.expanded_url : _url.url); + _currentPos = _url.indices[1]; } - } + }); _txt += _tweet.source.text.substring(_currentPos); - this.$.find(".Ldt-Tweet-Avatar").attr("src",_tweet.source.user.profile_image_url); - this.$.find(".Ldt-Tweet-ScreenName").html('@'+_tweet.source.user.screen_name); - this.$.find(".Ldt-Tweet-ProfileLink").attr("href", "https://twitter.com/" + _tweet.source.user.screen_name); - this.$.find(".Ldt-Tweet-FullName").html(_tweet.source.user.name); - this.$.find(".Ldt-Tweet-Contents").html(_txt); + + for (var _i = 0; _i < this.polemics.length; _i++) { + var rx = IriSP.Model.regexpFromTextOrArray(this.polemics[_i].keywords); + extend.push([ + rx, + '<span style="background: ' + this.polemics[_i].color + '">', + '</span>' + ]); + } + var rx = (_tweet.found ? (_this.source.getAnnotations().regexp || false) : false), + profile_url = _tweet.source.user ? _tweet.source.user.profile_image_url : _tweet.source.profile_image_url, + screen_name = _tweet.source.user ? _tweet.source.user.screen_name :_tweet.source.from_user, + user_name = _tweet.source.user ? _tweet.source.user.name :_tweet.source.from_user_name; + this.$.find(".Ldt-Tweet-Avatar").attr("src", profile_url); + this.$.find(".Ldt-Tweet-ScreenName").html('@' + screen_name); + this.$.find(".Ldt-Tweet-ProfileLink").attr("href", "https://twitter.com/" + screen_name); + this.$.find(".Ldt-Tweet-FullName").html(user_name); + this.$.find(".Ldt-Tweet-Contents").html(IriSP.textFieldHtml(_txt, rx, extend)); this.$.find(".Ldt-Tweet-Time").html(this.l10n.original_time + new Date(_tweet.source.created_at).toLocaleTimeString() + " / " + this.l10n.video_time + _tweet.begin.toString()); this.$.find(".Ldt-Tweet-Retweet").attr("href", "https://twitter.com/intent/retweet?tweet_id=" + _tweet.source.id_str); this.$.find(".Ldt-Tweet-Reply").attr("href", "https://twitter.com/intent/tweet?in_reply_to=" + _tweet.source.id_str); - this.$.find(".Ldt-Tweet-Original").attr("href", "https://twitter.com/" + _tweet.source.user.screen_name + "/status/" + _tweet.source.id_str); + this.$.find(".Ldt-Tweet-Original").attr("href", "https://twitter.com/" + screen_name + "/status/" + _tweet.source.id_str); this.player.trigger("Annotation.minimize"); this.$.slideDown(); this.cancelTimeout(); diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/img/tooltip-corners.png Binary file web/res/metadataplayer/img/tooltip-corners.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/img/tooltip-gradient.png Binary file web/res/metadataplayer/img/tooltip-gradient.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/img/tooltip-h-borders.png Binary file web/res/metadataplayer/img/tooltip-h-borders.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/img/tooltip-tip.png Binary file web/res/metadataplayer/img/tooltip-tip.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/res/metadataplayer/img/tooltip-v-borders.png Binary file web/res/metadataplayer/img/tooltip-v-borders.png has changed diff -r 2251fb41dbc7 -r 1e110b03ae96 web/search_tweets.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/search_tweets.php Sun Apr 21 21:54:24 2013 +0200 @@ -0,0 +1,49 @@ +<?php + +if (isset ($_GET['callback'])) { + header("Content-type: text/javascript"); +} else { + header("Content-type: application/json"); +} + + +/** + * include some common code (like we did in the 90s) + * People still do this? ;) + */ +include_once 'common.php'; + +/** + * Check for a POSTed status message to send to Twitter + */ +if (!empty($_GET) +&& isset($_SESSION['TWITTER_ACCESS_TOKEN'])) { + /** + * Easiest way to use OAuth now that we have an Access Token is to use + * a preconfigured instance of Zend_Http_Client which automatically + * signs and encodes all our requests without additional work + */ + + if (isset($_GET['endpoint'])) { + $endpoint = $_GET['endpoint']; + unset($_GET['endpoint']); + } else { + $endpoint = "search/tweets"; + } + + $token = unserialize($_SESSION['TWITTER_ACCESS_TOKEN']); + $client = $token->getHttpClient($configuration); + $client->setUri("https://api.twitter.com/1.1/$endpoint.json"); + $client->setMethod(Zend_Http_Client::GET); + $client->setParameterGet($_GET); + $response = $client->request(); + + echo $response->getBody(); + +} else { + /** + * Mistaken request? Some malfeasant trying something? + */ + exit('Invalid tweet request. Oops. Sorry.'); +} +?> \ No newline at end of file diff -r 2251fb41dbc7 -r 1e110b03ae96 web/select.php --- a/web/select.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/select.php Sun Apr 21 21:54:24 2013 +0200 @@ -124,6 +124,7 @@ </li> </ul> </div> + <ul> <?php $basepath = dirname(__FILE__)."/"; $partenaires = $translate->_('config__partenaires'); @@ -147,18 +148,19 @@ } ?> - <div class="archivesVideoBox"> - <a href="<?php echo URL_ROOT . $rep ?>"> - <img src="<?php echo URL_ROOT . "$rep/$tail_img" ?>" width="270" height="150"/> - </a> - <h3 class="AVBtitle"><?php echo $archive_title ?></h3> - <p class="AVBtext"><?php echo $archive_description; ?></p> - </div> + <div class="archivesVideoBox"> + <a href="<?php echo URL_ROOT . $rep ?>"> + <img src="<?php echo URL_ROOT . "$rep/$tail_img" ?>" width="270" height="150"/> + </a> + <h3 class="AVBtitle"><?php echo $archive_title ?></h3> + <p class="AVBtext"><?php echo $archive_description; ?></p> + </div> <?php } ?> + </ul> </div> <div class="footer"> <hr />

Internet est-il notre nouveau doudou ?

Lire : une manière d’écrire ?

Supports : les nouveaux matériaux d’écriture.

Modèles économiques de l’écriture numérique.

Innover pour Refonder

Les tout petits à l’école ? Pour quoi faire ?

Plus de maîtres que de classes : oui, mais comment ?

L’égalité filles-garçons, la société change, l’école aussi ?

Cycles, liaison, socle : passons aux actes !

Que nous apprennent les élèves décrocheurs d’école ?

Peut-on vraiment apprendre avec les TICE ? Comment ?

Innover pour Refonder

La liaison école-collège, le travail en réseau d’équipes : quels changements pour les pratiques et les organisations ?

A quelles conditions l’accueil des moins de trois ans devient une chance et une réussite pour les élèves ?

Plus de maîtres que de classes : quels changements dans l’organisation et dans les pratiques ?

Le numérique : des outils, des usages… et après ?

Filles-garçons, garçons-filles, comment construire l’égalité ?

Dans quelle mesure les décrocheurs scolaires nous font réinventer une école plus juste et plus efficace pour tous ?

Atelier enmi12.org

Carrefour des Possibles

Programme

Le numérique comme écriture et la question des technologies intellectuelles

Théories et pratiques de l’épistémologie dans les sciences de l’homme et de la société à l’époque du numérique

Software studies, digital humanities, digital studies

Extended mind et tracéologie numérique

Technologies industrielles de la connaissance et individuation collective

Enjeux industriels

Design, documentation, écriture et thérapeutique du pharmakon numérique