[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9635] registration: uicommon
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9635] registration: uicommon |
|
Date: |
Wed, 20 Jun 2012 11:55:11 +0000 |
Revision: 9635
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9635
Author: sigurdne
Date: 2012-06-20 11:55:10 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
registration: uicommon
Modified Paths:
--------------
trunk/phpgwapi/inc/class.uicommon.inc.php
trunk/phpgwapi/templates/base/datatable_common.xsl
trunk/registration/inc/class.uipending.inc.php
Modified: trunk/phpgwapi/inc/class.uicommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon.inc.php 2012-06-20 11:35:09 UTC (rev
9634)
+++ trunk/phpgwapi/inc/class.uicommon.inc.php 2012-06-20 11:55:10 UTC (rev
9635)
@@ -323,7 +323,8 @@
}
- public function add_template_helpers() {
+ public function add_template_helpers()
+ {
$this->add_template_file('helpers');
}
@@ -331,9 +332,12 @@
{
$GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
- if($this->flash_msgs) {
+ if($this->flash_msgs)
+ {
$data['msgbox_data'] =
$GLOBALS['phpgw']->common->msgbox($this->flash_msgs);
- } else {
+ }
+ else
+ {
$this->add_template_file('msgbox');
}
@@ -376,7 +380,8 @@
// Build a YUI result style array
public function yui_results($results)
{
- if (!$results) {
+ if (!$results)
+ {
$results['total_records'] = 0;
$result['results'] = array();
}
@@ -680,6 +685,488 @@
}
/**
+ * Returns a human-readable string from a lower case and
underscored word by replacing underscores
+ * with a space, and by upper-casing the initial characters.
+ *
+ * @param string $lower_case_and_underscored_word String to
make more readable.
+ *
+ * @return string Human-readable string.
+ */
+ public static function
humanize($lower_case_and_underscored_word)
+ {
+ if (substr($lower_case_and_underscored_word, -3) ===
'_id')
+ {
+ $lower_case_and_underscored_word =
substr($lower_case_and_underscored_word, 0, -3);
+ }
+
+ return ucfirst(str_replace('_', ' ',
$lower_case_and_underscored_word));
+ }
+
+ /**
+ * Retrieves an array of files from $_FILES
+ *
+ * @param string $key A key
+ * @return array An associative array of files
+ */
+ public function get_files($key = null)
+ {
+ if (!$this->filesArray)
+ {
+ $this->filesArray =
self::convert_file_information($_FILES);
+ }
+
+ return is_null($key) ? $this->filesArray :
(isset($this->filesArray[$key]) ? $this->filesArray[$key] : array());
+ }
+
+ public function toggle_show_showall()
+ {
+ if(isset($_SESSION['showall']) &&
!empty($_SESSION['showall']))
+ {
+ $this->bo->unset_show_all_objects();
+ }
+ else
+ {
+ $this->bo->show_all_objects();
+ }
+ $this->redirect(array('menuaction' =>
$this->url_prefix.'.index'));
+ }
+
+/*
+ public function use_yui_editor()
+ {
+
self::add_stylesheet('phpgwapi/js/yahoo/assets/skins/sam/skin.css');
+ self::add_javascript('yahoo', 'yahoo/editor',
'simpleeditor-min.js');
+ }
+
+*/ static protected function fix_php_files_array($data)
+ {
+ $fileKeys = array('error', 'name', 'size', 'tmp_name',
'type');
+ $keys = array_keys($data);
+ sort($keys);
+
+ if ($fileKeys != $keys || !isset($data['name']) ||
!is_array($data['name']))
+ {
+ return $data;
+ }
+
+ $files = $data;
+ foreach ($fileKeys as $k)
+ {
+ unset($files[$k]);
+ }
+ foreach (array_keys($data['name']) as $key)
+ {
+ $files[$key] = self::fix_php_files_array(array(
+ 'error' => $data['error'][$key],
+ 'name' => $data['name'][$key],
+ 'type' => $data['type'][$key],
+ 'tmp_name' => $data['tmp_name'][$key],
+ 'size' => $data['size'][$key],
+ ));
+ }
+
+ return $files;
+ }
+
+ /**
+ * It's safe to pass an already converted array, in which case
this method just returns the original array unmodified.
+ *
+ * @param array $taintedFiles An array representing uploaded
file information
+ *
+ * @return array An array of re-ordered uploaded file information
+ */
+ static public function convert_file_information(array
$taintedFiles)
+ {
+ $files = array();
+ foreach ($taintedFiles as $key => $data)
+ {
+ $files[$key] = self::fix_php_files_array($data);
+ }
+
+ return $files;
+ }
+
+ protected static function get_file_type_from_extension($file,
$defaultType = 'application/octet-stream')
+ {
+ if (false === ($extension = (false === $pos =
strrpos($file, '.')) ? false : substr($file, $pos+1)))
+ {
+ return $defaultType;
+ }
+
+ if (strlen($extension) == 0)
+ {
+ return $defaultType;
+ }
+
+ switch ($extension) {
+ case 'ez': return
'application/andrew-inset';
+ case 'base64': return
'application/x-word';
+ case 'dp': return
'application/commonground';
+ case 'pqi': return
'application/cprplayer';
+ case 'tsp': return
'application/dsptype';
+ case 'xls': return
'application/x-msexcel';
+ case 'pfr': return
'application/font-tdpfr';
+ case 'spl': return
'application/x-futuresplash';
+ case 'stk': return
'application/hyperstudio';
+ case 'js': return
'application/x-javascript';
+ case 'hqx': return
'application/mac-binhex40';
+ case 'cpt': return
'application/x-mac-compactpro';
+ case 'mbd': return
'application/mbed';
+ case 'mfp': return
'application/mirage';
+ case 'doc': return
'application/x-msword';
+ case 'orq': return
'application/ocsp-request';
+ case 'ors': return
'application/ocsp-response';
+ case 'bin': return
'application/octet-stream';
+ case 'oda': return
'application/oda';
+ case 'ogg': return
'application/ogg';
+ case 'pdf': return
'application/x-pdf';
+ case '7bit': return
'application/pgp-keys';
+ case 'sig': return
'application/pgp-signature';
+ case 'p10': return
'application/pkcs10';
+ case 'p7m': return
'application/pkcs7-mime';
+ case 'p7s': return
'application/pkcs7-signature';
+ case 'cer': return
'application/pkix-cert';
+ case 'crl': return
'application/pkix-crl';
+ case 'pkipath': return
'application/pkix-pkipath';
+ case 'pki': return
'application/pkixcmp';
+ case 'ps': return
'application/postscript';
+ case 'shw': return
'application/presentations';
+ case 'cw': return
'application/prs.cww';
+ case 'rnd': return
'application/prs.nprend';
+ case 'qrt': return
'application/quest';
+ case 'rtf': return 'text/rtf';
+ case 'soc': return
'application/sgml-open-catalog';
+ case 'siv': return
'application/sieve';
+ case 'smi': return
'application/smil';
+ case 'tbk': return
'application/toolbook';
+ case 'plb': return
'application/vnd.3gpp.pic-bw-large';
+ case 'psb': return
'application/vnd.3gpp.pic-bw-small';
+ case 'pvb': return
'application/vnd.3gpp.pic-bw-var';
+ case 'sms': return
'application/vnd.3gpp.sms';
+ case 'atc': return
'application/vnd.acucorp';
+ case 'xfdf': return
'application/vnd.adobe.xfdf';
+ case 'ami': return
'application/vnd.amiga.amu';
+ case 'mpm': return
'application/vnd.blueice.multipass';
+ case 'cdy': return
'application/vnd.cinderella';
+ case 'cmc': return
'application/vnd.cosmocaller';
+ case 'wbs': return
'application/vnd.criticaltools.wbs+xml';
+ case 'curl': return
'application/vnd.curl';
+ case 'rdz': return
'application/vnd.data-vision.rdz';
+ case 'dfac': return
'application/vnd.dreamfactory';
+ case 'fsc': return
'application/vnd.fsc.weblauch';
+ case 'txd': return
'application/vnd.genomatix.tuxedo';
+ case 'hbci': return
'application/vnd.hbci';
+ case 'les': return
'application/vnd.hhe.lesson-player';
+ case 'plt': return
'application/vnd.hp-hpgl';
+ case 'emm': return
'application/vnd.ibm.electronic-media';
+ case 'irm': return
'application/vnd.ibm.rights-management';
+ case 'sc': return
'application/vnd.ibm.secure-container';
+ case 'rcprofile': return
'application/vnd.ipunplugged.rcprofile';
+ case 'irp': return
'application/vnd.irepository.package+xml';
+ case 'jisp': return
'application/vnd.jisp';
+ case 'karbon': return
'application/vnd.kde.karbon';
+ case 'chrt': return
'application/vnd.kde.kchart';
+ case 'kfo': return
'application/vnd.kde.kformula';
+ case 'flw': return
'application/vnd.kde.kivio';
+ case 'kon': return
'application/vnd.kde.kontour';
+ case 'kpr': return
'application/vnd.kde.kpresenter';
+ case 'ksp': return
'application/vnd.kde.kspread';
+ case 'kwd': return
'application/vnd.kde.kword';
+ case 'htke': return
'application/vnd.kenameapp';
+ case 'kia': return
'application/vnd.kidspiration';
+ case 'kne': return
'application/vnd.kinar';
+ case 'lbd': return
'application/vnd.llamagraphics.life-balance.desktop';
+ case 'lbe': return
'application/vnd.llamagraphics.life-balance.exchange+xml';
+ case 'wks': return
'application/vnd.lotus-1-2-3';
+ case 'mcd': return
'application/x-mathcad';
+ case 'mfm': return
'application/vnd.mfmp';
+ case 'flo': return
'application/vnd.micrografx.flo';
+ case 'igx': return
'application/vnd.micrografx.igx';
+ case 'mif': return
'application/x-mif';
+ case 'mpn': return
'application/vnd.mophun.application';
+ case 'mpc': return
'application/vnd.mophun.certificate';
+ case 'xul': return
'application/vnd.mozilla.xul+xml';
+ case 'cil': return
'application/vnd.ms-artgalry';
+ case 'asf': return 'video/x-ms-asf';
+ case 'lrm': return
'application/vnd.ms-lrm';
+ case 'ppt': return
'application/vnd.ms-powerpoint';
+ case 'mpp': return
'application/vnd.ms-project';
+ case 'wpl': return
'application/vnd.ms-wpl';
+ case 'mseq': return
'application/vnd.mseq';
+ case 'ent': return
'application/vnd.nervana';
+ case 'rpst': return
'application/vnd.nokia.radio-preset';
+ case 'rpss': return
'application/vnd.nokia.radio-presets';
+ case 'odt': return
'application/vnd.oasis.opendocument.text';
+ case 'ott': return
'application/vnd.oasis.opendocument.text-template';
+ case 'oth': return
'application/vnd.oasis.opendocument.text-web';
+ case 'odm': return
'application/vnd.oasis.opendocument.text-master';
+ case 'odg': return
'application/vnd.oasis.opendocument.graphics';
+ case 'otg': return
'application/vnd.oasis.opendocument.graphics-template';
+ case 'odp': return
'application/vnd.oasis.opendocument.presentation';
+ case 'otp': return
'application/vnd.oasis.opendocument.presentation-template';
+ case 'ods': return
'application/vnd.oasis.opendocument.spreadsheet';
+ case 'ots': return
'application/vnd.oasis.opendocument.spreadsheet-template';
+ case 'odc': return
'application/vnd.oasis.opendocument.chart';
+ case 'odf': return
'application/vnd.oasis.opendocument.formula';
+ case 'odb': return
'application/vnd.oasis.opendocument.database';
+ case 'odi': return
'application/vnd.oasis.opendocument.image';
+ case 'prc': return
'application/vnd.palm';
+ case 'efif': return
'application/vnd.picsel';
+ case 'pti': return
'application/vnd.pvi.ptid1';
+ case 'qxd': return
'application/vnd.quark.quarkxpress';
+ case 'sdoc': return
'application/vnd.sealed.doc';
+ case 'seml': return
'application/vnd.sealed.eml';
+ case 'smht': return
'application/vnd.sealed.mht';
+ case 'sppt': return
'application/vnd.sealed.ppt';
+ case 'sxls': return
'application/vnd.sealed.xls';
+ case 'stml': return
'application/vnd.sealedmedia.softseal.html';
+ case 'spdf': return
'application/vnd.sealedmedia.softseal.pdf';
+ case 'see': return
'application/vnd.seemail';
+ case 'mmf': return
'application/vnd.smaf';
+ case 'sxc': return
'application/vnd.sun.xml.calc';
+ case 'stc': return
'application/vnd.sun.xml.calc.template';
+ case 'sxd': return
'application/vnd.sun.xml.draw';
+ case 'std': return
'application/vnd.sun.xml.draw.template';
+ case 'sxi': return
'application/vnd.sun.xml.impress';
+ case 'sti': return
'application/vnd.sun.xml.impress.template';
+ case 'sxm': return
'application/vnd.sun.xml.math';
+ case 'sxw': return
'application/vnd.sun.xml.writer';
+ case 'sxg': return
'application/vnd.sun.xml.writer.global';
+ case 'stw': return
'application/vnd.sun.xml.writer.template';
+ case 'sus': return
'application/vnd.sus-calendar';
+ case 'vsc': return
'application/vnd.vidsoft.vidconference';
+ case 'vsd': return
'application/vnd.visio';
+ case 'vis': return
'application/vnd.visionary';
+ case 'sic': return
'application/vnd.wap.sic';
+ case 'slc': return
'application/vnd.wap.slc';
+ case 'wbxml': return
'application/vnd.wap.wbxml';
+ case 'wmlc': return
'application/vnd.wap.wmlc';
+ case 'wmlsc': return
'application/vnd.wap.wmlscriptc';
+ case 'wtb': return
'application/vnd.webturbo';
+ case 'wpd': return
'application/vnd.wordperfect';
+ case 'wqd': return
'application/vnd.wqd';
+ case 'wv': return
'application/vnd.wv.csp+wbxml';
+ case '8bit': return
'multipart/parallel';
+ case 'hvd': return
'application/vnd.yamaha.hv-dic';
+ case 'hvs': return
'application/vnd.yamaha.hv-script';
+ case 'hvp': return
'application/vnd.yamaha.hv-voice';
+ case 'saf': return
'application/vnd.yamaha.smaf-audio';
+ case 'spf': return
'application/vnd.yamaha.smaf-phrase';
+ case 'vmd': return
'application/vocaltec-media-desc';
+ case 'vmf': return
'application/vocaltec-media-file';
+ case 'vtk': return
'application/vocaltec-talker';
+ case 'wif': return
'image/cewavelet';
+ case 'wp5': return
'application/wordperfect5.1';
+ case 'wk': return
'application/x-123';
+ case '7ls': return
'application/x-7th_level_event';
+ case 'aab': return
'application/x-authorware-bin';
+ case 'aam': return
'application/x-authorware-map';
+ case 'aas': return
'application/x-authorware-seg';
+ case 'bcpio': return
'application/x-bcpio';
+ case 'bleep': return
'application/x-bleeper';
+ case 'bz2': return
'application/x-bzip2';
+ case 'vcd': return
'application/x-cdlink';
+ case 'chat': return
'application/x-chat';
+ case 'pgn': return
'application/x-chess-pgn';
+ case 'z': return
'application/x-compress';
+ case 'cpio': return
'application/x-cpio';
+ case 'pqf': return
'application/x-cprplayer';
+ case 'csh': return
'application/x-csh';
+ case 'csm': return
'chemical/x-csml';
+ case 'co': return
'application/x-cult3d-object';
+ case 'deb': return
'application/x-debian-package';
+ case 'dcr': return
'application/x-director';
+ case 'dvi': return
'application/x-dvi';
+ case 'evy': return
'application/x-envoy';
+ case 'gtar': return
'application/x-gtar';
+ case 'gz': return
'application/x-gzip';
+ case 'hdf': return
'application/x-hdf';
+ case 'hep': return
'application/x-hep';
+ case 'rhtml': return
'application/x-html+ruby';
+ case 'mv': return
'application/x-httpd-miva';
+ case 'phtml': return
'application/x-httpd-php';
+ case 'ica': return
'application/x-ica';
+ case 'imagemap': return
'application/x-imagemap';
+ case 'ipx': return
'application/x-ipix';
+ case 'ips': return
'application/x-ipscript';
+ case 'jar': return
'application/x-java-archive';
+ case 'jnlp': return
'application/x-java-jnlp-file';
+ case 'ser': return
'application/x-java-serialized-object';
+ case 'class': return
'application/x-java-vm';
+ case 'skp': return
'application/x-koan';
+ case 'latex': return
'application/x-latex';
+ case 'frm': return
'application/x-maker';
+ case 'mid': return 'audio/x-midi';
+ case 'mda': return
'application/x-msaccess';
+ case 'com': return
'application/x-msdos-program';
+ case 'nc': return
'application/x-netcdf';
+ case 'pac': return
'application/x-ns-proxy-autoconfig';
+ case 'pm5': return
'application/x-pagemaker';
+ case 'pl': return
'application/x-perl';
+ case 'rp': return
'application/x-pn-realmedia';
+ case 'py': return
'application/x-python';
+ case 'qtl': return
'application/x-quicktimeplayer';
+ case 'rar': return
'application/x-rar-compressed';
+ case 'rb': return
'application/x-ruby';
+ case 'sh': return
'application/x-sh';
+ case 'shar': return
'application/x-shar';
+ case 'swf': return
'application/x-shockwave-flash';
+ case 'spr': return
'application/x-sprite';
+ case 'sav': return
'application/x-spss';
+ case 'spt': return
'application/x-spt';
+ case 'sit': return
'application/x-stuffit';
+ case 'sv4cpio': return
'application/x-sv4cpio';
+ case 'sv4crc': return
'application/x-sv4crc';
+ case 'tar': return
'application/x-tar';
+ case 'tcl': return
'application/x-tcl';
+ case 'tex': return
'application/x-tex';
+ case 'texinfo': return
'application/x-texinfo';
+ case 't': return
'application/x-troff';
+ case 'man': return
'application/x-troff-man';
+ case 'me': return
'application/x-troff-me';
+ case 'ms': return
'application/x-troff-ms';
+ case 'vqf': return
'application/x-twinvq';
+ case 'vqe': return
'application/x-twinvq-plugin';
+ case 'ustar': return
'application/x-ustar';
+ case 'bck': return
'application/x-vmsbackup';
+ case 'src': return
'application/x-wais-source';
+ case 'wz': return
'application/x-wingz';
+ case 'wp6': return
'application/x-wordperfect6.1';
+ case 'crt': return
'application/x-x509-ca-cert';
+ case 'zip': return
'application/zip';
+ case 'xhtml': return
'application/xhtml+xml';
+ case '3gpp': return 'audio/3gpp';
+ case 'amr': return 'audio/amr';
+ case 'awb': return 'audio/amr-wb';
+ case 'au': return
'audio/basic';
+ case 'evc': return 'audio/evrc';
+ case 'l16': return 'audio/l16';
+ case 'mp3': return 'audio/mpeg';
+ case 'sid': return 'audio/prs.sid';
+ case 'qcp': return 'audio/qcelp';
+ case 'smv': return 'audio/smv';
+ case 'koz': return
'audio/vnd.audiokoz';
+ case 'eol': return
'audio/vnd.digital-winds';
+ case 'plj': return
'audio/vnd.everad.plj';
+ case 'lvp': return
'audio/vnd.lucent.voice';
+ case 'mxmf': return
'audio/vnd.nokia.mobile-xmf';
+ case 'vbk': return
'audio/vnd.nortel.vbk';
+ case 'ecelp4800': return
'audio/vnd.nuera.ecelp4800';
+ case 'ecelp7470': return
'audio/vnd.nuera.ecelp7470';
+ case 'ecelp9600': return
'audio/vnd.nuera.ecelp9600';
+ case 'smp3': return
'audio/vnd.sealedmedia.softseal.mpeg';
+ case 'vox': return 'audio/voxware';
+ case 'aif': return 'audio/x-aiff';
+ case 'mp2': return 'audio/x-mpeg';
+ case 'mpu': return
'audio/x-mpegurl';
+ case 'rm': return
'audio/x-pn-realaudio';
+ case 'rpm': return
'audio/x-pn-realaudio-plugin';
+ case 'ra': return
'audio/x-realaudio';
+ case 'wav': return 'audio/x-wav';
+ case 'emb': return
'chemical/x-embl-dl-nucleotide';
+ case 'cube': return
'chemical/x-gaussian-cube';
+ case 'gau': return
'chemical/x-gaussian-input';
+ case 'jdx': return
'chemical/x-jcamp-dx';
+ case 'mol': return
'chemical/x-mdl-molfile';
+ case 'rxn': return
'chemical/x-mdl-rxnfile';
+ case 'tgf': return
'chemical/x-mdl-tgf';
+ case 'mop': return
'chemical/x-mopac-input';
+ case 'pdb': return
'x-chemical/x-pdb';
+ case 'scr': return
'chemical/x-rasmol';
+ case 'xyz': return
'x-chemical/x-xyz';
+ case 'dwf': return 'x-drawing/dwf';
+ case 'ivr': return 'i-world/i-vrml';
+ case 'bmp': return 'image/x-bmp';
+ case 'cod': return 'image/cis-cod';
+ case 'fif': return 'image/fif';
+ case 'gif': return 'image/gif';
+ case 'ief': return 'image/ief';
+ case 'jp2': return 'image/jp2';
+ case 'jpg': return 'image/pjpeg';
+ case 'jpm': return 'image/jpm';
+ case 'jpf': return 'image/jpx';
+ case 'pic': return 'image/pict';
+ case 'png': return 'image/x-png';
+ case 'tga': return 'image/targa';
+ case 'tif': return 'image/tiff';
+ case 'tiff': return 'image/tiff';
+ case 'svf': return 'image/vn-svf';
+ case 'dgn': return 'image/vnd.dgn';
+ case 'djvu': return 'image/vnd.djvu';
+ case 'dwg': return 'image/vnd.dwg';
+ case 'pgb': return
'image/vnd.glocalgraphics.pgb';
+ case 'ico': return
'image/vnd.microsoft.icon';
+ case 'mdi': return
'image/vnd.ms-modi';
+ case 'spng': return
'image/vnd.sealed.png';
+ case 'sgif': return
'image/vnd.sealedmedia.softseal.gif';
+ case 'sjpg': return
'image/vnd.sealedmedia.softseal.jpg';
+ case 'wbmp': return
'image/vnd.wap.wbmp';
+ case 'ras': return
'image/x-cmu-raster';
+ case 'fh4': return
'image/x-freehand';
+ case 'pnm': return
'image/x-portable-anymap';
+ case 'pbm': return
'image/x-portable-bitmap';
+ case 'pgm': return
'image/x-portable-graymap';
+ case 'ppm': return
'image/x-portable-pixmap';
+ case 'rgb': return 'image/x-rgb';
+ case 'xbm': return
'image/x-xbitmap';
+ case 'xpm': return
'image/x-xpixmap';
+ case 'xwd': return
'image/x-xwindowdump';
+ case 'igs': return 'model/iges';
+ case 'msh': return 'model/mesh';
+ case 'x_b': return
'model/vnd.parasolid.transmit.binary';
+ case 'x_t': return
'model/vnd.parasolid.transmit.text';
+ case 'wrl': return 'x-world/x-vrml';
+ case 'csv': return
'text/comma-separated-values';
+ case 'css': return 'text/css';
+ case 'html': return 'text/html';
+ case 'txt': return 'text/plain';
+ case 'rst': return
'text/prs.fallenstein.rst';
+ case 'rtx': return 'text/richtext';
+ case 'sgml': return 'text/x-sgml';
+ case 'tsv': return
'text/tab-separated-values';
+ case 'ccc': return
'text/vnd.net2phone.commcenter.command';
+ case 'jad': return
'text/vnd.sun.j2me.app-descriptor';
+ case 'si': return
'text/vnd.wap.si';
+ case 'sl': return
'text/vnd.wap.sl';
+ case 'wml': return
'text/vnd.wap.wml';
+ case 'wmls': return
'text/vnd.wap.wmlscript';
+ case 'hdml': return 'text/x-hdml';
+ case 'etx': return 'text/x-setext';
+ case 'talk': return 'text/x-speech';
+ case 'vcs': return
'text/x-vcalendar';
+ case 'vcf': return 'text/x-vcard';
+ case 'xml': return 'text/xml';
+ case 'uvr': return 'ulead/vrml';
+ case '3gp': return 'video/3gpp';
+ case 'dl': return
'video/dl';
+ case 'gl': return
'video/gl';
+ case 'mj2': return 'video/mj2';
+ case 'mpeg': return 'video/mpeg';
+ case 'mov': return
'video/quicktime';
+ case 'vdo': return 'video/vdo';
+ case 'viv': return 'video/vivo';
+ case 'fvt': return 'video/vnd.fvt';
+ case 'mxu': return
'video/vnd.mpegurl';
+ case 'nim': return
'video/vnd.nokia.interleaved-multimedia';
+ case 'mp4': return
'video/vnd.objectvideo';
+ case 's11': return
'video/vnd.sealed.mpeg1';
+ case 'smpg': return
'video/vnd.sealed.mpeg4';
+ case 'sswf': return
'video/vnd.sealed.swf';
+ case 'smov': return
'video/vnd.sealedmedia.softseal.mov';
+ case 'vivo': return 'video/vnd.vivo';
+ case 'fli': return 'video/x-fli';
+ case 'wmv': return 'video/x-ms-wmv';
+ case 'avi': return
'video/x-msvideo';
+ case 'movie': return
'video/x-sgi-movie';
+ case 'ice': return
'x-conference/x-cooltalk';
+ case 'd': return
'x-world/x-d96';
+ case 'svr': return 'x-world/x-svr';
+ case 'vrw': return
'x-world/x-vream';
+ default:
+ return $defaultType;
+ }
+ }
+ /**
* Added because error reporting facilities in phpgw tries to
serialize the PDO
* instance in $this->db which causes an error. This method
removes $this->db from the
* serialized values to avoid this problem.
Modified: trunk/phpgwapi/templates/base/datatable_common.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_common.xsl 2012-06-20 11:35:09 UTC
(rev 9634)
+++ trunk/phpgwapi/templates/base/datatable_common.xsl 2012-06-20 11:55:10 UTC
(rev 9635)
@@ -16,6 +16,14 @@
</func:function>
<xsl:template match="data">
+ <xsl:choose>
+ <xsl:when test="js_lang != ''">
+ <script>
+ var lang = <xsl:value-of select="js_lang"/>;
+ </script>
+ </xsl:when>
+ </xsl:choose>
+
<iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
<input id="yui-history-field" type="hidden"/>
<xsl:call-template name="yui_phpgw_i18n"/>
Modified: trunk/registration/inc/class.uipending.inc.php
===================================================================
--- trunk/registration/inc/class.uipending.inc.php 2012-06-20 11:35:09 UTC
(rev 9634)
+++ trunk/registration/inc/class.uipending.inc.php 2012-06-20 11:55:10 UTC
(rev 9635)
@@ -186,7 +186,8 @@
phpgwapi_yui::load_widget('paginator');
self::add_javascript('registration', 'yahoo',
'pending.index.js');
-
self::render_template_xsl(array('pending_users', 'common'), $data);
+//
self::render_template_xsl(array('pending_users', 'common'), $data);
+
self::render_template_xsl(array('pending_users'), $data);
}
}
@@ -225,14 +226,21 @@
$data = array(
+ 'js_lang' =>js_lang('edit', 'add'),
'form' => array(
'toolbar' => array(
'item' => array(
array(
'type' =>
'link',
- 'value' =>
lang('New application'),
- 'href' =>
self::link(array('menuaction' => 'booking.uiapplication.add'))
+ 'value' =>
lang('invert checkboxes'),
+ 'href' =>
"javascript:checkAll('mychecks')"
),
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('save'),
+ 'href' =>
"javascript:onSave()"
+ ),
+
array('type' =>
'filter',
'name' =>
'reg_dla',
'text' => lang('status').':',
@@ -250,7 +258,8 @@
array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
- 'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
+ 'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_showall'))
+ // 'href' =>
self::link(array('menuaction' => 'registration.uipending.index2',
'phpgw_return_as' => 'json', 'all'))
),
),
),
@@ -278,7 +287,7 @@
'key' => 'reg_approved',
'label' =>
lang('approved'),
'sortable' => true,
- 'formatter' =>
'FormatterCenter'
+ 'formatter' => "''"
),
array(
'key' =>
'location_code',
@@ -295,6 +304,7 @@
)
),
);
+//_debug_array($data);die();
self::render_template_xsl(array('datatable_common'),
$data);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9635] registration: uicommon,
Sigurd Nes <=