tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
tutos-commits — SVN commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
| 2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
| 2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
| 2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
| 2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
| 2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
| 2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
| 2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
| 2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
| 2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
| 2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
| 2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
| 2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
1
|
2
(1) |
3
(2) |
4
(2) |
|
5
|
6
(2) |
7
|
8
|
9
|
10
|
11
|
|
12
|
13
(1) |
14
|
15
(1) |
16
(2) |
17
|
18
|
|
19
|
20
|
21
|
22
|
23
|
24
(1) |
25
|
|
26
|
27
|
28
|
29
(7) |
30
|
31
(1) |
|
|
From: <gok...@us...> - 2014-01-31 17:29:40
|
Revision: 1227
http://sourceforge.net/p/tutos/code/1227
Author: gokohnert
Date: 2014-01-31 17:29:37 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/db/db_mysql.pinc
trunk/php/db/db_mysqli.pinc
Modified: trunk/php/db/db_mysql.pinc
===================================================================
--- trunk/php/db/db_mysql.pinc 2014-01-29 09:05:19 UTC (rev 1226)
+++ trunk/php/db/db_mysql.pinc 2014-01-31 17:29:37 UTC (rev 1227)
@@ -357,7 +357,7 @@
if (is_array($arg)) {
foreach ($arg as $a) {
if (!$cs) {
- $a = 'UPPER('.$a.')';
+ $a = ' UPPER('.$a.')';
}
$fld .= $pre.$a;
$pre = ",' ',";
@@ -366,7 +366,7 @@
} else {
if (empty($arg)) continue;
if (!$cs) {
- $arg = 'UPPER('.$arg.')';
+ $arg = ' UPPER('.$arg.')';
}
$fld .= $pre.$arg;
$pre = ",' ',";
Modified: trunk/php/db/db_mysqli.pinc
===================================================================
--- trunk/php/db/db_mysqli.pinc 2014-01-29 09:05:19 UTC (rev 1226)
+++ trunk/php/db/db_mysqli.pinc 2014-01-31 17:29:37 UTC (rev 1227)
@@ -363,7 +363,7 @@
if (is_array($arg)) {
foreach ($arg as $a) {
if (!$cs) {
- $a = 'UPPER('.$a.')';
+ $a = ' UPPER('.$a.')';
}
$fld .= $pre.$a;
$pre = ",' ',";
@@ -372,7 +372,7 @@
} else {
if (empty($arg)) continue;
if (!$cs) {
- $arg = 'UPPER('.$arg.')';
+ $arg = ' UPPER('.$arg.')';
}
$fld .= $pre.$arg;
$pre = ",' ',";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-29 09:05:24
|
Revision: 1226
http://sourceforge.net/p/tutos/code/1226
Author: gokohnert
Date: 2014-01-29 09:05:19 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
display customer id in department_show
Modified Paths:
--------------
trunk/php/department_show.php
trunk/php/location.pinc
Modified: trunk/php/department_show.php
===================================================================
--- trunk/php/department_show.php 2014-01-29 08:04:55 UTC (rev 1225)
+++ trunk/php/department_show.php 2014-01-29 09:05:19 UTC (rev 1226)
@@ -76,6 +76,7 @@
$r .= Show_LocFields($this->user,$lang['acc_info1'],$this->obj,"acc_info1",1);
$r .= Show_LocFields($this->user,$lang['acc_info2'],$this->obj,"acc_info2",1);
$r .= Show_LocFields($this->user,$lang['acc_nr'],$this->obj,"acc_nr",1);
+ $r .= Show_LocFields($this->user,$lang['AdrCustumerID'],$this->obj,"customer_id",1);
}
$ra = $this->dbconn->Exec($this->q);
Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc 2014-01-29 08:04:55 UTC (rev 1225)
+++ trunk/php/location.pinc 2014-01-29 09:05:19 UTC (rev 1226)
@@ -196,8 +196,8 @@
$this->$f = '';
}
}
- $this->c_id = $r->get($pos, 'c_id');
- $this->d_id = $r->get($pos, 'd_id');
+ $this->c_id = $r->get($pos, 'c_id');
+ $this->d_id = $r->get($pos, 'd_id');
if ( !empty($this->d_id) ) {
$this->department = $this->department->read($this->d_id,$this->department);
@@ -659,7 +659,7 @@
/**
* a input form (used in comapny_new
*/
- function inputform (&$layout) {
+ function inputform (layout $layout) {
global $lang,$table;
$r = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-29 08:04:59
|
Revision: 1225
http://sourceforge.net/p/tutos/code/1225
Author: gokohnert
Date: 2014-01-29 08:04:55 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
removed debug output
Modified Paths:
--------------
trunk/php/product_overview.php
Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php 2014-01-29 07:34:27 UTC (rev 1224)
+++ trunk/php/product_overview.php 2014-01-29 08:04:55 UTC (rev 1225)
@@ -859,7 +859,7 @@
$this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
}
}
- $msg = addLine($msg,$this->q);
+ //$msg = addLine($msg,$this->q);
check_dbacl($this->dbconn, $this->q, $this->user->id);
// Order of output
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-29 07:34:31
|
Revision: 1224
http://sourceforge.net/p/tutos/code/1224
Author: gokohnert
Date: 2014-01-29 07:34:27 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
now search in a concat string of fields instead of single fileds (will find things like name-space-version), updated sqlite3 driver
Modified Paths:
--------------
trunk/php/admin/demodata.p3
trunk/php/admin/scheme.php
trunk/php/config_default.pinc
trunk/php/db/db.pinc
trunk/php/db/db_db2.pinc
trunk/php/db/db_firebird.pinc
trunk/php/db/db_interbase.pinc
trunk/php/db/db_mssql.pinc
trunk/php/db/db_mssqlnative.pinc
trunk/php/db/db_mysql.pinc
trunk/php/db/db_mysqli.pinc
trunk/php/db/db_oci.pinc
trunk/php/db/db_ora.pinc
trunk/php/db/db_pg.pinc
trunk/php/db/db_sqlite.pinc
trunk/php/db/db_sqlite3.pinc
trunk/php/db/table.pinc
trunk/php/db.p3
trunk/php/webelements.p3
Modified: trunk/php/admin/demodata.p3
===================================================================
--- trunk/php/admin/demodata.p3 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/admin/demodata.p3 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2004 - 2010 by Gero Kohnert
+ * Copyright 2004 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
Modified: trunk/php/admin/scheme.php
===================================================================
--- trunk/php/admin/scheme.php 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/admin/scheme.php 2014-01-29 07:34:27 UTC (rev 1224)
@@ -138,51 +138,51 @@
$tutos[demo] = 0;
// Superuser is allowed to do everything
-# foreach ($tutos['defaultperm'] as $i => $f) {
- # $tutos['defaultperm'][$i] = 1;
- # }
- unset ($tutos['defaultperm']);
- $tutos['defaultperm'] = array();
+ # foreach ($tutos['defaultperm'] as $i => $f) {
+ # $tutos['defaultperm'][$i] = 1;
+ # }
+ unset ($tutos['defaultperm']);
+ $tutos['defaultperm'] = array();
- $adr = new tutos_address($this->obj);
- $adr->f_name = "Super";
- $adr->l_name = "User";
- $adr->birthday = new TUTOS_Date_Time();
- $adr->creator = $adr;
+ $adr = new tutos_address($this->obj);
+ $adr->f_name = "Super";
+ $adr->l_name = "User";
+ $adr->birthday = new TUTOS_Date_Time();
+ $adr->creator = $adr;
- $q = 'DELETE FROM '. $adr->tablename .' WHERE f_name = '. $adr->dbconn->String($adr->f_name) .' AND l_name = '. $adr->dbconn->String($adr->l_name);
- $r = $adr->dbconn->exec($q);
- $r->free();
+ $q = 'DELETE FROM '. $adr->tablename .' WHERE f_name = '. $adr->dbconn->String($adr->f_name) .' AND l_name = '. $adr->dbconn->String($adr->l_name);
+ $res = $adr->dbconn->exec($q);
+ $res->free();
- $r .= $adr->save();
+ $r .= $adr->save();
- $this->user = new tutos_user($this->obj);
- $this->user->updatepw = 1;
- $this->user->login = "superuser";
- if (isset($tutos['pw']) && $tutos['pw'] == 1 && $tutos[debug] == 1) {
- $this->user->pw = 'tutos';
- } else {
- $this->user->pw = generatePassword();
- }
- $this->user->id = $adr->id;
- $this->user->admin = 1;
+ $this->user = new tutos_user($this->obj);
+ $this->user->updatepw = 1;
+ $this->user->login = "superuser";
+ if (isset($tutos['pw']) && $tutos['pw'] == 1 && $tutos[debug] == 1) {
+ $this->user->pw = 'tutos';
+ } else {
+ $this->user->pw = generatePassword();
+ }
+ $this->user->id = $adr->id;
+ $this->user->admin = 1;
- $q = "DELETE FROM ". $this->user->tablename ." WHERE login = ". $this->user->dbconn->String($this->user->login);
- $r = $this->user->dbconn->exec($q);
- $r->free();
+ $q = "DELETE FROM ". $this->user->tablename ." WHERE login = ". $this->user->dbconn->String($this->user->login);
+ $res = $this->user->dbconn->exec($q);
+ $res->free();
- foreach ($tutos[modules] as $rx => $x) {
- if (!isset($tutos[modules][$rx][file])) continue;
- $loc = dirname($tutos['base'] ."/". $tutos[modules][$rx][file]);
- if (file_exists($loc.'/demodata.p3')) {
- loadmodule($rx);
+ foreach ($tutos[modules] as $rx => $x) {
+ if (!isset($tutos[modules][$rx][file])) continue;
+ $loc = dirname($tutos['base'] ."/". $tutos[modules][$rx][file]);
+ if (file_exists($loc.'/demodata.p3')) {
+ loadmodule($rx);
+ }
}
- }
- $r .= $this->user->save();
- $r .= $this->user->save_permissions();
- $r .= $this->obj->after_update_db();
- return $r;
+ $r .= $this->user->save();
+ $r .= $this->user->save_permissions();
+ $r .= $this->obj->after_update_db();
+ return $r;
}
/**
@@ -393,4 +393,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/config_default.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -74,8 +74,8 @@
// 5 = MS SQL (beta)
// 7 = Interbase
// 8 = Oracle OCI connection
-// 11 = SQLITE
-// 12 = SQLITE 3
+// 11 = SQLITE (database name is the database filename located absolute or relative to tutos basedir)
+// 12 = SQLITE 3 (database name is the database filename located absolute or relative to tutos basedir)
// 13 = MSSQL (native) (beta)
//
$tutos[dbtype][0] = 1;
Modified: trunk/php/db/db.pinc
===================================================================
--- trunk/php/db/db.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -317,16 +317,26 @@
return '';
}
- function unLike($fld1,$name,$fld2 = "",$fld3 = "") {
+ final function unLike($fld1,$name,$fld2 = "",$fld3 = "") {
return $this->Like($fld1,$name,$fld2,$fld3,true);
}
- function unLike2($fld,$name) {
+ final function unLike2($fld,$name) {
return $this->Like2($fld,$name,true);
}
- abstract function Like($fld1,$name,$fld2 = "",$fld3 = "",$not=false);
+ /**
+ * case insensitive string compare
+ */
+ final function Like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
+ return $this->Like3($name,$not,false,$fld1,$fld2,$fld3);
+ }
+ /**
+ * case sensitive strict string compare
+ */
+ final function Like2($fld,$name,$not=false) {
+ return $this->Like3($name,$not,true,$fld);
+ }
- abstract function Like2($fld,$name,$not=false);
-
+ abstract function Like3($name,$not=false,$cs=false);
/**
* lock a table t
*/
@@ -338,6 +348,19 @@
* set the timezone
*/
function timezone($tz) {
+ global $tutos;
+
+ strftime("%H:%M %Z");
+
+ if ( empty($tz)) {
+ $tz = $tutos[defaultTZ];
+ }
+ if ($tz == getenv('TZ')) {
+ return;
+ }
+ putenv ("TZ=".$tz);
+
+ return $tz;
}
/**
@@ -880,10 +903,8 @@
}
function needCount(){
}
- function Like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
+ function Like3($name,$not=false,$cs=false) {
}
- function Like2($fld,$name,$not=false) {
- }
function getFullName() {
return 'fake_db';
}
Modified: trunk/php/db/db_db2.pinc
===================================================================
--- trunk/php/db/db_db2.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_db2.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2007 - 2011 by Gero Kohnert
+ * Copyright 2007 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -9,11 +9,12 @@
* SVN Info $Id: db_mysql.pinc,v 1.38 2007/08/08 11:36:06 gokohnert Exp $
* $Author: gokohnert $
*/
+$tutos['files'][__FILE__] = '$Rev: 1116 $';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'db2format1';
$tutos['dateformat'][] = 'db2format2';
@@ -35,8 +36,8 @@
function db2format1(&$d,$str) {
$regs = array();
if ( ereg( "^([0-9]{4})-([0-1][0-9])-([0-9]{2}) ([0-2][0-9]):([0-5][0-9]):([0-5][0-9])$", $str, $regs ) ) {
-# Init via DB 2000-09-16 19:39:00 MySQL
- $d->year = (integer)$regs[1];
+ # Init via DB 2000-09-16 19:39:00 MySQL
+ $d->year = (integer)$regs[1];
$d->month = (integer)$regs[2];
$d->day = (integer)$regs[3];
$d->hour = (integer)$regs[4];
@@ -52,8 +53,8 @@
function db2format2(&$d,$str) {
$regs = array();
if ( ereg( "^([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})$", $str, $regs ) ) {
-# Init via DB YYYY-MM-DD
- $d->year = (integer)$regs[1];
+ # Init via DB YYYY-MM-DD
+ $d->year = (integer)$regs[1];
$d->month = (integer)$regs[2];
$d->day = (integer)$regs[3];
$d->hour = 0;
@@ -279,74 +280,86 @@
}
/**
- * case insensitive string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = $fld1;
- if ( $fld2 != "" ) {
- $fld = "CONCAT(". $fld ." ,' '," .$fld2;
- if ( $fld3 != "" ) {
- $fld .= ",' ',". $fld3;
+ function like3($name,$not=false,$cs=false) {
+ $name = preg_replace('#\\\#','\\\\\\',$name);
+ $name = preg_replace("#'#","\'",$name);
+
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ if (!$cs) {
+ $a = 'UPPER('.$a.')';
+ }
+ $fld .= $pre.$a;
+ $pre = ",' ',";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ if (!$cs) {
+ $arg = 'UPPER('.$arg.')';
+ }
+ $fld .= $pre.$arg;
+ $pre = ",' ',";
+ $cnt++;
}
- $fld .= ")";
}
- $name = eregi_replace(" ","%",$name);
- $name = eregi_replace("[\]","\\\\",$name);
- $name = eregi_replace("'","\'",$name);
- return (" UPPER(". $fld .")".($not ? " not":"")." like '%". strtoupper($name) ."%' ");
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
+ $fld = 'CONCAT('.$fld.')';
+ }
+ if ($cs) {
+ return (' '. $fld .($not ?' !=':' =')." BINARY '". $name ."' ");
+ } else {
+ return ($fld .($not ? ' not':'')." like '%". mb_strtoupper($name) ."%' ");
+ }
}
/**
- * case sensitive strict string compare
*/
- function like2($fld,$name,$not=false) {
- $name = eregi_replace("[\]","\\\\",$name);
- $name = eregi_replace("'","\'",$name);
- return (" ". $fld .($not ? " !":" ")."= BINARY '". $name ."' ");
- }
- /* ---------------------------------------------------------------------------
- */
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
}
-# MYSQL has its own mechanism
return "PASSWORD('".$pw."')";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function begin($t) {
return "X";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function commit($t) {
return "Y";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function abort($t) {
return "";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function lock($t) {
return "";
}
- /* ---------------------------------------------------------------------------
- */
- function timezone($tz) {
- global $tutos;
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
/**
*/
function getFullname() {
@@ -560,11 +573,11 @@
$now = new TUTOS_Date_Time();
$diff = $now->getTimestamp() - $this->db->lastanalyze->getTimeStamp();
-# only once a day
- if ( $diff < 86400 ) return;
+ # only once a day
+ if ( $diff < 86400 ) return;
-# read the table definitions of modules
- @include_once $tutos['base'] ."/php/db/table.pinc";
+ # read the table definitions of modules
+ @include_once $tutos['base'] ."/php/db/table.pinc";
foreach ($tutos[modules] as $r => $x) {
if (isset($tutos[modules][$r][file]) && file_exists(dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc") ) {
@include_once dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc";
Modified: trunk/php/db/db_firebird.pinc
===================================================================
--- trunk/php/db/db_firebird.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_firebird.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2005 - 2011 by Gero Kohnert
+ * Copyright 2005 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -9,11 +9,12 @@
* SVN Info $Id$
* $Author$
*/
+$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'fbformat1';
$tutos['dateformat'][] = 'fbformat2';
@@ -249,31 +250,47 @@
}
/**
- * case insensitive string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = $fld1;
- if ( $fld2 != "" ) {
- $fld .= "|| ' ' ||". $fld2;
+ function like3($name,$not=false,$cs=false) {
+ $name = preg_replace('#\\\#','\\\\\\',$name);
+ $name = preg_replace("#'#","?",$name);
+
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ $fld .= $pre.$a;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ $fld .= $pre.$arg;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
}
- if ( $fld3 != "" ) {
- $fld .= "|| ' ' ||". $fld3;
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
}
- $name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .")".($not ? " not":"")." like '%". strtoupper($name) ."%' ");
+ if ($cs) {
+ return (' '. $fld .($not ? " !=":" =")." '". $name ."' ");
+ } else {
+ return (' upper('.$fld.')' .($not ? ' not':'')." like '%". mb_strtoupper($name) ."%' ");
+ }
}
/**
- * case sensitive strict string compare
*/
- function like2($fld,$name,$not=false) {
- $name = eregi_replace("'","''",$name);
- return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
- }
-
- /**
- */
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
@@ -306,22 +323,6 @@
/**
*/
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- # $this->exec("SET TIME ZONE '". $tz ."'");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- # $this->exec("SET TIME ZONE '". $tutos[defaultTZ] ."'");
- }
- }
-
- /**
- */
function getFullname() {
return "Firebird: ". $this->db->host .":". $this->db->name ;
}
Modified: trunk/php/db/db_interbase.pinc
===================================================================
--- trunk/php/db/db_interbase.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_interbase.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2011 by Gero Kohnert
+ * Copyright 2001 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -9,11 +9,12 @@
* SVN Info $Id$
* $Author$
*/
+$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'ibformat1';
$tutos['dateformat'][] = 'ibformat2';
$tutos['dateformat'][] = 'ibformat3';
@@ -36,8 +37,8 @@
function ibformat1(&$d,$str) {
$regs = array();
if ( ereg( "^([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})([-+][0-9]{1,2}[:0-9]{0,3})$", $str, $regs ) ) {
-# Init via DB 1999-11-27 12:34:56+02 Postgres
- $d->year = (integer)$regs[1];
+ # Init via DB 1999-11-27 12:34:56+02 Postgres
+ $d->year = (integer)$regs[1];
$d->month = (integer)$regs[2];
$d->day = (integer)$regs[3];
$d->hour = (integer)$regs[4];
@@ -54,8 +55,8 @@
function ibformat2(&$d,$str) {
$regs = array();
if ( ereg( "^([0-1][0-9])/([0-3][0-9])/([0-9]{4})$", $str, $regs ) ) {
-# Init via MM/DD/YYYY
- $d->month = (integer)$regs[1];
+ # Init via MM/DD/YYYY
+ $d->month = (integer)$regs[1];
$d->day = (integer)$regs[2];
$d->year = (integer)$regs[3];
$d->hour = 0;
@@ -71,8 +72,8 @@
function ibformat3(&$d,$str) {
$regs = array();
if ( ereg( "^([0-9]{4})-([0-1][0-9])-([0-3][0-9])$", $str, $regs ) ) {
-# Init via YYYY-MM-DD
- $d->year = (integer)$regs[1];
+ # Init via YYYY-MM-DD
+ $d->year = (integer)$regs[1];
$d->month = (integer)$regs[2];
$d->day = (integer)$regs[3];
$d->hour = 0;
@@ -255,31 +256,47 @@
}
/**
- * case insensitive string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = $fld1;
- if ( $fld2 != "" ) {
- $fld .= "|| ' ' ||". $fld2;
+ function like3($name,$not=false,$cs=false) {
+ $name = preg_replace('#\\\#','\\\\\\',$name);
+ $name = preg_replace("#'#","?",$name);
+
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ $fld .= $pre.$a;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ $fld .= $pre.$arg;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
}
- if ( $fld3 != "" ) {
- $fld .= "|| ' ' ||". $fld3;
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
}
- $name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .")".($not ? " not":"")." like '%". strtoupper($name) ."%' ");
+ if ($cs) {
+ return (' '. $fld .($not ? " !=":" =")." '". $name ."' ");
+ } else {
+ return (' lower('.$fld.')' .($not ? ' not':'')." like E'%". mb_strtolower($name) ."%' escape ''");
+ }
}
/**
- * case sensitive strict string compare
*/
- function like2($fld,$name,$not=false) {
- $name = eregi_replace("'","''",$name);
- return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
- }
-
- /**
- */
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
@@ -312,20 +329,6 @@
/**
*/
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
- /**
- */
function getFullname() {
return "Interbase: ". $this->db->host .":". $this->db->name ;
}
@@ -505,8 +508,8 @@
* set the offset of rows
*/
function setoffset($cnt) {
-# disabled
- $this->offset = 0;
+ # disabled
+ $this->offset = 0;
}
/**
@@ -516,7 +519,7 @@
if ( isset($this->result[$pos-$this->offset][$fld]) || (0 == $this->result[$pos-$this->offset][$fld]) ) {
return $this->result[$pos-$this->offset][$fld];
} else {
-# echo "<br />POS:".$pos ." | FLD:". $fld ." | * <br />\n";
+ # echo "<br />POS:".$pos ." | FLD:". $fld ." | * <br />\n";
return;
}
}
Modified: trunk/php/db/db_mssql.pinc
===================================================================
--- trunk/php/db/db_mssql.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_mssql.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2011 by Gero Kohnert
+ * Copyright 2001 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -9,11 +9,12 @@
* SVN Info $Id$
* $Author$
*/
+$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'mssqlformat1';
$tutos['dateformat'][] = 'mssqlformat2';
@@ -169,7 +170,7 @@
$numrows = mssql_num_rows($x);
$numcols = mssql_num_fields($x);
-#echo "X: ". $numrows." ".$numcols."<br />";
+ #echo "X: ". $numrows." ".$numcols."<br />";
if ( $numcols == 0 ) {
return $result;
}
@@ -192,7 +193,7 @@
Fatal_Error("got no id",$query);
}
$id = $r->get(0, "s_id");
-#echo "XXX:".$id;
+ #echo "XXX:".$id;
$r->free();
return $id;
}
@@ -268,32 +269,47 @@
}
/**
- * case sensitive strict string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = $fld1;
- if ( $fld2 != "" ) {
- $fld .= "+ ' ' +". $fld2;
+ function like3($name,$not=false,$cs=false) {
+ $name = preg_replace('#\\\#','\\\\\\',$name);
+ $name = preg_replace("#'#","?",$name);
+
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ $fld .= $pre.$a;
+ $pre = " + ' ' + ";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ $fld .= $pre.$arg;
+ $pre = " + ' ' + ";
+ $cnt++;
+ }
}
- if ( $fld3 != "" ) {
- $fld .= "+ ' ' +". $fld3;
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
}
- $name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .")".($not ? " not":"")." like UPPER('%". $name ."%') ");
+ if ($cs) {
+ return (' '. $fld .($not ? " !=":" =")." '". $name ."' ");
+ } else {
+ return (' upper('.$fld.')' .($not ? ' not':'')." like upper('%". mb_strtoupper($name) ."%')");
+ }
}
/**
- * case sensitive strict string compare
*/
- function like2($fld,$name,$not=false) {
- #$name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","''",$name);
- return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
- }
-
- /**
- */
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
@@ -327,26 +343,6 @@
/**
*/
- function lock($t) {
- return "";
- }
-
- /**
- */
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
- /**
- */
function getFullname() {
return "MS SQL:". $this->db->user ."@" .$this->db->host ." ". $this->db->name;
}
@@ -555,4 +551,4 @@
return;
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/php/db/db_mssqlnative.pinc
===================================================================
--- trunk/php/db/db_mssqlnative.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_mssqlnative.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2011 by Gero Kohnert
+ * Copyright 2001 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -12,11 +12,12 @@
* this database driver was orignally given to the TUTOS project by Microsoft
*
*/
+$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'mssqlformat1';
$tutos['dateformat'][] = 'mssqlformat2';
@@ -41,9 +42,9 @@
$regs = array();
if ( ereg( "^([A-Za-z]{3}) ([0-9]*) ([ 0-9]*) ([ 0-9]*):([0-9]*)([A-Z]{2})$", $str, $regs ) ) {
-# Init via DB Apr 14 2004 8:23AM
+ # Init via DB Apr 14 2004 8:23AM
- $d->month = $tutos['mssql'][$regs[1]];
+ $d->month = $tutos['mssql'][$regs[1]];
$d->day = (integer)$regs[2];
$d->year = (integer)$regs[3];
@@ -57,7 +58,7 @@
}
$d->format = 22;
-# echo "QQQ:".$str."<br />";
+ # echo "QQQ:".$str."<br />";
}
return;
}
@@ -70,9 +71,9 @@
$regs = array();
if ( ereg( "^([0-9]*) ([0-9]*) ([0-9]*) ([ 0-9]*):([0-9]*)$", $str, $regs ) ) {
-# Init via DB 13 01 2004 8:23AM
+ # Init via DB 13 01 2004 8:23AM
- $d->day = (integer)$regs[1];
+ $d->day = (integer)$regs[1];
$d->month = (integer)$regs[2];
$d->year = (integer)$regs[3];
@@ -85,7 +86,7 @@
}
$d->format = 23;
-#echo "QQQ:".$str."<br />";
+ #echo "QQQ:".$str."<br />";
}
return;
}
@@ -96,7 +97,7 @@
* @package DB
*/
class db_mssqlnative extends tutos_db {
- /* ---------------------------------------------------------------------------
+ /**
*/
function db_mssqlnative(&$db) {
global $tutos;
@@ -105,6 +106,7 @@
sqlsrv_configure("WarningsReturnAsErrors", 0);
$tutos[use_check_dbacl] = 0;
}
+
/**
* open the DB connection
*/
@@ -119,8 +121,7 @@
$this->conn = &$c;
}
- function ErrorMsg()
- {
+ function ErrorMsg() {
$strError = '';
$retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);
if($retErrors != null) {
@@ -135,8 +136,7 @@
return $strError;
}
- function ErrorNo()
- {
+ function ErrorNo() {
$err = sqlsrv_errors(SQLSRV_ERR_ALL);
if($err[0]) return $err[0]['code'];
else return -1;
@@ -150,18 +150,21 @@
sqlsrv_close($this->conn);
$this->conn = -1;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function notime() {
-#return ("'1970-1-1 00:00:00'");
+ #return ("'1970-1-1 00:00:00'");
return "null";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function now() {
return "getdate()";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function exec($query,$showerror = 1) {
if ( $this->conn == -1 ) {
@@ -185,7 +188,8 @@
return $result;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function nextid($name = 'id') {
sqlsrv_begin_transaction($this->conn);
@@ -209,7 +213,8 @@
sqlsrv_commit($this->conn);
return $id;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function setSeqID($id,$name = "id") {
sqlsrv_begin_transaction($this->conn);
@@ -223,7 +228,8 @@
sqlsrv_commit($this->conn);
return $id;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function getSeqID($name = "id") {
$query = 'SELECT id FROM '. $this->prefix . $name .' ORDER BY id DESC';
@@ -235,18 +241,21 @@
$r->free();
return $id;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function string($t) {
$t = str_replace("'","''",$t);
return "'". $t ."'";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function text($t) {
return $this->string($t);
}
- /* ---------------------------------------------------------------------------
+
+ /**
* give Database formatted datetimestring for d
*/
function datetime(&$d) {
@@ -259,7 +268,8 @@
$x = sprintf("'%04d-%02d-%02d %02d:%02d:%02d'",$t->year,$t->month,$t->day,$t->hour,$t->min,$t->sec);
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
* give Database formatted datestring for d
*/
function date(&$d) {
@@ -275,32 +285,47 @@
}
/**
- * case sensitive strict string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = $fld1;
- if ( $fld2 != "" ) {
- $fld .= " + ' ' + ". $fld2;
+ function like3($name,$not=false,$cs=false) {
+ $name = preg_replace('#\\\#','\\\\\\',$name);
+ $name = preg_replace("#'#","?",$name);
+
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ $fld .= $pre.$a;
+ $pre = " + ' ' + ";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ $fld .= $pre.$arg;
+ $pre = " + ' ' + ";
+ $cnt++;
+ }
}
- if ( $fld3 != "" ) {
- $fld .= " + ' ' + ". $fld3;
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
}
- $name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .")".($not ? " NOT":"")." LIKE UPPER('%". $name ."%') ");
+ if ($cs) {
+ return (' '. $fld .($not ? " !=":" =")." '". $name ."' ");
+ } else {
+ return (' upper('.$fld.')' .($not ? ' not':'')." like upper('%". mb_strtoupper($name) ."%')");
+ }
}
/**
- * case sensitive strict string compare
*/
- function like2($fld,$name,$not=false) {
- #$name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","''",$name);
- return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
- }
-
- /**
- */
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
@@ -331,26 +356,6 @@
/**
*/
- function lock($t) {
- return "";
- }
-
- /**
- */
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
- /**
- */
function getFullname() {
$arrServerInfo = sqlsrv_server_info($this->conn);
return 'MS SQL '.$arrServerInfo['SQLServerName'].' ('.$arrServerInfo['SQLServerVersion'].'):'. $this->db->user .'@'.$this->db->host .' '. $arrServerInfo['CurrentDatabase'];
@@ -414,8 +419,8 @@
$c = ereg_replace("U","UNIQUE",$c);
$c = ereg_replace("NN","NOT NULL",$c);
/*if (!strstr($c,"NOT NULL")) {
- $c .= " NULL";
- }*/
+ $c .= " NULL";
+ }*/
$q .= $pre. $this->colname($i) ." ". $t ." ". $c;
$pre = ",";
$comment[] = array('table'=>$this->prefix . $tbl[name],'column'=>$this->colname($i),'comment'=>$f[Desc]);
Modified: trunk/php/db/db_mysql.pinc
===================================================================
--- trunk/php/db/db_mysql.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_mysql.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -12,9 +12,9 @@
$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'mysqlformat1';
$tutos['dateformat'][] = 'mysqlformat2';
@@ -337,30 +337,51 @@
}
/**
- * case insensitive string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = ' UPPER('.$fld1.')';
- if ( $fld2 != "" ) {
- $fld = " CONCAT(UPPER(". $fld .") ,' ',UPPER(".$fld2;
- if ( $fld3 != "" ) {
- $fld .= "),' ',UPPER(". $fld3;
- }
- $fld .= "))";
- }
- $name = preg_replace('# #','%',$name);
+ function like3($name,$not=false,$cs=false) {
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","\'",$name);
- return ($fld .($not ?" not ":" ")."like '%". mb_strtoupper($name) ."%' ");
- }
- /**
- * case sensitive strict string compare
- */
- function like2($fld,$name,$not=false) {
- $name = preg_replace('#\\\#','\\\\\\',$name);
- $name = preg_replace("#'#","\'",$name);
- return (" ". $fld .($not ?" !=":" =")." BINARY '". $name ."' ");
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ if (!$cs) {
+ $a = 'UPPER('.$a.')';
+ }
+ $fld .= $pre.$a;
+ $pre = ",' ',";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ if (!$cs) {
+ $arg = 'UPPER('.$arg.')';
+ }
+ $fld .= $pre.$arg;
+ $pre = ",' ',";
+ $cnt++;
+ }
+ }
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
+ $fld = 'CONCAT('.$fld.')';
+ }
+ if ($cs) {
+ return (' '. $fld .($not ?' !=':' =')." BINARY '". $name ."' ");
+ } else {
+ return ($fld .($not ? ' not':'')." like '%". mb_strtoupper($name) ."%' ");
+ }
}
/**
@@ -380,20 +401,6 @@
/**
*/
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
- /**
- */
function getFullname() {
return "MYSQL:". $this->db->user ."@". $this->db->name ." on ". $this->db->host;
}
Modified: trunk/php/db/db_mysqli.pinc
===================================================================
--- trunk/php/db/db_mysqli.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_mysqli.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2013 by Gero Kohnert
+ * Copyright 2001 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -12,9 +12,9 @@
$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'mysqlformat1';
$tutos['dateformat'][] = 'mysqlformat2';
@@ -343,30 +343,51 @@
}
/**
- * case insensitive string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = ' UPPER('.$fld1.')';
- if ( $fld2 != "" ) {
- $fld = " CONCAT(UPPER(". $fld .") ,' ',UPPER(".$fld2;
- if ( $fld3 != "" ) {
- $fld .= "),' ',UPPER(". $fld3;
- }
- $fld .= "))";
- }
- $name = preg_replace('# #','%',$name);
+ function like3($name,$not=false,$cs=false) {
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","\'",$name);
- return ($fld .($not ? ' not':'')." like '%". mb_strtoupper($name) ."%' ");
- }
- /**
- * case sensitive strict string compare
- */
- function like2($fld,$name,$not=false) {
- $name = preg_replace('#\\\#','\\\\\\',$name);
- $name = preg_replace("#'#","\'",$name);
- return (" ". $fld .($not ?" !=":" =")." BINARY '". $name ."' ");
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ if (!$cs) {
+ $a = 'UPPER('.$a.')';
+ }
+ $fld .= $pre.$a;
+ $pre = ",' ',";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ if (!$cs) {
+ $arg = 'UPPER('.$arg.')';
+ }
+ $fld .= $pre.$arg;
+ $pre = ",' ',";
+ $cnt++;
+ }
+ }
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
+ $fld = 'CONCAT('.$fld.')';
+ }
+ if ($cs) {
+ return (' '. $fld .($not ?' !=':' =')." BINARY '". $name ."' ");
+ } else {
+ return ($fld .($not ? ' not':'')." like '%". mb_strtoupper($name) ."%' ");
+ }
}
/**
@@ -398,20 +419,6 @@
/**
*/
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
- /**
- */
function getFullname() {
return "MYSQLI:". $this->db->user ."@". $this->db->name ." on ". $this->db->host;
}
Modified: trunk/php/db/db_oci.pinc
===================================================================
--- trunk/php/db/db_oci.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_oci.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2011 by Gero Kohnert
+ * Copyright 2002 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -9,11 +9,12 @@
* SVN Info $Id$
* $Author$
*/
+$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'ociformat1';
if (!extension_loaded('oci8')) {
@@ -30,8 +31,8 @@
function ociformat1(&$d,$str) {
$regs = array();
if ( ereg( "^([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})$", $str, $regs ) ) {
-# Init via DB 1999-11-27 12:34:56 see NLS_DATE_FORMAT
- $d->year = (integer)$regs[1];
+ # Init via DB 1999-11-27 12:34:56 see NLS_DATE_FORMAT
+ $d->year = (integer)$regs[1];
$d->month = (integer)$regs[2];
$d->day = (integer)$regs[3];
$d->hour = (integer)$regs[4];
@@ -42,13 +43,13 @@
return;
}
-/** ---------------------------------------------------------------------------
+/**
* oracle database connection class
*
* @package DB
*/
class db_oci extends tutos_db {
- /* ---------------------------------------------------------------------------
+ /**
*/
function db_oci(&$db) {
global $tutos;
@@ -67,7 +68,7 @@
putenv("ORACLE_SID=".$this->db->name);
putenv("ORACLE_HOME=".$this->db->home);
-# putenv("NLS_LANG=AMERICAN_AMERICA.WE8ISO8859P1");
+ # putenv("NLS_LANG=AMERICAN_AMERICA.WE8ISO8859P1");
$of = $this->openfunc;
$c = @$of($this->db->user,$this->db->pass,$this->db->name);
@@ -89,6 +90,7 @@
OciExecute($stmt);
OCIFreeStatement ($stmt);
}
+
/**
* close the DB connection
*/
@@ -98,24 +100,28 @@
OciLogOff($this->conn);
$this->conn = -1;
}
+
/**
* return more info about server client etc
*/
function moreinfo() {
return "Server:". OCIServerVersion($this->conn);
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function notime() {
-#return ("'1970-1-1 00:00:00'");
+ #return ("'1970-1-1 00:00:00'");
return "null";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function now() {
return "sysdate";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function exec($query,$showerror = 1) {
if ( $this->conn == -1 ) {
@@ -125,8 +131,8 @@
$x = new result_oci($this);
-# Parse will fail on nonexistant tables
- $p = ociparse($this->conn,$query);
+ # Parse will fail on nonexistant tables
+ $p = ociparse($this->conn,$query);
if ( false == $p ) {
if ($showerror == 1) {
Fatal_Error("Exec ". $this->conn ." !PARSE|". $this->error(),$query);
@@ -168,7 +174,8 @@
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function nextid($name = "id") {
$query = "SELECT ". $this->prefix . $name .".nextval FROM dual";
@@ -180,7 +187,8 @@
$r->free();
return $id;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function setSeqID($id,$name = "id") {
$query = "DROP SEQUENCE ". $this->prefix . $name;
@@ -191,7 +199,8 @@
return $id;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function getSeqID($name = "id") {
$query = "SELECT ". $this->prefix . $name .".currval FROM dual";
@@ -203,13 +212,15 @@
$r->free();
return $id;
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function string($t) {
$t = str_replace("'","''",$t);
return "'". $t ."'";
}
- /* ---------------------------------------------------------------------------
+
+ /**
*/
function text($t) {
if ( $this->txtlen > 0 ) {
@@ -217,10 +228,11 @@
}
return "'". $t ."'";
}
- /* ---------------------------------------------------------------------------
+
+ /**
* give Database formatted datetimestring for d
*/
- function datetime(&$d) {
+ function datetime(TUTOS_Date_Time $d) {
if ( $d->notime == 1) {
return "null";
}
@@ -230,10 +242,11 @@
$x = sprintf("to_Date('%04d-%02d-%02d %02d:%02d:%02d','YYYY-MM-DD HH24:MI:SS')",$t->year,$t->month,$t->day,$t->hour,$t->min,$t->sec);
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
* give Database formatted datestring for d
*/
- function date(&$d) {
+ function date(TUTOS_Date_Time $d) {
if ( $d->notime == 1) {
return "null";
}
@@ -246,82 +259,56 @@
}
/**
- * case insensitive string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = $fld1;
- if ( $fld2 != "" ) {
- $fld .= "|| ' ' ||". $fld2;
+ function like3($name,$not=false,$cs=false) {
+ $name = preg_replace('#\\\#','\\\\\\',$name);
+ $name = preg_replace("#'#","''",$name);
+
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ $fld .= $pre.$a;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ $fld .= $pre.$arg;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
}
- if ( $fld3 != "" ) {
- $fld .= "|| ' ' ||". $fld3;
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
}
- $name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .")".($not ? " not":" ")."like '%". strtoupper($name) ."%' ");
+ if ($cs) {
+ return (' '. $fld .($not ? " !=":" =")." '". $name ."' ");
+ } else {
+ return (' lower('.$fld.')' .($not ? ' not':'')." like '%". mb_strtolower($name) ."%' ");
+ }
}
/**
- * case sensitive strict string compare
*/
- function like2($fld,$name,$not=false) {
- #$name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","''",$name);
- return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
- }
-
- /* ---------------------------------------------------------------------------
- */
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
}
return "'". crypt($pw,"271166") ."'";
}
- /* ---------------------------------------------------------------------------
- */
- function begin($t) {
- # $r = $this->Exec("BEGIN ". $t );
- # $r = $this->Exec("BEGIN");
- return "X";
- }
- /* ---------------------------------------------------------------------------
- */
- function commit($t) {
- # $r = $this->Exec("COMMIT ". $t);
- # $r = $this->Exec("COMMIT");
- # $r = $this->Exec("END ");
- return "Y";
- }
/**
*/
- function abort($t) {
- return "";
- }
-
- /**
- */
- function lock($t) {
- return "";
- }
-
- /**
- */
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
- /**
- */
function getFullname() {
return "ORACLE OCI:". $this->db->name;
}
@@ -494,28 +481,28 @@
$now = new TUTOS_Date_Time();
$diff = $now->getTimestamp() - $this->db->lastanalyze->getTimeStamp();
-# only once a day
- if ( $diff < 86400 ) return;
+ # only once a day
+ if ( $diff < 86400 ) return;
-# read the table definitions of modules
- @include_once $tutos['base'] ."/php/db/table.pinc";
+ # read the table definitions of modules
+ @include_once $tutos['base'] ."/php/db/table.pinc";
foreach ($tutos[modules] as $r => $x) {
if (isset($tutos[modules][$r][file]) && file_exists(dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc") ) {
@include_once dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc";
}
}
-# foreach ($table as $i => $f) {
- # $q = "optimize ". $f[name];
- # $this->Exec($q,0);
- # }
-# see http://otn.oracle.com/docs/products/oracle9i/doc_library/release2/server.920/a96533/stats.htm#26713
- $cur = Ora_Do ($this->conn,"call DBMS_STATS.GATHER_SCHEMA_STATS('". $this->db->user ."')");
- Ora_Close($cur);
+ # foreach ($table as $i => $f) {
+ # $q = "optimize ". $f[name];
+ # $this->Exec($q,0);
+ # }
+ # see http://otn.oracle.com/docs/products/oracle9i/doc_library/release2/server.920/a96533/stats.htm#26713
+ $cur = Ora_Do ($this->conn,"call DBMS_STATS.GATHER_SCHEMA_STATS('". $this->db->user ."')");
+ Ora_Close($cur);
- $this->db->setLastAnalyze($now);
- $msg = $this->db->save();
- return $msg;
+ $this->db->setLastAnalyze($now);
+ $msg = $this->db->save();
+ return $msg;
}
/* ---------------------------------------------------------------------------
*/
@@ -533,8 +520,8 @@
/* ---------------------------------------------------------------------------
*/
function get($pos,$fld) {
-# Copy the whole thing (force a string != null)
- return "".$this->result[$pos-$this->offset][strtoupper($fld)];
+ # Copy the whole thing (force a string != null)
+ return "".$this->result[$pos-$this->offset][strtoupper($fld)];
}
/* ---------------------------------------------------------------------------
*/
Modified: trunk/php/db/db_ora.pinc
===================================================================
--- trunk/php/db/db_ora.pinc 2014-01-29 07:31:52 UTC (rev 1223)
+++ trunk/php/db/db_ora.pinc 2014-01-29 07:34:27 UTC (rev 1224)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2011 by Gero Kohnert
+ * Copyright 2001 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -9,11 +9,12 @@
* SVN Info $Id$
* $Author$
*/
+$tutos['files'][__FILE__] = '$Rev$';
require_once 'db.pinc';
-#
-# Register parse functions for datetime
-#
+//
+// Register parse functions for datetime
+//
$tutos['dateformat'][] = 'oraformat1';
/**
@@ -22,8 +23,8 @@
function oraformat1(&$d,$str) {
$regs = array();
if ( ereg( "^([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})$", $str, $regs ) ) {
-# Init via DB 1999-11-27 12:34:56 see NLS_DATE_FORMAT
- $d->year = (integer)$regs[1];
+ # Init via DB 1999-11-27 12:34:56 see NLS_DATE_FORMAT
+ $d->year = (integer)$regs[1];
$d->month = (integer)$regs[2];
$d->day = (integer)$regs[3];
$d->hour = (integer)$regs[4];
@@ -59,7 +60,7 @@
putenv("ORACLE_SID=".$this->db->name);
putenv("ORACLE_HOME=".$this->db->home);
-# putenv("NLS_LANG=AMERICAN_AMERICA.WE8ISO8859P1");
+ # putenv("NLS_LANG=AMERICAN_AMERICA.WE8ISO8859P1");
$of = $this->openfunc;
$c = @$of($this->db->user."@".$this->db->name,$this->db->pass);
@@ -89,7 +90,7 @@
/* ---------------------------------------------------------------------------
*/
function notime() {
-#return ("'1970-1-1 00:00:00'");
+ #return ("'1970-1-1 00:00:00'");
return "null";
}
/* ---------------------------------------------------------------------------
@@ -122,8 +123,8 @@
}
}
-# Parse will fail on nonexistant tables
- $p = @ora_parse($x->cur,$query);
+ # Parse will fail on nonexistant tables
+ $p = @ora_parse($x->cur,$query);
if ( false == $p ) {
if ($showerror == 1) {
Fatal_Error("Exec ". $this->conn ." !PARSE|". $this->error($x->cur),$query);
@@ -234,10 +235,11 @@
}
return "'". $t ."'";
}
- /* ---------------------------------------------------------------------------
+
+ /**
* give Database formatted datetimestring for d
*/
- function datetime(&$d) {
+ function datetime(TUTOS_Date_Time $d) {
if ( $d->notime == 1) {
return "null";
}
@@ -247,10 +249,11 @@
$x = sprintf("to_Date('%04d-%02d-%02d %02d:%02d:%02d','YYYY-MM-DD HH24:MI:SS')",$t->year,$t->month,$t->day,$t->hour,$t->min,$t->sec);
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
* give Database formatted datestring for d
*/
- function date(&$d) {
+ function date(TUTOS_Date_Time $d) {
if ( $d->notime == 1) {
return "null";
}
@@ -263,32 +266,47 @@
}
/**
- * case sensitive strict string compare
+ * string compare with many flds
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
- $fld = $fld1;
- if ( $fld2 != "" ) {
- $fld .= "|| ' ' ||". $fld2;
+ function like3($name,$not=false,$cs=false) {
+ $name = preg_replace('#\\\#','\\\\\\',$name);
+ $name = preg_replace("#'#","''",$name);
+
+ $x = func_num_args();
+ if ($x < 4) die('missing args for like3');
+
+ $cnt = 0;
+ $fld = '';
+ $pre = '';
+ $y = 4;
+ while ($y <= $x) {
+ $arg = func_get_arg($y-1);
+ $y++;
+ if (is_array($arg)) {
+ foreach ($arg as $a) {
+ $fld .= $pre.$a;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
+ } else {
+ if (empty($arg)) continue;
+ $fld .= $pre.$arg;
+ $pre = "|| ' ' ||";
+ $cnt++;
+ }
}
- if ( $fld3 != "" ) {
- $fld .= "|| ' ' ||". $fld3;
+ if ($cnt > 1) {
+ $name = preg_replace('# #','%',$name);
}
- $name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .")".($not ? " not":" ")."like '%". strtoupper($name) ."%' ");
+ if ($cs) {
+ return (' '. $fld .($not ? " !=":" =")." '". $name ."' ");
+ } else {
+ return (' lower('.$fld.')' .($not ? ' not':'')." like '%". mb_strtolower($name) ."%' ");
+ }
}
/**
- * case sensitive strict string compare
*/
- function like2($fld,$name,$not=false) {
- #$name = eregi_replace(" ","%",$name);
- $name = eregi_replace("'","''",$name);
- return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
- }
-
- /**
- */
function password($pw) {
if ( $this->db->crypt != 1 ) {
return "'". $pw ."'";
@@ -298,48 +316,6 @@
/**
*/
- function begin($t) {
- # $r = $this->Exec("BEGIN ". $t );
- # $r = $this->Exec("BEGIN");
- return "X";
- }
- /**
- */
- function commit($t) {
- # $r = $this->Exec("COMMIT ". $t);
- # $r = $this->Exec("COMMIT");
- # $r = $this->Exec("END ");
- return "Y";
- }
-
- /**
- */
- function abort($t) {
- return "";
- }
-
- /**
- */
- function lock($t) {
- return "";
- }
-
- /**
- */
- function timezone($tz) {
- global $tutos;
-
- if ( !empty($tz)) {
- putenv ("TZ=".$tz);
- strftime("%H:%M %Z");
- } else {
- putenv ("TZ=". $tutos[defaultTZ]);
- strftime("%H:%M %Z");
- }
- }
-
- /**
- */
function getFullname() {
return "ORACLE:". $this->db->name;
}
@@ -508,28 +484,28 @@
$now = new TUTOS_Date_Time();
$diff = $now->getTimestamp() - $this->db->lastanalyze->getTimeStamp();
-# only once a day
- if ( $diff < 86400 ) return;
+ # only once a day
+ if ( $diff < 86400 ) return;
-# read the table definitions of modules
- @include_once $tutos['base'] ."/php/db/table.pinc";
+ # read the table definitions of modules
+ @include_once $tutos['base'] ."/php/db/table.pinc";
foreach ($tutos[modules] as $r => $x) {
if (isset($tutos[modules][$r][file]) && file_exists(dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc") ) {
@include_once dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc";
}
}
-# foreach ($table as $i => $f) {
- # $q = "optimize ". $f[name];
- # $this->Exec($q,0);
- # }
-# see http://otn.oracle.com/docs/products/oracle9i/doc_library/release2/server.920/a96533/stats.htm#26713
- $cur = Ora_Do ($this->conn,"call DBMS_STATS.GATHER_SCHEMA_STATS('". $this->db->user ."')");
- Ora_Close($cur);
+ # foreach ($table as $i => $f) {
+ # $q = "optimize ". $f[name];
+ # $this->Exec($q,0);
+ # }
+ # see http://otn.oracle.com/docs/products/oracle9i/doc_library/release2/server.920/a96533/stats.htm#26713
+ $cur =...
[truncated message content] |
|
From: <gok...@us...> - 2014-01-29 07:31:54
|
Revision: 1223
http://sourceforge.net/p/tutos/code/1223
Author: gokohnert
Date: 2014-01-29 07:31:52 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/note/note_overview.php
trunk/php/note/note_select.php
trunk/php/product.pinc
trunk/php/product_overview.php
Modified: trunk/php/note/note_overview.php
===================================================================
--- trunk/php/note/note_overview.php 2014-01-29 07:30:14 UTC (rev 1222)
+++ trunk/php/note/note_overview.php 2014-01-29 07:31:52 UTC (rev 1223)
@@ -87,6 +87,10 @@
$r .= $this->orderHeader('',$lang['NoteCreator'],$this->link2);
$this->flds++;
}
+ if ($this->head['etype']) {
+ $r .= $this->orderHeader('et',$lang['NoteEventType'],$this->link2);
+ $this->flds++;
+ }
$r .= show_custom_overview_headers($this,'note',$this->link2);
$r .= $this->MassUpdateHeader();
$r .= $this->OverviewHeadLineEnd();
@@ -122,6 +126,9 @@
if ($this->head['creator']) {
$r .= $this->OverviewRowBlock(((!(is_numeric($b->creator) && $b->creator == -1)) ? $b->creator->getLink($b->creator->getShortname()):$lang['HistoryDeleted']),'over_l');
}
+ if ($this->head['etype']) {
+ $r .= $this->OverviewRowBlock($lang['NoteEventTypes'][$b->etype],'over_l');
+ }
$r .= show_custom_overview_data($this,'note',$b);
$r .= $this->MassUpdateField($b);
$r .= $this->OverviewRowEnd($line++);
@@ -227,6 +234,7 @@
$this->head['link_id'] = true;
$this->head['creator'] = true;
+ $this->head['etype'] = false;
$reftype = '';
$name = '';
@@ -400,6 +408,8 @@
overview_arg($this,'f',OVERVIEW_ARG_D_FROM,'note',array('creation'),'created','n.');
// End Date for search
overview_arg($this,'t',OVERVIEW_ARG_D_TO,'note',array('creation'),'created','n.');
+ // EventType
+ overview_arg($this,'et',OVERVIEW_ARG_INT,'note',array('etype'),array('NoteEventType','NoteEventTypes'),'n.','a');
//# check_dbacl($this->dbconn, $this->q, $this->user->id); WONT WORK
// sorting
@@ -438,4 +448,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/note/note_select.php
===================================================================
--- trunk/php/note/note_select.php 2014-01-29 07:30:14 UTC (rev 1222)
+++ trunk/php/note/note_select.php 2014-01-29 07:31:52 UTC (rev 1223)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
* submitted by "Nonn" <nonn at resce.com>
*
* This program is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['NoteRefType'],0,'reftype');
- $r .= $this->showdata($this->NoteAskRefType($this->nsrt,0),2);
+ $r .= $this->showdata($this->NoteAskRefType($this->nsrt,1),2);
$r .= $this->ContentRowEnd();
$r .= $this->ContentRowStart('ext');
@@ -70,6 +70,11 @@
$r .= $this->showdata($this->nsfd->EnterDate("f",1).' - '.$this->nstd->EnterDate("t",1),2);
$r .= $this->ContentRowEnd();
+ $r .= $this->ContentRowStart('ext');
+ $r .= $this->showfieldc($lang['NoteEventType'],0,'et');
+ $r .= $this->showdata(SelectLangArray('et','NoteEventTypes',-1,true,0,true),2);
+ $r .= $this->ContentRowEnd();
+
// add custom selectors
$x = get_custom_selectors('note');
foreach ($x as $s) {
@@ -162,6 +167,7 @@
$lang['NoteReferences'][7] = &$lang['Task'];
# $lang['NoteReferences'][8] = &$lang['Installation'];
# $lang['NoteReferences'][9] = &$lang['Checklist'];
+ # $lang['NoteReferences'][10] = &$lang['File'];
}
}
@@ -172,4 +178,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2014-01-29 07:30:14 UTC (rev 1222)
+++ trunk/php/product.pinc 2014-01-29 07:31:52 UTC (rev 1223)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -33,7 +33,7 @@
* Build a query by analyzing given POSTS/GETS
* shared use in sales forecast and product_overview
*/
-function prepare_product_overview(layout &$obj) {
+function prepare_product_overview(layout $obj) {
global $tutos,$lang,$table;
// save for later
Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php 2014-01-29 07:30:14 UTC (rev 1222)
+++ trunk/php/product_overview.php 2014-01-29 07:31:52 UTC (rev 1223)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -859,7 +859,7 @@
$this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
}
}
- // $msg = addLine($msg,$this->q);
+ $msg = addLine($msg,$this->q);
check_dbacl($this->dbconn, $this->q, $this->user->id);
// Order of output
@@ -992,4 +992,4 @@
$l = new Product_overview($current_user);
$l->display();
$dbconn->Close();
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-29 07:30:17
|
Revision: 1222
http://sourceforge.net/p/tutos/code/1222
Author: gokohnert
Date: 2014-01-29 07:30:14 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
mass insert
Modified Paths:
--------------
trunk/php/acl.pinc
Modified: trunk/php/acl.pinc
===================================================================
--- trunk/php/acl.pinc 2014-01-29 07:29:25 UTC (rev 1221)
+++ trunk/php/acl.pinc 2014-01-29 07:30:14 UTC (rev 1222)
@@ -313,15 +313,20 @@
$q = 'DELETE FROM '. $obj->dbconn->prefix.$table['acldefault'][name].' WHERE obj_id = '. $id;
$res = $obj->dbconn->Exec($q);
$res->free();
+ $q = 'INSERT INTO '. $obj->dbconn->prefix.$table['acldefault'][name].' (obj_id,adr_id,perm) VALUES ';
+ $pre = '';
if ( isset($obj->acldefault) && (count($obj->acldefault) > 0) ) {
foreach($obj->acldefault as $i => $f) {
if ( ($i == MYTEAMS) || ( ($i > -1) && (gettype($i) == 'integer') && ($f > 0) ) ) {
- $q = 'INSERT INTO '. $obj->dbconn->prefix.$table['acldefault'][name].' (obj_id,adr_id,perm) VALUES ('. $id .','. $i .','. $f .')';
- $res = $obj->dbconn->Exec($q);
- $res->free();
+ $q .= $pre. '('. $id .','. $i .','. $f .')';
+ $pre = ',';
}
}
}
+ if ($pre != '') {
+ $res = $obj->dbconn->Exec($q);
+ $res->free();
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-29 07:29:29
|
Revision: 1221
http://sourceforge.net/p/tutos/code/1221
Author: gokohnert
Date: 2014-01-29 07:29:25 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
fix release resultset
Modified Paths:
--------------
trunk/php/watchlist/watchlist.pinc
Modified: trunk/php/watchlist/watchlist.pinc
===================================================================
--- trunk/php/watchlist/watchlist.pinc 2014-01-29 07:28:39 UTC (rev 1220)
+++ trunk/php/watchlist/watchlist.pinc 2014-01-29 07:29:25 UTC (rev 1221)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -127,7 +127,8 @@
$q .= ' AND adr_id = '. $aid . ' AND '.$this->dbconn->like('comment',$comment);
else
$q .= ' AND '.$this->dbconn->like('comment',$comment);
- $this->dbconn->Exec($q);
+ $r = $this->dbconn->Exec($q);
+ $r->free();
return $msg;
}
@@ -141,7 +142,8 @@
$msg = "";
$this->remove($oid,$aid,$comment);
$q = "INSERT into ". $this->tablename .' (obj_id,adr_id,comment,creation) VALUES ('. $oid .','. $aid .','.$this->dbconn->string($comment).','. $this->dbconn->now() .")";
- $this->dbconn->Exec($q);
+ $r = $this->dbconn->Exec($q);
+ $r->free();
return $msg;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-29 07:28:44
|
Revision: 1220
http://sourceforge.net/p/tutos/code/1220
Author: gokohnert
Date: 2014-01-29 07:28:39 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
fix release resultset
Modified Paths:
--------------
trunk/php/team.pinc
trunk/php/user.pinc
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2014-01-24 09:16:04 UTC (rev 1219)
+++ trunk/php/team.pinc 2014-01-29 07:28:39 UTC (rev 1220)
@@ -568,12 +568,18 @@
$msg = '';
$q = 'DELETE FROM '. $this->dbconn->prefix.$table['acl'][name].' where obj_id < 0 AND adr_id = '. $this->id;
- $this->dbconn->Exec($q);
+ $r = $this->dbconn->Exec($q);
+ $r->free();
+ $q = 'INSERT INTO '. $this->dbconn->prefix.$table['acl'][name].' (obj_id,adr_id,perm) VALUES ';
+ $pre = '';
foreach ($this->p as $i => $f) {
- $q = 'INSERT INTO '. $this->dbconn->prefix.$table['acl'][name].' (obj_id,adr_id,perm) VALUES ('. $i .','. $this->id .','. $f .')';
- $this->dbconn->Exec($q);
+ $q .= $pre .'('. $i .','. $this->id .','. $f .')';
}
+ if ($pre != '') {
+ $r = $this->dbconn->Exec($q);
+ $r->free();
+ }
return $msg;
}
Modified: trunk/php/user.pinc
===================================================================
--- trunk/php/user.pinc 2014-01-24 09:16:04 UTC (rev 1219)
+++ trunk/php/user.pinc 2014-01-29 07:28:39 UTC (rev 1220)
@@ -378,9 +378,14 @@
$q = 'DELETE FROM '. $this->dbconn->prefix.$table['acl'][name].' where obj_id < 0 AND adr_id = '. $this->id;
$r = $this->dbconn->Exec($q);
$r->free();
+
+ $q = 'INSERT INTO '. $this->dbconn->prefix.$table['acl'][name].' (obj_id,adr_id,perm) VALUES';
+ $pre = '';
foreach ($this->p as $i => $f) {
- $q = 'INSERT INTO '. $this->dbconn->prefix.$table['acl'][name].' (obj_id,adr_id,perm) VALUES ('. $i .','. $this->id .','. $f .')';
- #error_log($q,3,$tutos[errlog]);
+ $q .= $pre.'('. $i .','. $this->id .','. $f .')';
+ $pre = ',';
+ }
+ if ($pre != '') {
$r = $this->dbconn->Exec($q);
$r->free();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-24 09:16:09
|
Revision: 1219
http://sourceforge.net/p/tutos/code/1219
Author: gokohnert
Date: 2014-01-24 09:16:04 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
fixed sorting of subtables
Modified Paths:
--------------
trunk/php/address_tools.p3
trunk/php/company_show.php
trunk/php/department_show.php
trunk/php/layout/layout_base.pinc
Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3 2014-01-16 08:31:22 UTC (rev 1218)
+++ trunk/php/address_tools.p3 2014-01-24 09:16:04 UTC (rev 1219)
@@ -166,7 +166,7 @@
* starting with layout->start
*
*/
-Function address_overview (layout $layout,$res,$target = "") {
+Function address_overview (layout $layout,$res,$target = "",$key = 'ss') {
global $lang, $tutos, $current_user,$msg,$info;
$r = '';
@@ -178,7 +178,7 @@
$x = 0;
// TODO COPY is too expensive
- $nav = $layout->getSubSession();
+ $nav = $layout->getSubSession($key);
$nav['link'] = $layout->link1;
if ( !isset($nav['list'])) {
$np = array();
@@ -207,7 +207,7 @@
return $r;
}
- $ss = $layout->putSubSession($nav);
+ $ssA = $layout->putSubSession($nav);
if ( $layout->maxshow == 0 ) {
$layout->maxshow = $n;
@@ -345,7 +345,7 @@
}
if ( $layout->head['f_name'] ) {
$b = $layout->mark_filter(myentities($address->f_name),'name');
- $r .= ' <td rowspan="'. $c .'" class="over_l">'. makelink($address->getUrl('ss='.$ss),$b) ."</td>\n";
+ $r .= ' <td rowspan="'. $c .'" class="over_l">'. makelink($address->getUrl($key.'='.$ssA),$b) ."</td>\n";
}
if ( $layout->head['m_name'] ) {
$b = $layout->mark_filter(myentities($address->m_name),'name');
@@ -353,7 +353,7 @@
}
if ( $layout->head['l_name'] ) {
$b = $layout->mark_filter(myentities($address->l_name),'name');
- $r .= ' <td rowspan="'. $c .'" class="over_l">'. makelink($address->getUrl('ss='.$ss),$b) ."</td>\n";
+ $r .= ' <td rowspan="'. $c .'" class="over_l">'. makelink($address->getUrl($key.'='.$ssA),$b) ."</td>\n";
}
if ( $layout->head['birthday'] ) {
$r .= ' <td rowspan="'. $c .'" class="over_l">'. $address->birthday->getLinkDate() ."</td>\n";
@@ -513,7 +513,7 @@
$a++;
}
- $r .= $layout->list_navigation(addUrlParameter($layout->link1,'ss='.$ss),$layout->flds,$layout->start,$a,$n,'astart');
+ $r .= $layout->list_navigation(addUrlParameter($layout->link1,$key.'='.$ssA),$layout->flds,$layout->start,$a,$n,'astart');
if ( ($tutos[massupdate] == 1) && !empty($target) ) {
$r .= $layout->UpdateRowStart($layout->flds -2);
Modified: trunk/php/company_show.php
===================================================================
--- trunk/php/company_show.php 2014-01-16 08:31:22 UTC (rev 1218)
+++ trunk/php/company_show.php 2014-01-24 09:16:04 UTC (rev 1219)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -103,7 +103,7 @@
$r .= "<tr>\n";
$r .= " <td colspan=\"". $cols ."\">\n";
- $r .= address_overview($this,$ra,"company_show.php");
+ $r .= address_overview($this,$ra,'company_show.php','ssA');
$r .= " </td>\n";
$r .= "</tr>\n";
@@ -171,7 +171,7 @@
*
*/
Function prepare() {
- global $msg,$lang;
+ global $msg,$lang,$table;
$this->name = $lang['CompanyDetail'];
$this->obj = new company($this->dbconn);
@@ -213,10 +213,18 @@
$this->link1 = addUrlParameter($this->link1,'id='. $this->obj->id);
$this->link2 = addUrlParameter($this->link2,'id='. $this->obj->id);
+ if (isset($_REQUEST['ss'])) {
+ $this->link2 = addUrlParameter($this->link2,'ss='. $_REQUEST['ss']);
+ }
+ $this->q = 'SELECT distinct(a.id) , a.* FROM ';
+ $this->q .= $this->dbconn->prefix .$table['address'][name].' a, ' ;
+ $this->q .= $this->dbconn->prefix.$table['location'][name].' l, ';
+ $this->q .= $this->dbconn->prefix.$table['address1'][name].' r ';
+ $this->q .= 'WHERE l.c_id = '. $this->obj->id .' AND a.id = r.adr_id AND r.loc_id = l.id AND ( l.d_id is null OR l.d_id = -1 ) ';
- $this->q = "SELECT distinct(a.id) , a.* FROM ". $this->dbconn->prefix ."addresses a, ". $this->dbconn->prefix ."location l, ". $this->dbconn->prefix ."adrloc r WHERE l.c_id = ". $this->obj->id ." AND a.id = r.adr_id AND r.loc_id = l.id AND ( l.d_id is null OR l.d_id = -1 ) ";
-
if ( isset($_GET['xf']) && isset($_GET['xo']) ) {
+ $this->order_fld = $_REQUEST['xf'];
+ $this->order_dir = ($_REQUEST['xo'] == 1 ? 1:2);
$this->q .= " ORDER by " . $_GET['xf'];
if ( $_GET['xo'] == 1 ) {
$this->q .= " ASC ";
Modified: trunk/php/department_show.php
===================================================================
--- trunk/php/department_show.php 2014-01-16 08:31:22 UTC (rev 1218)
+++ trunk/php/department_show.php 2014-01-24 09:16:04 UTC (rev 1219)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -85,7 +85,7 @@
$r .= "<tr>\n";
$r .= " <td colspan=\"". $cols ."\">\n";
- $r .= address_overview($this,$ra,'department_show.php');
+ $r .= address_overview($this,$ra,'department_show.php','ssA');
$r .= " </td>\n";
$r .= "</tr>\n";
}
@@ -106,7 +106,7 @@
* action via massupdate
*/
Function action() {
- global $lang,$msg;
+ global $lang,$msg,$info;
$this->obj = new department($this->dbconn);
if (isset($_GET['id'])) {
@@ -126,7 +126,7 @@
$b->read_locs_data();
foreach($b->locall as $i => $f) {
if ($f->department->id == $this->obj->id) {
- $msg = addLine($msg,$lang['Delete'].':'.$b->getLink().'@'.$f->department->getFullName() .' + '. $f->company->getFullName());
+ $info = addLine($info,$lang['Delete'].':'.$b->getLink().'@'.$f->department->getFullName() .' + '. $f->company->getFullName());
$this->dbconn->Begin("WORK");
$f->setCompany(null);
$f->setDepartment(null);
@@ -144,11 +144,12 @@
$this->redirect = acl_action();
}
}
+
/**
* prepare
*/
Function prepare() {
- global $msg,$tutos,$lang;
+ global $msg,$tutos,$lang,$table;
$this->name = $lang['DepartmentDetail'];
$this->obj = new department($this->dbconn);
@@ -189,9 +190,18 @@
$this->link1 = addUrlParameter($this->link1,'id='. $this->obj->id);
$this->link2 = addUrlParameter($this->link2,'id='. $this->obj->id);
- $this->q = 'SELECT distinct(a.id),a.* FROM '. $this->dbconn->prefix .'addresses a, '. $this->dbconn->prefix .'location l, '. $this->dbconn->prefix .'adrloc r WHERE l.d_id = '. $this->obj->id .' AND a.id = r.adr_id AND r.loc_id = l.id ';
+ if (isset($_REQUEST['ss'])) {
+ $this->link2 = addUrlParameter($this->link2,'ss='. $_REQUEST['ss']);
+ }
+ $this->q = 'SELECT distinct(a.id),a.* FROM '. $this->dbconn->prefix .$table['address'][name].' a, ';
+ $this->q .= $this->dbconn->prefix .$table['location'][name].' l, ';
+ $this->q .= $this->dbconn->prefix .$table['address1'][name].' r ';
+ $this->q .= 'WHERE l.d_id = '. $this->obj->id .' AND a.id = r.adr_id AND r.loc_id = l.id ';
+
if ( isset($_GET['xf']) && isset($_GET['xo']) ) {
+ $this->order_fld = $_REQUEST['xf'];
+ $this->order_dir = ($_REQUEST['xo'] == 1 ? 1:2);
$this->q .= " ORDER by " . $_GET['xf'];
if ( $_GET['xo'] == 1 ) {
$this->q .= ' ASC ';
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2014-01-16 08:31:22 UTC (rev 1218)
+++ trunk/php/layout/layout_base.pinc 2014-01-24 09:16:04 UTC (rev 1219)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2013 by Gero Kohnert
+ * Copyright 2002 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -146,7 +146,12 @@
$this->nav = null;
if ( isset($_REQUEST['ss']) ) {
$this->subsession = $_REQUEST['ss'];
- $this->nav = $this->getSubSession();
+ $this->nav = $this->getSubSession('ss');
+ $this->navkey = 'ss';
+ } else if ( isset($_REQUEST['ssA']) ) {
+ # $this->subsession = $_REQUEST['ssA'];
+ # $this->nav = $this->getSubSession('ssA');
+ # $this->navkey = 'ssA';
}
// load the theme if possible
if ( isset($_REQUEST['th']) ) {
@@ -1166,14 +1171,14 @@
if ($next != '')
$n = getObject($this->obj->dbconn,$next);
if (is_object($p))
- $r .= '   '.$p->getLink($this->theme->getImage(left,'list').$lang['NavBack'],'ss='.$this->subsession);
+ $r .= '   '.$p->getLink($this->theme->getImage(left,'list').$lang['NavBack'],$this->navkey.'='.$this->subsession);
$r.= '   ('.$c.'/'.count($this->nav['list']).')';
if (is_object($n))
- $r .= '   '.$n->getLink($lang['NavNext'].$this->theme->getImage(right,'list'),'ss='.$this->subsession);
+ $r .= '   '.$n->getLink($lang['NavNext'].$this->theme->getImage(right,'list'),$this->navkey.'='.$this->subsession);
}
if ($this->nav['link'] != '') {
- $arg = 'ss='.$this->subsession;
+ $arg = $this->navkey.'='.$this->subsession;
if ($c > 0) {
$c = floor(($c-1)/$tutos['maxshow'])*$tutos['maxshow'];
$arg .= '&start='.$c;
@@ -1186,12 +1191,12 @@
/**
* drop/invalidate the current subsession
*/
- function dropSubSession() {
+ function dropSubSession($key = 'ss') {
if (!isset($_SESSION['nav'])) {
return;
}
- if (isset($_REQUEST['ss'])) {
- $found = $_REQUEST['ss'];
+ if (isset($_REQUEST[$key])) {
+ $found = $_REQUEST[$key];
if (!isset($_SESSION['nav'][$found]) || !is_array($_SESSION['nav'][$found])) {
return;
}
@@ -1204,23 +1209,23 @@
* create a subsession
*/
function createSubSession($id) {
- $_SESSION['nav'][$id] = array();
- $_SESSION['nav'][$id]['link'] = '';
+ $_SESSION['nav'][$id] = array();
+ $_SESSION['nav'][$id]['link'] = '';
$_SESSION['nav'][$id]['title'] = '';
- $_SESSION['nav'][$id]['id'] = $id;
- $_SESSION['nav'][$id]['use'] = time()-1;
+ $_SESSION['nav'][$id]['id'] = $id;
+ $_SESSION['nav'][$id]['use'] = time()-1;
}
/**
* get a valid subsession id
* needed to navigate in the result of an overview (offers back prev next links in detail pages)
*/
- function getSubSession() {
+ function getSubSession($key = 'ss') {
if (!isset($_SESSION['nav'])) {
$_SESSION['nav'] = array();
}
- if (isset($_REQUEST['ss'])) {
- $found = $_REQUEST['ss'];
+ if (isset($_REQUEST[$key])) {
+ $found = $_REQUEST[$key];
if (!isset($_SESSION['nav'][$found]) || !is_array($_SESSION['nav'][$found])) {
$this->createSubSession($found);
}
@@ -1228,7 +1233,7 @@
return $_SESSION['nav'][$found];
}
// create all missing
- for ($i = 0; $i < 10; $i++) {
+ for ($i = 0; $i < 15; $i++) {
if (!isset($_SESSION['nav'][$i])) {
$this->createSubSession($i);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-16 08:31:25
|
Revision: 1218
http://sourceforge.net/p/tutos/code/1218
Author: gokohnert
Date: 2014-01-16 08:31:22 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
bug export CSV/EXCEL fixing long text
Modified Paths:
--------------
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2014-01-16 08:27:31 UTC (rev 1217)
+++ trunk/php/bugtracking/bug_overview.php 2014-01-16 08:31:22 UTC (rev 1218)
@@ -60,7 +60,8 @@
Function info_csv() {
global $lang;
- Header("Content-Type: text/plain");
+ export_headers('TUTOS_BugExport','csv');
+ # Header("Content-Type: text/plain");
$r = '';
$r .= txt2csv('ID');
$r .= txt2csv($lang['BugID']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-16 08:27:34
|
Revision: 1217
http://sourceforge.net/p/tutos/code/1217
Author: gokohnert
Date: 2014-01-16 08:27:31 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
bug export CSV/EXCEL fixing long text
Modified Paths:
--------------
trunk/php/bugtracking/bug.pinc
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2014-01-15 12:00:17 UTC (rev 1216)
+++ trunk/php/bugtracking/bug.pinc 2014-01-16 08:27:31 UTC (rev 1217)
@@ -624,12 +624,20 @@
$r .= $i->creation->getDateTime();
$r .= ' '. (is_object($i->creator) ? $i->creator->getFullName():'');
if ($this->parent->tutos['bug_use_revision'] == 1)
- $r .= '  - '. $i->revision .' -';
- $r .= "\n";
+ $r .= ' - '. $i->revision .' -';
+ $r .= "\r\n";
if ($desc != $olddesc) {
- $r .= $desc ."\n";
+ $d = $desc;
+ $d = preg_replace('#&#im','&',$d);
+ $d = preg_replace('#"#im','"',$d);
+ $d = preg_replace('#<[biu]>#im','',$d);
+ $d = preg_replace('#</[biu]>#im','',$d);
+ $d = preg_replace('/→/im',' -> ',$d);
+ $d = preg_replace('#<SPAN\s([a-z,0-9=_"]*)>#im','',$d);
+ $d = preg_replace('#</SPAN>#im','',$d);
+ $r .= $d ."\r\n";
}
- $sep = "--------------------\n";
+ $sep = "--------------------\r\n";
}
$olddesc = $desc;
}
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2014-01-15 12:00:17 UTC (rev 1216)
+++ trunk/php/bugtracking/bug_overview.php 2014-01-16 08:27:31 UTC (rev 1217)
@@ -55,6 +55,100 @@
}
/**
+ * display the info as csv output
+ */
+ Function info_csv() {
+ global $lang;
+
+ Header("Content-Type: text/plain");
+ $r = '';
+ $r .= txt2csv('ID');
+ $r .= txt2csv($lang['BugID']);
+ $r .= txt2csv($lang['BugState']);
+ $r .= txt2csv($lang['BugTarget']);
+ $r .= txt2csv($lang['BugClass']);
+ $r .= txt2csv($lang['Date']);
+ $r .= txt2csv($lang['BugReference']);
+ $r .= txt2csv($lang['BugShort']);
+ $r .= txt2csv($lang['BugLong']);
+ $r .= txt2csv($lang['BugReportedFrom']);
+ $r .= txt2csv($lang['BugAssignedTo']);
+ $r .= txt2csv($lang['BugCreator']);
+ $r .= txt2csv('closed at');
+ // custom fields
+ foreach(get_custom_export_fields('bugtracking') as $ti => $tx) {
+ $r .= txt2csv($tx['lang']);
+ }
+ $r .= "\r\n";
+ foreach ($this->blist as $b) {
+ if (!is_object($b)) {
+ $id = $b;
+ $b = new bug($this->dbconn);
+ $b = $b->read($id,$b);
+ }
+ $b->read_bugHistory();
+ $r .= txt2csv($b->id);
+ $r .= txt2csv($b->name);
+ // State
+ $r .= txt2csv($b->getState());
+ // Target
+ if ( is_object($b->target) && $b->target->id > 0 ) {
+ $r .= txt2csv($b->target->getFullName());
+ } else {
+ $r.= txt2csv('');
+ }
+ // Class
+ $r .= txt2csv($lang['BugClasses'][$b->class]);
+ // Date
+ $r .= txt2csv($b->creation->getDateTime());
+ // Reference
+ if ( is_object($b->parent) && $b->parent->id > 0 ) {
+ $r .= txt2csv($b->parent->getFullName());
+ } else {
+ $r .= txt2csv($lang['HistoryDeleted']);
+ }
+ // Short
+ $r .= txt2csv($b->short);
+ // Long
+ if (count($b->bughist) > 0) {
+ $r.= txt2csv($b->getBugHistory(false,false));
+ } else {
+ $r.= txt2csv('');
+ }
+ // reporter
+ if ( is_object($b->reporter) && $b->reporter->id > 0 ) {
+ $r .= txt2csv($b->reporter->getFullName());
+ } else {
+ $r .= txt2csv($lang['HistoryDeleted']);
+ }
+ // solver
+ if ( is_object($b->solver) && $b->solver->id > 0 ) {
+ $r .= txt2csv($b->solver->getFullName());
+ } else {
+ $r .= txt2csv($lang['HistoryDeleted']);
+ }
+ // creator
+ if ( is_object($b->creator) && $b->creator->id > 0 ) {
+ $r .= txt2csv($b->creator->getFullName());
+ } else {
+ $r .= txt2csv($lang['HistoryDeleted']);
+ }
+ // SolveDate
+ $r .= txt2csv($b->solvedate->getDateTime());
+
+ // custom fields
+ foreach(get_custom_export_fields('bugtracking') as $ti => $tx) {
+ $f = '_fld_'.$ti;
+ $d = get_custom_field($tx,$b->$f,$b);
+ $r .= txt2csv($d);
+ }
+
+ $r .= "\r\n";
+ }
+ return $r;
+ }
+
+ /**
* display the info as excel output
*/
Function info_excel() {
@@ -142,6 +236,7 @@
$b = new bug($this->dbconn);
$b = $b->read($id,$b);
}
+ $b->read_bugHistory();
$c = 0;
if (strpos($baseUrl, "bugtracking") === false) {
@@ -171,7 +266,7 @@
}
$worksheet1->write_string($x,$c++, myiconv($b->short),$format2);
if (count($b->bughist) > 0) {
- $worksheet1->write_string($x,$c++,myiconv($b->bughist[0]->description),$format2);
+ $worksheet1->write_string($x,$c++,myiconv($b->getBugHistory(false,false)),$format2);
} else {
$c++;
}
@@ -239,6 +334,8 @@
return $r;
} else if ($this->format == "excel") {
return $this->info_excel();
+ } else if ($this->format == "csv") {
+ return $this->info_csv();
} else if ( $this->format == "stat") {
return $this->statinfo();
}
@@ -1292,6 +1389,15 @@
);
$this->addMenu($x);
}
+ $ll = addUrlParameter($this->link1,'format=csv');
+ $ll = addUrlParameter($ll,'ss='.$this->ss);
+ $x = array( url => $ll,
+ text => $lang['Export'] ."(CSV)",
+ info => $lang['ExportInfo'],
+ category => array('excel',bug::getType(),'view',usebugtracking)
+ );
+ $this->addMenu($x);
+
$ll = addUrlParameter($this->link1,'format=excel');
$ll = addUrlParameter($ll,'ss='.$this->ss);
$x = array( url => $ll,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-15 12:00:22
|
Revision: 1216
http://sourceforge.net/p/tutos/code/1216
Author: gokohnert
Date: 2014-01-15 12:00:17 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/custom.pinc
Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc 2014-01-13 10:05:27 UTC (rev 1215)
+++ trunk/php/custom.pinc 2014-01-15 12:00:17 UTC (rev 1216)
@@ -1261,7 +1261,7 @@
$q .= ' '.$pre.' '. $ti .' in '.$l;
$pre = $pre2sql;
$layout->filter['_fld_'.$ti] = $name;
- } else if ($tx[type] == 'VARCHAR') {
+ } else if (isset($tx[type]) && ($tx[type] == 'VARCHAR')) {
foreach ($s as $sn) {
if (substr($sn,0,1) == "!") {
$q .= ' '.$pre.' '. $layout->dbconn->unLike($ti,substr($sn,1));
@@ -1969,4 +1969,4 @@
return $r;
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-13 10:05:30
|
Revision: 1215
http://sourceforge.net/p/tutos/code/1215
Author: gokohnert
Date: 2014-01-13 10:05:27 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
fixed sorting
Modified Paths:
--------------
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2014-01-06 20:59:19 UTC (rev 1214)
+++ trunk/php/bugtracking/bug_overview.php 2014-01-13 10:05:27 UTC (rev 1215)
@@ -946,8 +946,6 @@
}
$this->link1 = 'bugtracking/bug_overview.php';
- $this->link2 = $this->link1;
- $this->link2 = addUrlParameter($this->link1,"format=".UrlEncode($this->format));
if (isset($_GET['ext'])) {
$this->ext = $_GET['ext'];
@@ -1175,6 +1173,9 @@
return;
}
+ $this->link2 = $this->link1;
+ $this->link2 = addUrlParameter($this->link2,"format=".UrlEncode($this->format));
+
$this->nav = $this->getSubSession();
$this->nav['link'] = $this->link1;
if ( !isset($this->nav['list']) ) {
@@ -1309,4 +1310,4 @@
$l = new Bug_overview($current_user);
$l->display();
$dbconn->Close();
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-06 20:59:22
|
Revision: 1214
http://sourceforge.net/p/tutos/code/1214
Author: gokohnert
Date: 2014-01-06 20:59:19 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/admin_show.php
trunk/php/checklist/checkfield_overview.php
trunk/php/checklist/checklist.pinc
Modified: trunk/php/admin_show.php
===================================================================
--- trunk/php/admin_show.php 2014-01-06 18:32:01 UTC (rev 1213)
+++ trunk/php/admin_show.php 2014-01-06 20:59:19 UTC (rev 1214)
@@ -476,7 +476,7 @@
$r .= $x;
}
}
- } else {
+ } else if (filesize ($tutos[errlog])) {
$r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog])));
}
fclose($fd);
@@ -494,7 +494,9 @@
$fd = fopen($tutos[errlog].'.sql', 'rb');
if ($fd === false) return $r;
$r .= '<pre>';
- $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.sql')));
+ if (filesize ($tutos[errlog].'.sql')) {
+ $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.sql')));
+ }
$r .= '</pre>';
fclose($fd);
return $r;
@@ -510,7 +512,9 @@
$fd = fopen($tutos[errlog].'.mail', 'rb');
if ($fd === false) return $r;
$r .= '<pre>';
- $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.mail')));
+ if (filesize ($tutos[errlog].'.mail')) {
+ $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.mail')));
+ }
$r .= '</pre>';
fclose($fd);
return $r;
@@ -525,9 +529,11 @@
}
$fd = fopen($tutos[errlog].'.log', 'rb');
if ($fd === false) return $r;
+ if (0 == filesize ($tutos[errlog].'.log')) {
+ fclose($fd);
+ return $r;
+ }
-
-
$r .= '<pre>';
$url = getBaseUrl();
$xx = preg_split('#/#', $url);
Modified: trunk/php/checklist/checkfield_overview.php
===================================================================
--- trunk/php/checklist/checkfield_overview.php 2014-01-06 18:32:01 UTC (rev 1213)
+++ trunk/php/checklist/checkfield_overview.php 2014-01-06 20:59:19 UTC (rev 1214)
@@ -11,6 +11,8 @@
* $Author$
*
*/
+$tutos['files'][__FILE__] = '$Rev$';
+
$tutos['base'] = "../..";
ini_set("include_path","..");
require_once 'webelements.p3';
@@ -380,7 +382,7 @@
}
$this->link1 = "checklist/checkfield_overview.php";
$this->q = "SELECT * FROM ". $this->dbconn->prefix .$table['checkfield'][name];
- $pre = " AND ";
+ $pre = " WHERE ";
if ( isset($_REQUEST['name']) && ($_REQUEST['name'] != "*") && ($_REQUEST['REQUEST'] != "") ) {
$this->q .= $pre . $this->dbconn->Like("name",$_REQUEST['name']);
@@ -422,4 +424,4 @@
$l = new checkfield_overview($current_user);
$l->display();
$dbconn->Close();
-?>
+?>
\ No newline at end of file
Modified: trunk/php/checklist/checklist.pinc
===================================================================
--- trunk/php/checklist/checklist.pinc 2014-01-06 18:32:01 UTC (rev 1213)
+++ trunk/php/checklist/checklist.pinc 2014-01-06 20:59:19 UTC (rev 1214)
@@ -391,7 +391,7 @@
}
/**
- * create a link to a overview page
+ * create a link to a select page
*/
static function getSelectLink (tutos_user $user,$text = "") {
global $lang,$tutos;
@@ -407,7 +407,7 @@
}
/**
- * create a link to a select page
+ * create a link to a overview page
*/
static function getOverviewLink (tutos_user $user, $text = "") {
global $lang;
@@ -418,6 +418,25 @@
}
/**
+ * create a link to a filtered overview page
+ */
+ function getOverviewLinkObj (tutos_user $user,tutos_base $obj, $text = "") {
+ global $lang;
+ if (! is_object($obj) ) return '';
+ if ( $obj->id == -1 ) return '';
+ if (! $user->feature_ok(usechecklists,PERM_SEE) ) return '';
+ if (! $obj->obj_feature_ok($user,usechecklists,PERM_SEE) ) return '';
+ if (! $obj->see_ok() ) return '';
+
+ return array( url => 'checklist/checklist_overview.php?link_id='.$obj->id,
+ confirm => false,
+ text => ($text == '' ? $lang['Checklists']:$text),
+ info => $lang['Checklist'],
+ category => array('overview','module',usechecklists)
+ );
+ }
+
+ /**
* create a link where a checklist to for the given object could be added
*/
static function getaddlink (tutos_user $user,tutos_base $obj,$text = "") {
@@ -751,9 +770,9 @@
if ( count($obj->list[usechecklists]) > 0 ) {
$r .= $user->layout->ContentRowStart();
if ( count($obj->list[usechecklists]) > 1 ) {
- $r .= $user->layout->showfield($lang['Checklists']);
+ $r .= $user->layout->show_info_field($lang['Checklists'],$obj,get_class());
} else {
- $r .= $user->layout->showfield($lang['Checklist']);
+ $r .= $user->layout->show_info_field($lang['Checklist'],$obj,get_class());
}
if ( $format == "paper" ) {
$d = showChecklists($user,$obj,-1);
@@ -804,4 +823,4 @@
return count($obj->checkfields);
}
}
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-06 18:32:04
|
Revision: 1213
http://sourceforge.net/p/tutos/code/1213
Author: gokohnert
Date: 2014-01-06 18:32:01 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/Makefile
trunk/html/js/jquery.mobile.min.js
trunk/php/product_contacts.php
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2014-01-04 19:45:48 UTC (rev 1212)
+++ trunk/Makefile 2014-01-06 18:32:01 UTC (rev 1213)
@@ -2,7 +2,7 @@
# the ultimate team organization software
# ---------------------------------------
#
-# Copyright 1999-2013 by Gero Kohnert
+# Copyright 1999-2014 by Gero Kohnert
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -541,6 +541,11 @@
html/css/images/ajax-loader.gif \
html/css/images/ajax-loader.png \
html/css/images/icons-18-white.png \
+ html/css/images/icons-36-white.png \
+ html/css/images/icons-18-black.png \
+ html/css/images/icons-36-black.png \
+ $(wildcard html/css/images/icons-svg/*.svg) \
+ $(wildcard html/css/images/icons-png/*.png) \
html/default.css \
html/default_mail.css \
html/new_layout.css \
Modified: trunk/html/js/jquery.mobile.min.js
===================================================================
(Binary files differ)
Modified: trunk/php/product_contacts.php
===================================================================
--- trunk/php/product_contacts.php 2014-01-04 19:45:48 UTC (rev 1212)
+++ trunk/php/product_contacts.php 2014-01-06 18:32:01 UTC (rev 1213)
@@ -61,7 +61,7 @@
<thead>
<tr>
<th style="background-color:#BBB" align="center"><b>'.$lang['AdrName'].'</b></th>
- <th style="background-color:#BBB" align="center"><b>'.$lang['AdrRoles'].'</b></th>
+ <th style="background-color:#BBB" align="center"><b>'.$lang['ProdRoles'].'</b></th>
<th style="background-color:#BBB" align="center"><b>'.$lang['Phone'].'</b></th>
<th style="background-color:#BBB" align="center"><b>'.$lang['AdrEmail'].'</b></th>
<th style="background-color:#BBB" align="center"><b>'.$lang['AdrFax'].'</b></th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-04 19:45:53
|
Revision: 1212
http://sourceforge.net/p/tutos/code/1212
Author: gokohnert
Date: 2014-01-04 19:45:48 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
updated jmobile
Modified Paths:
--------------
trunk/html/css/jquery.mobile.min.css
Added Paths:
-----------
trunk/html/css/images/icons-18-black.png
trunk/html/css/images/icons-36-black.png
trunk/html/css/images/icons-36-white.png
trunk/html/css/images/icons-png/
trunk/html/css/images/icons-png/action-black.png
trunk/html/css/images/icons-png/action-white.png
trunk/html/css/images/icons-png/alert-black.png
trunk/html/css/images/icons-png/alert-white.png
trunk/html/css/images/icons-png/arrow-d-black.png
trunk/html/css/images/icons-png/arrow-d-l-black.png
trunk/html/css/images/icons-png/arrow-d-l-white.png
trunk/html/css/images/icons-png/arrow-d-r-black.png
trunk/html/css/images/icons-png/arrow-d-r-white.png
trunk/html/css/images/icons-png/arrow-d-white.png
trunk/html/css/images/icons-png/arrow-l-black.png
trunk/html/css/images/icons-png/arrow-l-white.png
trunk/html/css/images/icons-png/arrow-r-black.png
trunk/html/css/images/icons-png/arrow-r-white.png
trunk/html/css/images/icons-png/arrow-u-black.png
trunk/html/css/images/icons-png/arrow-u-l-black.png
trunk/html/css/images/icons-png/arrow-u-l-white.png
trunk/html/css/images/icons-png/arrow-u-r-black.png
trunk/html/css/images/icons-png/arrow-u-r-white.png
trunk/html/css/images/icons-png/arrow-u-white.png
trunk/html/css/images/icons-png/audio-black.png
trunk/html/css/images/icons-png/audio-white.png
trunk/html/css/images/icons-png/back-black.png
trunk/html/css/images/icons-png/back-white.png
trunk/html/css/images/icons-png/bars-black.png
trunk/html/css/images/icons-png/bars-white.png
trunk/html/css/images/icons-png/bullets-black.png
trunk/html/css/images/icons-png/bullets-white.png
trunk/html/css/images/icons-png/calendar-black.png
trunk/html/css/images/icons-png/calendar-white.png
trunk/html/css/images/icons-png/camera-black.png
trunk/html/css/images/icons-png/camera-white.png
trunk/html/css/images/icons-png/carat-d-black.png
trunk/html/css/images/icons-png/carat-d-white.png
trunk/html/css/images/icons-png/carat-l-black.png
trunk/html/css/images/icons-png/carat-l-white.png
trunk/html/css/images/icons-png/carat-r-black.png
trunk/html/css/images/icons-png/carat-r-white.png
trunk/html/css/images/icons-png/carat-u-black.png
trunk/html/css/images/icons-png/carat-u-white.png
trunk/html/css/images/icons-png/check-black.png
trunk/html/css/images/icons-png/check-white.png
trunk/html/css/images/icons-png/clock-black.png
trunk/html/css/images/icons-png/clock-white.png
trunk/html/css/images/icons-png/cloud-black.png
trunk/html/css/images/icons-png/cloud-white.png
trunk/html/css/images/icons-png/comment-black.png
trunk/html/css/images/icons-png/comment-white.png
trunk/html/css/images/icons-png/delete-black.png
trunk/html/css/images/icons-png/delete-white.png
trunk/html/css/images/icons-png/edit-black.png
trunk/html/css/images/icons-png/edit-white.png
trunk/html/css/images/icons-png/eye-black.png
trunk/html/css/images/icons-png/eye-white.png
trunk/html/css/images/icons-png/forbidden-black.png
trunk/html/css/images/icons-png/forbidden-white.png
trunk/html/css/images/icons-png/forward-black.png
trunk/html/css/images/icons-png/forward-white.png
trunk/html/css/images/icons-png/gear-black.png
trunk/html/css/images/icons-png/gear-white.png
trunk/html/css/images/icons-png/grid-black.png
trunk/html/css/images/icons-png/grid-white.png
trunk/html/css/images/icons-png/heart-black.png
trunk/html/css/images/icons-png/heart-white.png
trunk/html/css/images/icons-png/home-black.png
trunk/html/css/images/icons-png/home-white.png
trunk/html/css/images/icons-png/info-black.png
trunk/html/css/images/icons-png/info-white.png
trunk/html/css/images/icons-png/location-black.png
trunk/html/css/images/icons-png/location-white.png
trunk/html/css/images/icons-png/lock-black.png
trunk/html/css/images/icons-png/lock-white.png
trunk/html/css/images/icons-png/mail-black.png
trunk/html/css/images/icons-png/mail-white.png
trunk/html/css/images/icons-png/minus-black.png
trunk/html/css/images/icons-png/minus-white.png
trunk/html/css/images/icons-png/navigation-black.png
trunk/html/css/images/icons-png/navigation-white.png
trunk/html/css/images/icons-png/phone-black.png
trunk/html/css/images/icons-png/phone-white.png
trunk/html/css/images/icons-png/plus-black.png
trunk/html/css/images/icons-png/plus-white.png
trunk/html/css/images/icons-png/power-black.png
trunk/html/css/images/icons-png/power-white.png
trunk/html/css/images/icons-png/recycle-black.png
trunk/html/css/images/icons-png/recycle-white.png
trunk/html/css/images/icons-png/refresh-black.png
trunk/html/css/images/icons-png/refresh-white.png
trunk/html/css/images/icons-png/search-black.png
trunk/html/css/images/icons-png/search-white.png
trunk/html/css/images/icons-png/shop-black.png
trunk/html/css/images/icons-png/shop-white.png
trunk/html/css/images/icons-png/star-black.png
trunk/html/css/images/icons-png/star-white.png
trunk/html/css/images/icons-png/tag-black.png
trunk/html/css/images/icons-png/tag-white.png
trunk/html/css/images/icons-png/user-black.png
trunk/html/css/images/icons-png/user-white.png
trunk/html/css/images/icons-png/video-black.png
trunk/html/css/images/icons-png/video-white.png
trunk/html/css/images/icons-svg/
trunk/html/css/images/icons-svg/action-black.svg
trunk/html/css/images/icons-svg/action-white.svg
trunk/html/css/images/icons-svg/alert-black.svg
trunk/html/css/images/icons-svg/alert-white.svg
trunk/html/css/images/icons-svg/arrow-d-black.svg
trunk/html/css/images/icons-svg/arrow-d-l-black.svg
trunk/html/css/images/icons-svg/arrow-d-l-white.svg
trunk/html/css/images/icons-svg/arrow-d-r-black.svg
trunk/html/css/images/icons-svg/arrow-d-r-white.svg
trunk/html/css/images/icons-svg/arrow-d-white.svg
trunk/html/css/images/icons-svg/arrow-l-black.svg
trunk/html/css/images/icons-svg/arrow-l-white.svg
trunk/html/css/images/icons-svg/arrow-r-black.svg
trunk/html/css/images/icons-svg/arrow-r-white.svg
trunk/html/css/images/icons-svg/arrow-u-black.svg
trunk/html/css/images/icons-svg/arrow-u-l-black.svg
trunk/html/css/images/icons-svg/arrow-u-l-white.svg
trunk/html/css/images/icons-svg/arrow-u-r-black.svg
trunk/html/css/images/icons-svg/arrow-u-r-white.svg
trunk/html/css/images/icons-svg/arrow-u-white.svg
trunk/html/css/images/icons-svg/audio-black.svg
trunk/html/css/images/icons-svg/audio-white.svg
trunk/html/css/images/icons-svg/back-black.svg
trunk/html/css/images/icons-svg/back-white.svg
trunk/html/css/images/icons-svg/bars-black.svg
trunk/html/css/images/icons-svg/bars-white.svg
trunk/html/css/images/icons-svg/bullets-black.svg
trunk/html/css/images/icons-svg/bullets-white.svg
trunk/html/css/images/icons-svg/calendar-black.svg
trunk/html/css/images/icons-svg/calendar-white.svg
trunk/html/css/images/icons-svg/camera-black.svg
trunk/html/css/images/icons-svg/camera-white.svg
trunk/html/css/images/icons-svg/carat-d-black.svg
trunk/html/css/images/icons-svg/carat-d-white.svg
trunk/html/css/images/icons-svg/carat-l-black.svg
trunk/html/css/images/icons-svg/carat-l-white.svg
trunk/html/css/images/icons-svg/carat-r-black.svg
trunk/html/css/images/icons-svg/carat-r-white.svg
trunk/html/css/images/icons-svg/carat-u-black.svg
trunk/html/css/images/icons-svg/carat-u-white.svg
trunk/html/css/images/icons-svg/check-black.svg
trunk/html/css/images/icons-svg/check-white.svg
trunk/html/css/images/icons-svg/clock-black.svg
trunk/html/css/images/icons-svg/clock-white.svg
trunk/html/css/images/icons-svg/cloud-black.svg
trunk/html/css/images/icons-svg/cloud-white.svg
trunk/html/css/images/icons-svg/comment-black.svg
trunk/html/css/images/icons-svg/comment-white.svg
trunk/html/css/images/icons-svg/delete-black.svg
trunk/html/css/images/icons-svg/delete-white.svg
trunk/html/css/images/icons-svg/edit-black.svg
trunk/html/css/images/icons-svg/edit-white.svg
trunk/html/css/images/icons-svg/eye-black.svg
trunk/html/css/images/icons-svg/eye-white.svg
trunk/html/css/images/icons-svg/forbidden-black.svg
trunk/html/css/images/icons-svg/forbidden-white.svg
trunk/html/css/images/icons-svg/forward-black.svg
trunk/html/css/images/icons-svg/forward-white.svg
trunk/html/css/images/icons-svg/gear-black.svg
trunk/html/css/images/icons-svg/gear-white.svg
trunk/html/css/images/icons-svg/grid-black.svg
trunk/html/css/images/icons-svg/grid-white.svg
trunk/html/css/images/icons-svg/heart-black.svg
trunk/html/css/images/icons-svg/heart-white.svg
trunk/html/css/images/icons-svg/home-black.svg
trunk/html/css/images/icons-svg/home-white.svg
trunk/html/css/images/icons-svg/info-black.svg
trunk/html/css/images/icons-svg/info-white.svg
trunk/html/css/images/icons-svg/location-black.svg
trunk/html/css/images/icons-svg/location-white.svg
trunk/html/css/images/icons-svg/lock-black.svg
trunk/html/css/images/icons-svg/lock-white.svg
trunk/html/css/images/icons-svg/mail-black.svg
trunk/html/css/images/icons-svg/mail-white.svg
trunk/html/css/images/icons-svg/minus-black.svg
trunk/html/css/images/icons-svg/minus-white.svg
trunk/html/css/images/icons-svg/navigation-black.svg
trunk/html/css/images/icons-svg/navigation-white.svg
trunk/html/css/images/icons-svg/phone-black.svg
trunk/html/css/images/icons-svg/phone-white.svg
trunk/html/css/images/icons-svg/plus-black.svg
trunk/html/css/images/icons-svg/plus-white.svg
trunk/html/css/images/icons-svg/power-black.svg
trunk/html/css/images/icons-svg/power-white.svg
trunk/html/css/images/icons-svg/recycle-black.svg
trunk/html/css/images/icons-svg/recycle-white.svg
trunk/html/css/images/icons-svg/refresh-black.svg
trunk/html/css/images/icons-svg/refresh-white.svg
trunk/html/css/images/icons-svg/search-black.svg
trunk/html/css/images/icons-svg/search-white.svg
trunk/html/css/images/icons-svg/shop-black.svg
trunk/html/css/images/icons-svg/shop-white.svg
trunk/html/css/images/icons-svg/star-black.svg
trunk/html/css/images/icons-svg/star-white.svg
trunk/html/css/images/icons-svg/tag-black.svg
trunk/html/css/images/icons-svg/tag-white.svg
trunk/html/css/images/icons-svg/user-black.svg
trunk/html/css/images/icons-svg/user-white.svg
trunk/html/css/images/icons-svg/video-black.svg
trunk/html/css/images/icons-svg/video-white.svg
Added: trunk/html/css/images/icons-18-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-18-black.png
===================================================================
--- trunk/html/css/images/icons-18-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-18-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-18-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-36-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-36-black.png
===================================================================
--- trunk/html/css/images/icons-36-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-36-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-36-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-36-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-36-white.png
===================================================================
--- trunk/html/css/images/icons-36-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-36-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-36-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/action-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/action-black.png
===================================================================
--- trunk/html/css/images/icons-png/action-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/action-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/action-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/action-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/action-white.png
===================================================================
--- trunk/html/css/images/icons-png/action-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/action-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/action-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/alert-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/alert-black.png
===================================================================
--- trunk/html/css/images/icons-png/alert-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/alert-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/alert-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/alert-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/alert-white.png
===================================================================
--- trunk/html/css/images/icons-png/alert-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/alert-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/alert-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-d-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-d-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-d-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-d-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-d-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-d-l-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-d-l-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-d-l-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-d-l-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-d-l-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-d-l-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-d-l-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-d-l-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-d-l-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-d-l-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-d-r-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-d-r-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-d-r-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-d-r-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-d-r-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-d-r-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-d-r-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-d-r-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-d-r-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-d-r-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-d-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-d-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-d-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-d-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-d-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-l-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-l-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-l-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-l-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-l-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-l-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-l-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-l-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-l-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-l-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-r-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-r-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-r-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-r-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-r-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-r-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-r-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-r-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-r-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-r-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-u-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-u-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-u-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-u-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-u-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-u-l-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-u-l-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-u-l-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-u-l-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-u-l-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-u-l-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-u-l-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-u-l-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-u-l-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-u-l-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-u-r-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-u-r-black.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-u-r-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-u-r-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-u-r-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-u-r-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-u-r-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-u-r-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-u-r-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-u-r-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/arrow-u-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/arrow-u-white.png
===================================================================
--- trunk/html/css/images/icons-png/arrow-u-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/arrow-u-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/arrow-u-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/audio-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/audio-black.png
===================================================================
--- trunk/html/css/images/icons-png/audio-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/audio-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/audio-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/audio-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/audio-white.png
===================================================================
--- trunk/html/css/images/icons-png/audio-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/audio-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/audio-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/back-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/back-black.png
===================================================================
--- trunk/html/css/images/icons-png/back-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/back-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/back-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/back-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/back-white.png
===================================================================
--- trunk/html/css/images/icons-png/back-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/back-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/back-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/bars-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/bars-black.png
===================================================================
--- trunk/html/css/images/icons-png/bars-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/bars-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/bars-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/bars-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/bars-white.png
===================================================================
--- trunk/html/css/images/icons-png/bars-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/bars-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/bars-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/bullets-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/bullets-black.png
===================================================================
--- trunk/html/css/images/icons-png/bullets-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/bullets-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/bullets-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/bullets-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/bullets-white.png
===================================================================
--- trunk/html/css/images/icons-png/bullets-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/bullets-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/bullets-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/calendar-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/calendar-black.png
===================================================================
--- trunk/html/css/images/icons-png/calendar-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/calendar-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/calendar-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/calendar-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/calendar-white.png
===================================================================
--- trunk/html/css/images/icons-png/calendar-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/calendar-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/calendar-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/camera-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/camera-black.png
===================================================================
--- trunk/html/css/images/icons-png/camera-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/camera-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/camera-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/camera-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/camera-white.png
===================================================================
--- trunk/html/css/images/icons-png/camera-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/camera-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/camera-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-d-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-d-black.png
===================================================================
--- trunk/html/css/images/icons-png/carat-d-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-d-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-d-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-d-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-d-white.png
===================================================================
--- trunk/html/css/images/icons-png/carat-d-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-d-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-d-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-l-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-l-black.png
===================================================================
--- trunk/html/css/images/icons-png/carat-l-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-l-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-l-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-l-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-l-white.png
===================================================================
--- trunk/html/css/images/icons-png/carat-l-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-l-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-l-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-r-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-r-black.png
===================================================================
--- trunk/html/css/images/icons-png/carat-r-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-r-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-r-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-r-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-r-white.png
===================================================================
--- trunk/html/css/images/icons-png/carat-r-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-r-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-r-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-u-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-u-black.png
===================================================================
--- trunk/html/css/images/icons-png/carat-u-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-u-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-u-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/carat-u-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/carat-u-white.png
===================================================================
--- trunk/html/css/images/icons-png/carat-u-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/carat-u-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/carat-u-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/check-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/check-black.png
===================================================================
--- trunk/html/css/images/icons-png/check-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/check-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/check-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/check-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/check-white.png
===================================================================
--- trunk/html/css/images/icons-png/check-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/check-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/check-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/clock-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/clock-black.png
===================================================================
--- trunk/html/css/images/icons-png/clock-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/clock-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/clock-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/clock-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/clock-white.png
===================================================================
--- trunk/html/css/images/icons-png/clock-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/clock-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/clock-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/cloud-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/cloud-black.png
===================================================================
--- trunk/html/css/images/icons-png/cloud-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/cloud-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/cloud-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/cloud-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/cloud-white.png
===================================================================
--- trunk/html/css/images/icons-png/cloud-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/cloud-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/cloud-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/comment-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/comment-black.png
===================================================================
--- trunk/html/css/images/icons-png/comment-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/comment-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/comment-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/comment-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/comment-white.png
===================================================================
--- trunk/html/css/images/icons-png/comment-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/comment-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/comment-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/delete-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/delete-black.png
===================================================================
--- trunk/html/css/images/icons-png/delete-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/delete-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/delete-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/delete-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/delete-white.png
===================================================================
--- trunk/html/css/images/icons-png/delete-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/delete-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/delete-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/edit-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/edit-black.png
===================================================================
--- trunk/html/css/images/icons-png/edit-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/edit-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/edit-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/edit-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/edit-white.png
===================================================================
--- trunk/html/css/images/icons-png/edit-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/edit-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/edit-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/eye-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/eye-black.png
===================================================================
--- trunk/html/css/images/icons-png/eye-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/eye-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/eye-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/eye-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/eye-white.png
===================================================================
--- trunk/html/css/images/icons-png/eye-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/eye-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/eye-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/forbidden-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/forbidden-black.png
===================================================================
--- trunk/html/css/images/icons-png/forbidden-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/forbidden-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/forbidden-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/forbidden-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/forbidden-white.png
===================================================================
--- trunk/html/css/images/icons-png/forbidden-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/forbidden-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/forbidden-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/forward-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/forward-black.png
===================================================================
--- trunk/html/css/images/icons-png/forward-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/forward-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/forward-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/forward-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/forward-white.png
===================================================================
--- trunk/html/css/images/icons-png/forward-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/forward-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/forward-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/gear-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/gear-black.png
===================================================================
--- trunk/html/css/images/icons-png/gear-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/gear-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/gear-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/gear-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/gear-white.png
===================================================================
--- trunk/html/css/images/icons-png/gear-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/gear-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/gear-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/grid-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/grid-black.png
===================================================================
--- trunk/html/css/images/icons-png/grid-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/grid-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/grid-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/grid-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/grid-white.png
===================================================================
--- trunk/html/css/images/icons-png/grid-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/grid-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/grid-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/heart-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/heart-black.png
===================================================================
--- trunk/html/css/images/icons-png/heart-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/heart-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/heart-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/heart-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/heart-white.png
===================================================================
--- trunk/html/css/images/icons-png/heart-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/heart-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/heart-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/home-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/home-black.png
===================================================================
--- trunk/html/css/images/icons-png/home-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/home-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/home-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/home-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/home-white.png
===================================================================
--- trunk/html/css/images/icons-png/home-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/home-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/home-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/info-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/info-black.png
===================================================================
--- trunk/html/css/images/icons-png/info-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/info-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/info-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/info-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/info-white.png
===================================================================
--- trunk/html/css/images/icons-png/info-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/info-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/info-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/location-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/location-black.png
===================================================================
--- trunk/html/css/images/icons-png/location-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/location-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/location-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/location-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/location-white.png
===================================================================
--- trunk/html/css/images/icons-png/location-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/location-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/location-white.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/lock-black.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/lock-black.png
===================================================================
--- trunk/html/css/images/icons-png/lock-black.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/lock-black.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/lock-black.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/html/css/images/icons-png/lock-white.png
===================================================================
(Binary files differ)
Index: trunk/html/css/images/icons-png/lock-white.png
===================================================================
--- trunk/html/css/images/icons-png/lock-white.png 2014-01-04 15:40:38 UTC (rev 1211)
+++ trunk/html/css/images/icons-png/lock-white.png 2014-01-04 19:45:48 UTC (rev 1212)
Property changes on: trunk/html/css/images/icons-png/lock-white.png
___________________________________________________________________
A...
[truncated message content] |
|
From: <gok...@us...> - 2014-01-04 15:40:41
|
Revision: 1211
http://sourceforge.net/p/tutos/code/1211
Author: gokohnert
Date: 2014-01-04 15:40:38 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/file/file.pinc
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2014-01-03 13:26:59 UTC (rev 1210)
+++ trunk/php/file/file.pinc 2014-01-04 15:40:38 UTC (rev 1211)
@@ -1519,12 +1519,21 @@
$x[$this->getTypeId()][20] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Bug'].' - '.$lang['BugAssignedTo'];
$x[$this->getTypeId()][21] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Bug'].' - '.$lang['BugReportedFrom'];
$x[$this->getTypeId()][30] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Task'].' - '.$lang['TaskWorker'];
- $x[$this->getTypeId()][40] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['SoldBy'];
- $x[$this->getTypeId()][41] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['InstalledBy'];
- $x[$this->getTypeId()][42] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['Customer'];
- $x[$this->getTypeId()][60] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Expense'].' - '.$lang['ExpenseAddress'];
+ if (isset($lang['Installation'])) {
+ $x[$this->getTypeId()][40] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['SoldBy'];
+ $x[$this->getTypeId()][41] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['InstalledBy'];
+ $x[$this->getTypeId()][42] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['Customer'];
+ } else {
+ $x[$this->getTypeId()][40] = $lang[$this->getType()].':'.$lang['FileReference'].':Installation - SoldBy';
+ $x[$this->getTypeId()][41] = $lang[$this->getType()].':'.$lang['FileReference'].':Installation - InstalledBy';
+ $x[$this->getTypeId()][42] = $lang[$this->getType()].':'.$lang['FileReference'].':Installation - Customer';
+ }
+ if (isset($lang['Expense'])) {
+ $x[$this->getTypeId()][60] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Expense'].' - '.$lang['ExpenseAddress'];
+ } else {
+ $x[$this->getTypeId()][60] = $lang[$this->getType()].':'.$lang['FileReference'].': Expense - ExpenseAddress';
+ }
-
$x[$this->getTypeId()][100] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['ProductP'].' - '.$lang['ProdRoles'];
foreach ($lang['ProdRole'] as $role => $f) {
if ( $tutos[rolecheck][$role] != "p") {
@@ -1900,4 +1909,4 @@
}
}
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-03 13:27:02
|
Revision: 1210
http://sourceforge.net/p/tutos/code/1210
Author: gokohnert
Date: 2014-01-03 13:26:59 +0000 (Fri, 03 Jan 2014)
Log Message:
-----------
bugfix bad info output
Modified Paths:
--------------
trunk/php/bugtracking/bug_ins.php
Modified: trunk/php/bugtracking/bug_ins.php
===================================================================
--- trunk/php/bugtracking/bug_ins.php 2014-01-03 13:05:43 UTC (rev 1209)
+++ trunk/php/bugtracking/bug_ins.php 2014-01-03 13:26:59 UTC (rev 1210)
@@ -213,7 +213,7 @@
}
// check if target is required
-$info .= $b->target;
+#$info .= $b->target;
if ( ($tutos['bug_need_target'] != '') && !is_object($b->target) ) {
$x = preg_split('#,#',$tutos['bug_need_target']);
if (in_array($state,$x)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-03 13:05:47
|
Revision: 1209
http://sourceforge.net/p/tutos/code/1209
Author: gokohnert
Date: 2014-01-03 13:05:43 +0000 (Fri, 03 Jan 2014)
Log Message:
-----------
bugfix product stat with filters
Modified Paths:
--------------
trunk/php/mailbox/mailbox_show.php
trunk/php/product_overview.php
Modified: trunk/php/mailbox/mailbox_show.php
===================================================================
--- trunk/php/mailbox/mailbox_show.php 2014-01-02 16:03:06 UTC (rev 1208)
+++ trunk/php/mailbox/mailbox_show.php 2014-01-03 13:05:43 UTC (rev 1209)
@@ -148,7 +148,7 @@
$x = makelink("mailbox/mail_show.php?mno=". $u ."&id=". $this->obj->id ."&path=". base64_encode($this->obj->addpath) ,$this->theme->getImage(mail,'list') . sprintf("%'_6d",$id) ,"");
$r .= $this->OverviewRowBlock($x,'over_l');
- if ( $hdr->date ) {
+ if ( isset($hdr->date) ) {
$x = $hdr->date;
} else {
$x = $d->getDateTime();
@@ -424,4 +424,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php 2014-01-02 16:03:06 UTC (rev 1208)
+++ trunk/php/product_overview.php 2014-01-03 13:05:43 UTC (rev 1209)
@@ -501,35 +501,9 @@
$r .= "<tr>\n";
$r .= $this->showfield($lang['Count']);
$r .= "<td colspan=\"5\">". $cnt ."\n";
- $pre = "filtered by ";
- while ( list ($i,$f) = @each ($this->filter) ) {
- if ( $f == "" ) {
- continue;
- }
- if ( $i == 'state' ) {
- $f = $f + 0;
- $r .= $pre . $lang['ProdState'];
- $r .= " ". $lang['ProdStates'][$f];
- } else if ( $i == 'cl1' ) {
- $r .= $pre . $lang['ProdClass1'];
- $r .= " ". $lang['ProdClasses1'][$f];
- } else if ( $i == 'cl2' ) {
- $r .= $pre . $lang['ProdClass2'];
- $r .= " ". $lang['ProdClasses2'][$f];
- } else if ( $i == 'name' ) {
- $r .= $pre . $lang['ProdDesc'];
- $r .= " ". $f;
- } else if ( $i == 'from' ) {
- $r .= $pre . $lang['DateTimeFrom'];
- $r .= " ". $f->getDateTime();
- } else if ( $i == 'to' ) {
- $r .= $pre . $lang['DateTimeTill'];
- $r .= " ". $f->getDateTime();
- } else {
- $r .= $pre . $i;
- $r .= " ". $f;
- }
- $pre = " and ";
+ if ($this->header != '') {
+ $r .= "filtered by ";
+ $r .= $this->header;
}
$r .= " </td>\n";
$r .= "</tr>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2014-01-02 16:03:12
|
Revision: 1208
http://sourceforge.net/p/tutos/code/1208
Author: gokohnert
Date: 2014-01-02 16:03:06 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
removed most nbsp characters; moved more output to new tcpdf; added missing tcpdf files to main package
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile
trunk/homepage/index.html
trunk/libs/php-barcode/TUTOS-README
trunk/php/Date.pinc
trunk/php/acl.pinc
trunk/php/acl_new.php
trunk/php/acl_overview.php
trunk/php/acl_show.php
trunk/php/address_new.php
trunk/php/address_overview.php
trunk/php/address_select.php
trunk/php/address_tools.p3
trunk/php/admin/create_config.php
trunk/php/admin/customize_show.php
trunk/php/admin/scheme.php
trunk/php/admin/table_custom_show.php
trunk/php/admin/update.php
trunk/php/admin_show.php
trunk/php/admin_sync.php
trunk/php/adodb-time.inc.php
trunk/php/app_new.php
trunk/php/app_new_r.php
trunk/php/app_overview.php
trunk/php/app_show.php
trunk/php/bugtracking/bug_new.php
trunk/php/bugtracking/bug_overview.php
trunk/php/calendar.php
trunk/php/calendar_day.php
trunk/php/calendar_week.php
trunk/php/check.php
trunk/php/checklist/checkfield.pinc
trunk/php/checklist/checkfield_overview.php
trunk/php/checklist/checklist.pinc
trunk/php/checklist/checklist_show.php
trunk/php/company_new.php
trunk/php/config_default.pinc
trunk/php/counter/counter_overview.php
trunk/php/counter/counter_show.php
trunk/php/db/db_pg.pinc
trunk/php/department_new.php
trunk/php/doctracker/doc_overview.php
trunk/php/drawboard/drawboard_overview.php
trunk/php/expense/expense_new.php
trunk/php/expense/expense_overview.php
trunk/php/fax/fax_new.php
trunk/php/file/file.pinc
trunk/php/file/file_new.php
trunk/php/file/file_overview.php
trunk/php/file/file_show.php
trunk/php/group/group_overview.php
trunk/php/installation/installation_overview.php
trunk/php/installation/installation_show.php
trunk/php/invoice/invoice.pinc
trunk/php/invoice/invoice_new.php
trunk/php/invoice/invoice_overview.php
trunk/php/invoice/invoice_pdf.pinc
trunk/php/invoice/invoice_show.php
trunk/php/layout/adq_layout.pinc
trunk/php/layout/classic_base.pinc
trunk/php/layout/classic_layout.pinc
trunk/php/layout/new_layout.pinc
trunk/php/layout/test_layout.pinc
trunk/php/ldap/ldap_overview.php
trunk/php/ldap/ldap_show.php
trunk/php/localization/hu.p3
trunk/php/mail.pinc
trunk/php/mailbox/mail_select.php
trunk/php/mailbox/mailbox_new.php
trunk/php/mailbox/mailbox_show.php
trunk/php/minical.php
trunk/php/module_overview.php
trunk/php/module_template/AAA_overview.php
trunk/php/mytutos.php
trunk/php/note/note_overview.php
trunk/php/pdf.pinc
trunk/php/pdf2.pinc
trunk/php/permission.p3
trunk/php/product_contacts.php
trunk/php/product_role_new.php
trunk/php/rate/rate_overview.php
trunk/php/reminder/reminder.pinc
trunk/php/reminder/reminder_overview.php
trunk/php/report-engine/report_overview.php
trunk/php/res_cal.php
trunk/php/resource/resource_overview.php
trunk/php/rss/rss_overview.php
trunk/php/sales_forecast.php
trunk/php/scrum/log_new.php
trunk/php/scrum/log_overview.php
trunk/php/scrum/log_show.php
trunk/php/scrum/scrum.pinc
trunk/php/scrum/sprint_new.php
trunk/php/scrum/sprint_overview.php
trunk/php/scrum/sprint_show.php
trunk/php/stc/stc.pinc
trunk/php/stc/stc_new.php
trunk/php/stc/stc_overview.php
trunk/php/stc/stc_show.php
trunk/php/stuff/stuff.pinc
trunk/php/stuff/stuff_overview.php
trunk/php/stuff/stuff_show.php
trunk/php/subversion/svn_overview.php
trunk/php/task_gantt.php
trunk/php/task_new.php
trunk/php/task_show.php
trunk/php/team_new.php
trunk/php/team_overview.php
trunk/php/team_show.php
trunk/php/testmanager/testcase_new.php
trunk/php/testmanager/testcase_overview.php
trunk/php/testmanager/testmanager.pinc
trunk/php/testmanager/testrun_overview.php
trunk/php/testmanager/testsuite_overview.php
trunk/php/testmanager/testsuite_show.php
trunk/php/timetrack/timetrack_overview.php
trunk/php/user_new.php
trunk/php/user_overview.php
trunk/php/watchlist/watchlist_overview.php
trunk/php/webelements.p3
trunk/test.sh
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/ChangeLog 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,4 +1,6 @@
#$Id$
+27 December 2013
+ * Release 1.10.20131227
* allow to use a fiexed email for sending out emails (i.e a noreply email). Set in the config email tab.
* updated bundeled jquery and jqplot
* counter stats uses jqplot now
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/Makefile 2014-01-02 16:03:06 UTC (rev 1208)
@@ -469,8 +469,8 @@
libs/fpdf/FAQ.htm
LIBS_TCPDF = $(wildcard libs/tcpdf/*.php) \
- $(wildcard libs/tcpdf/font/*.php) \
- $(wildcard libs/tcpdf/font/*.z) \
+ $(wildcard libs/tcpdf/fonts/*.php) \
+ $(wildcard libs/tcpdf/fonts/*.z) \
$(wildcard libs/tcpdf/config/*.php) \
libs/tcpdf/TUTOS-README \
libs/tcpdf/README.TXT \
Modified: trunk/homepage/index.html
===================================================================
--- trunk/homepage/index.html 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/homepage/index.html 2014-01-02 16:03:06 UTC (rev 1208)
@@ -11,6 +11,6 @@
<p />
<p />
<img border="0" src="../html/tutos_full.png" alt="TUTOS" />
-<br /><b><font size="3">LATEST RELEASE IS 1.9.20121228</font></b>
+<br /><b><font size="3">LATEST RELEASE IS 1.10.20131227</font></b>
</center>
<!--#include file="foot1.html.inc" -->
Modified: trunk/libs/php-barcode/TUTOS-README
===================================================================
--- trunk/libs/php-barcode/TUTOS-README 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/libs/php-barcode/TUTOS-README 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,9 +1,13 @@
$Id: TUTOS-README,v 1.1 2008/01/24 19:52:23 gokohnert Exp $
You should install the php-barcode tool in this directory
+and the genbarcode from the same source in /usr/local/bin
Please see
http://www.ashberg.de/php-barcode/download/
php-barcode is not part of TUTOS and is not maintained by the TUTOS team.
+
+Attention: it might be neccessary to anble short_open_tags for PHP if you use php-barcode or
+modify the php files in this directory in order to start with "<?php" instead of "<?"
\ No newline at end of file
Modified: trunk/php/Date.pinc
===================================================================
--- trunk/php/Date.pinc 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/Date.pinc 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -967,13 +967,13 @@
} else {
$r .= $this->EnterDay($name,$none);
}
- $r .= "<b>.</b> ";
+ $r .= "<b>.</b> ";
if ( $tutos['df'] == 1 ) {
$r .= $this->EnterDay($name,$none);
} else {
$r .= $this->EnterMonth($name,$none);
}
- $r .= "<b>.</b> ";
+ $r .= "<b>.</b> ";
$r .= $this->EnterYear($name,$none,$future_only);
if ($show_minical) {
@@ -991,7 +991,7 @@
$r = '<span id="'.$name.'_HM">';
$r .= '<input id="'. $h .'" maxlength="2" size="2" name="'. $h .'" value="'. sprintf("%02d",$this->hour) ."\" />\n";
- $r .= ' <b>:</b> ';
+ $r .= ' <b>:</b> ';
$r .= '<input id="'. $m .'" maxlength="2" size="2" name="'. $m .'" value="'. sprintf("%02d",$this->min) ."\" />\n";
$r .= '</span>';
return $r;
@@ -1012,8 +1012,8 @@
$h = sprintf("%s_H",$name );
$m = sprintf("%s_M",$name );
- $r .= '<span id="'.$name.'_HM"> <input id="'.$h.'" maxlength="2" size="2" name="'. $h .'" value="'. ($this->hour == -1 ? "--":$this->hour) ."\" />\n";
- $r .= ' <b>:</b> ';
+ $r .= '<span id="'.$name.'_HM"> <input id="'.$h.'" maxlength="2" size="2" name="'. $h .'" value="'. ($this->hour == -1 ? "--":$this->hour) ."\" />\n";
+ $r .= ' <b>:</b> ';
$r .= '<input id="'.$m.'" maxlength="2" size="2" name="'. $m .'" value="'. ($this->min == -1 ? "--":$this->min) ."\" />\n";
if ($tutos[jscalendar] == 0) {
Modified: trunk/php/acl.pinc
===================================================================
--- trunk/php/acl.pinc 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/acl.pinc 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -530,15 +530,15 @@
$old = $a;
}
if ($l == 0) {
- $r .= $pre.' '.$lang['everybody'];
+ $r .= $pre.' '.$lang['everybody'];
} else if ($l < 0) {
$x = $l - ($obj->getTypeId() << ACLSHIFT);
if (isset($virtgroups[$obj->getTypeId()][-$x])) {
- $r .= $pre.' '.$virtgroups[$obj->getTypeId()][-$x];
+ $r .= $pre.' '.$virtgroups[$obj->getTypeId()][-$x];
}
} else {
$x = getObject($obj->dbconn,$l);
- $r .= $pre.' '.$x->getFullName();
+ $r .= $pre.' '.$x->getFullName();
}
$pre = '<br />';
}
@@ -625,7 +625,7 @@
$r = '';
$r .= '<td align="center" valign="top" width="10%">';
if ( isset($permskip[$f][$p]) ) {
- $r .= " ";
+ $r .= " ";
} else {
if ( $user->isAdmin() || ($f == usepopup) || ($p == PERM_MYTUTOS) ) {
$r .= '<input type="checkbox" name="f'. $f .'[]" value="'. $p .'"'. ($obj->p[$f] & $p ? ' checked="checked"':'') ." />\n";
@@ -740,7 +740,7 @@
$r .= " <th>". $lang['Search'] ."</th>\n";
$r .= " <th>". $lang['PersonalPage'] ."</th>\n";
$r .= " <th colspan=\"2\">★<input type=\"checkbox\" name=\"checkitall\" "CheckAllAll(this,'f-')\" />★</th>\n";
- # $r .= "<th> </th>\n";
+ # $r .= "<th> </th>\n";
$r .= "</tr>\n";
$line = 0;
$perms = array (PERM_NEW,PERM_SEE,PERM_USE,PERM_MOD,PERM_DEL,PERM_SEL,PERM_MYTUTOS);
@@ -763,8 +763,8 @@
$r .= '<td colspan="2" align="center" valign="top" width="15%">*';
$r .= '<input type="checkbox" id="f'.$i.'_fld" name="f-checkit'. $i .'" '. ($obj->p[$i] > 61 ? ' checked="checked"':'') ." />*</td>\n";
} else {
- $r .= '<td><span id="f'.$i."_fld\"> </span></td>\n";
- $r .= "<td> </td>\n";
+ $r .= '<td><span id="f'.$i."_fld\"> </span></td>\n";
+ $r .= "<td> </td>\n";
}
} else {
$r .= '<td align="center" colspan="9">'. $lang['FeatureOff'] ."</td>\n";
Modified: trunk/php/acl_new.php
===================================================================
--- trunk/php/acl_new.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/acl_new.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -143,7 +143,7 @@
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n";
+ $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n";
$r .= "</tr>\n";
@@ -245,14 +245,14 @@
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= ' <td colspan="2"> '. sprintf($lang['ACLreadI'],myentities($title)) ." </td>\n";
- $r .= ' <td colspan="2"> '. sprintf($lang['ACLuseI'],myentities($title)) ." </td>\n";
- $r .= ' <td colspan="2"> '. sprintf($lang['ACLmodI'] ,myentities($title)) ." </td>\n";
- $r .= ' <td colspan="2"> '. sprintf($lang['ACLdelI'] ,myentities($title)) ." </td>\n";
+ $r .= ' <td colspan="2"> '. sprintf($lang['ACLreadI'],myentities($title)) ." </td>\n";
+ $r .= ' <td colspan="2"> '. sprintf($lang['ACLuseI'],myentities($title)) ." </td>\n";
+ $r .= ' <td colspan="2"> '. sprintf($lang['ACLmodI'] ,myentities($title)) ." </td>\n";
+ $r .= ' <td colspan="2"> '. sprintf($lang['ACLdelI'] ,myentities($title)) ." </td>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n";
+ $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n";
$r .= "</tr>\n";
if (count($this->obj) == 1) {
@@ -265,7 +265,7 @@
}
}
$r .= "<tr>\n";
- $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="recursive" id="recursive" /><label for="recursive">'. $lang['ACLRecursive'] .' ('.$x.')'."</label></td>\n";
+ $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="recursive" id="recursive" /><label for="recursive">'. $lang['ACLRecursive'] .' ('.$x.')'."</label></td>\n";
$r .= "</tr>\n";
}
Modified: trunk/php/acl_overview.php
===================================================================
--- trunk/php/acl_overview.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/acl_overview.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,7 +1,7 @@
<?php
/**
* Copyright 2001 Boris Wesslowski
- * Copyright 2001 - 2012 Gero Kohnert
+ * Copyright 2001 - 2014 Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -149,17 +149,17 @@
$r .= '<td rowspan="'. max($n2,1) .'" class="over_l">'. acl_link($obj,$oid,0) ."</td>\n";
$r .= '<td rowspan="'. max($n2,1) .'" class="over_l">'. $lang[$obj->getType()] ."</td>\n";
$r .= '<td rowspan="'. max($n2,1) .'" class="over_l">'. $obj->getLink() ."</td>\n";
- $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"><span class="small">'. (is_object($obj->creator) ? $obj->creator->getLink():' ');
- $r .= (is_object($obj->creation) ? '<br />'.$obj->creation->getDateTime():' ');
+ $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"><span class="small">'. (is_object($obj->creator) ? $obj->creator->getLink():' ');
+ $r .= (is_object($obj->creation) ? '<br />'.$obj->creation->getDateTime():' ');
$r .= "</span></td>\n";
} else {
$r .= '<td rowspan="'. max($n2,1) .'">'. $g ."</td>\n";
$r .= '<td rowspan="'. max($n2,1) .'" class="over_l">unknown</td>'."\n";
$r .= '<td rowspan="'. max($n2,1) .'" class="over_l">unknown</td>'."\n";
- $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"> </td>'."\n";
+ $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"> </td>'."\n";
}
if ( $n2 == 0 ) {
- $r .= "<td colspan=\"2\"> </td>\n";
+ $r .= "<td colspan=\"2\"> </td>\n";
$r .= $this->MassUpdateField($obj);
$r .= $this->OverviewRowEnd($line);
} else {
@@ -308,7 +308,7 @@
if ( isset($lang[$x['perm']]) ) {
$ref = new $x[name]($this->user->dbconn);
if ($ref->tablename != 'UNKNOWN')
- $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].' (M)',$lang[$x['perm']]) ."</li>\n";
+ $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].' (M)',$lang[$x['perm']]) ."</li>\n";
}
}
$r .= "</ul></td></tr>\n";
@@ -333,7 +333,7 @@
continue;
}
if ( method_exists($b,"del_ok") && method_exists($b,"delete") && $b->del_ok() ) {
- $info = addLine($info,$lang['Delete'] .": ". $lang[$b->getType()] ." ". myentities($b->getFullName()));
+ $info = addLine($info,$lang['Delete'] .": ". $lang[$b->getType()] ." ". myentities($b->getFullName()));
$msg = addLine($msg,$b->delete());
} else {
$msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0023'],$lang[$b->getType()]));
Modified: trunk/php/acl_show.php
===================================================================
--- trunk/php/acl_show.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/acl_show.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -33,7 +33,7 @@
$r = '';
foreach ($this->obj->acl[0] as $i => $f) {
if ( ($f < $max) && ($f >= $min) ) {
- $pre = " ";
+ $pre = " ";
if ( $i == 0 ) {
$r .= $pre . $lang['everybody'] ."<br />\n";
} else if ($i < 0) {
@@ -51,7 +51,7 @@
}
}
}
- $r .= " ";
+ $r .= " ";
return $r;
}
Modified: trunk/php/address_new.php
===================================================================
--- trunk/php/address_new.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/address_new.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -101,12 +101,12 @@
// ZIP
$r .= $this->add_entry ($lang['ZIP'],'zip',$this->loc->zip,$modloc,$table['location']['zip'][size]);
- $r .= "<td colspan=\"2\"> </td>";
+ $r .= "<td colspan=\"2\"> </td>";
$r .= "</tr><tr>\n";
// STATE
$r .= $this->add_entry ($lang['State'],'state',$this->loc->state,$modloc,$table['location']['state'][size]);
- $r .= "<td colspan=\"2\"> </td>";
+ $r .= "<td colspan=\"2\"> </td>";
$r .= "</tr><tr>\n";
// COUNTRY
@@ -197,7 +197,7 @@
$r .= $this->ask_address();
if ( $this->loc->id > -1) {
- $r .= "<tr><td colspan=\"4\" align=\"right\"> ";
+ $r .= "<tr><td colspan=\"4\" align=\"right\"> ";
$r .= acl_link($this->loc);
$r .= "</td></tr>\n";
}
@@ -235,7 +235,7 @@
} else {
$req = 0;
}
- $r .= $this->showfieldc($text . " ",$req,$varname);
+ $r .= $this->showfieldc($text . " ",$req,$varname);
$r .= "<td colspan=\"". $width ."\">\n";
if ( $varname == 'birthday_d' ) {
$varname = 'birthday';
@@ -262,13 +262,13 @@
} elseif ( $varname == 'category' ) {
if ($varvalue > 2) {
- $r .= ' - <input type="hidden" id="category" name="'. $varname .'" value="'. $varvalue .'" />';
+ $r .= ' - <input type="hidden" id="category" name="'. $varname .'" value="'. $varvalue .'" />';
} else {
$cchecked[1] = '';
$cchecked[2] = '';
$cchecked[$varvalue] = 'checked="checked"';
$r .= $lang['AdrCat1'] .'<input type="radio" id="category" name="'. $varname .'" value="1" '. $cchecked[1] .' />';
- $r .= ' '. $lang['AdrCat2'] .'<input type="radio" name="'. $varname .'" value="2" '. $cchecked[2] .' />';
+ $r .= '  '. $lang['AdrCat2'] .'<input type="radio" name="'. $varname .'" value="2" '. $cchecked[2] .' />';
}
} elseif ( $varname == 'company' ) {
if ( $mod == true ) {
@@ -276,7 +276,7 @@
$r .= '<br /><input type="checkbox" value="1" name="cploc"'. ( $varvalue->cploc == 1 ? ' checked="checked"':'') .' />'. $lang['AdrCpLoc'];
} else {
if ( $varvalue == "" ) {
- $r .= " ";
+ $r .= " ";
} else {
$r .= $varvalue;
}
@@ -289,7 +289,7 @@
$r .= '<input id="'. $varname .'" name="'. $varname .'" size="'. $showsize .'" maxlength="'. $size .'" value="'. myentities($varvalue) .'" />';
} else {
if ( $varvalue == "" ) {
- $r .= ' ';
+ $r .= ' ';
} else {
$r .= $varvalue;
}
Modified: trunk/php/address_overview.php
===================================================================
--- trunk/php/address_overview.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/address_overview.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -110,7 +110,7 @@
$pdf->Close();
$data = $pdf->Output('','S');
- export_headers('TUTOS_'.$this->obj->name,'pdf',false);
+ export_headers('TUTOS_'.$this->name,'pdf',false);
Header('Content-Length: '.strlen($data));
return $data;
}
Modified: trunk/php/address_select.php
===================================================================
--- trunk/php/address_select.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/address_select.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2013 by Gero Kohnert
+ * Copyright 1999 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -64,13 +64,13 @@
$r .= $this->ContentRowStart('ext');
$r .= " <td colspan=\"3\">\n";
- $r .= ' <input type="checkbox" id="f1" value="name" name="ext_f[]"' .$c['name'] .'><label for="f1"> '. $lang['AdrLastName'] ." & ". $lang['AdrFirstName'] ."</label><br />\n";
- $r .= ' <input type="checkbox" id="f7" value="zip" name="ext_f[]"' .$c['zip'] .'><label for="f7"> '. $lang['ZIP'] ."</label><br />\n";
- $r .= ' <input type="checkbox" id="f2" value="city" name="ext_f[]"' .$c['city'] .'><label for="f2"> '. $lang['City'] ."</label><br />\n";
- $r .= ' <input type="checkbox" id="f3" value="street" name="ext_f[]"'.$c['street'].'><label for="f3"> '. $lang['Street'] ."</label><br />\n";
- $r .= ' <input type="checkbox" id="f4" value="email" name="ext_f[]"' .$c['email'] .'><label for="f4"> '. $lang['AdrEmail'] ."</label><br />\n";
- $r .= ' <input type="checkbox" id="f5" value="phone" name="ext_f[]"' .$c['phone'] .'><label for="f5"> '. $lang['Phone'] ."/". $lang['AdrFax']."</label><br />\n";
- $r .= ' <input type="checkbox" id="f6" value="desc" name="ext_f[]"' .$c['desc'] .'><label for="f6"> '. $lang['Description']."</label>\n";
+ $r .= '  <input type="checkbox" id="f1" value="name" name="ext_f[]"' .$c['name'] .'><label for="f1"> '. $lang['AdrLastName'] ." & ". $lang['AdrFirstName'] ."</label><br />\n";
+ $r .= '  <input type="checkbox" id="f7" value="zip" name="ext_f[]"' .$c['zip'] .'><label for="f7"> '. $lang['ZIP'] ."</label><br />\n";
+ $r .= '  <input type="checkbox" id="f2" value="city" name="ext_f[]"' .$c['city'] .'><label for="f2"> '. $lang['City'] ."</label><br />\n";
+ $r .= '  <input type="checkbox" id="f3" value="street" name="ext_f[]"'.$c['street'].'><label for="f3"> '. $lang['Street'] ."</label><br />\n";
+ $r .= '  <input type="checkbox" id="f4" value="email" name="ext_f[]"' .$c['email'] .'><label for="f4"> '. $lang['AdrEmail'] ."</label><br />\n";
+ $r .= '  <input type="checkbox" id="f5" value="phone" name="ext_f[]"' .$c['phone'] .'><label for="f5"> '. $lang['Phone'] ."/". $lang['AdrFax']."</label><br />\n";
+ $r .= '  <input type="checkbox" id="f6" value="desc" name="ext_f[]"' .$c['desc'] .'><label for="f6"> '. $lang['Description']."</label>\n";
$r .= " </td>\n";
$r .= $this->ContentRowEnd();
@@ -86,7 +86,7 @@
$r .= $this->ContentRowStart();
$r .= $this->showfieldc($lang['AdrName']);
- $r .= "<td><input type=\"text\" value=\"". $this->lookfor ."\" name=\"name\"> </td>\n";
+ $r .= "<td><input type=\"text\" value=\"". $this->lookfor ."\" name=\"name\"> </td>\n";
$r .= "<td><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchLdapAdr'] ."\"></td>\n";
if ( count($tutos[ldapserver]) > 1 ) {
Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/address_tools.p3 2014-01-02 16:03:06 UTC (rev 1208)
@@ -22,7 +22,7 @@
$r = '';
$line = '';
$r .= "<tr>\n";
- $r .= $user->layout->showfield( ($title == "" ? " ":$title));
+ $r .= $user->layout->showfield( ($title == "" ? " ":$title));
if ( $typ == 1 ) {
$set = 0;
@@ -79,7 +79,7 @@
}
}
if ( $set == 0 ) {
- $r .= ' <td colspan="'. $s ."\"> </td>\n";
+ $r .= ' <td colspan="'. $s ."\"> </td>\n";
}
} elseif ( $typ == 9 ) {
if ( count($a->obj->location) <= 1 ) {
@@ -90,7 +90,7 @@
if ( count($a->obj->location) > 0 ) {
foreach($a->obj->location as $j => $l) {
if ( $name == "ModifyDelete" ) {
- $r .= $current_user->layout->showGuiIcons('<th colspan="'.$s.'" align="right">'. myentities($l->lname) .' '. $lang['Address'] .' ','</th>',$l,$a->obj,array('mod','del'),false);
+ $r .= $current_user->layout->showGuiIcons('<th colspan="'.$s.'" align="right">'. myentities($l->lname) .' '. $lang['Address'] .'  ','</th>',$l,$a->obj,array('mod','del'),false);
}
}
}
@@ -105,9 +105,9 @@
$s--;
}
if ( $name == "birthday" ) {
- $r .= ' <td colspan="'. $s .'"> '. $a->$name->getLinkDate() ." </td>\n";
+ $r .= ' <td colspan="'. $s .'"> '. $a->$name->getLinkDate() ." </td>\n";
} elseif ( $name == "title" ) {
- $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n";
+ $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n";
$r .= " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">\n";
$a->read_picture();
if ( is_object($a->pic_file) && $a->pic_file->see_ok() ) {
@@ -115,11 +115,11 @@
'<img alt="'. $a->getFullName() .'" class="logopic" src="'. addSessionKey($a->pic_file->getUrl().'&format=show') .'">',
$a->getFullName());
} else {
- $r .= " ";
+ $r .= " ";
}
$r .= "</td>\n";
} else {
- $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n";
+ $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n";
}
}
$r .= "</tr>\n";
@@ -237,7 +237,7 @@
$needloc = 0;
$layout->flds = 0;
if ( $layout->head['icon_before'] ) {
- $r .= "<th> </th>\n";
+ $r .= "<th> </th>\n";
$layout->flds++;
}
if ( $layout->head['f_name'] ) {
@@ -303,7 +303,7 @@
$layout->flds++;
}
if ( $layout->head['icon_after'] ) {
- $r .= "<th> </th>\n";
+ $r .= "<th> </th>\n";
$layout->flds++;
}
@@ -433,18 +433,18 @@
$r .= $layout->OverviewRowBlock($b,'over_l');
}
if ( $layout->head['c_id'] ) {
- $r .= $layout->OverviewRowBlock((is_object($location->company) ? $location->company->getLink():' '),'over_l');
+ $r .= $layout->OverviewRowBlock((is_object($location->company) ? $location->company->getLink():' '),'over_l');
}
if ( $layout->head['d_id'] ) {
if ( $layout->head['c_id'] ) {
- $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink($location->department->name):' '),'over_l');
+ $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink($location->department->name):' '),'over_l');
} else {
- $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink():' '),'over_l');
+ $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink():' '),'over_l');
}
}
if ( ($row == 0) && ($layout->head['icon_after']) ) {
// myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
- $r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">"," </td>\n",$address,$address,$current_user->get_preficons(2),false);
+ $r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">"," </td>\n",$address,$address,$current_user->get_preficons(2),false);
}
$r .= show_custom_overview_data($layout,'address',$address);
@@ -464,31 +464,31 @@
if ($row == 0 ) {
if ( $layout->head['location'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['desc1'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['email'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['phone'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['fax'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['street'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['city'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['c_id'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['d_id'] ) {
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
}
if ( $layout->head['icon_after'] ) {
$r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">","</td>\n",$address,$address,$current_user->get_preficons(2),false);
Modified: trunk/php/admin/create_config.php
===================================================================
--- trunk/php/admin/create_config.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/admin/create_config.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001-2012 by Gero Kohnert
+ * Copyright 2001-2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -383,11 +383,11 @@
$db = new Database();
$r .= "<tr>\n";
- $r .= $this->showfield($lang['AdminDBName']." [0]",1,"dbname");
+ $r .= $this->showfield($lang['AdminDBName']." [0]",1,"dbname");
$r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['name'][size],30) ."\" maxlength=\"".$table['database']['name'][size]."\" name=\"dbname\" id=\"dbname\" value=\"". $tutos[dbname][0] ."\"><br />\n";
$r .= $this->info_help_test('dbname');
$r .= " </td>\n";
- $r .= $this->showfield($lang['AdminDBType']." [0]",1,"dbtype");
+ $r .= $this->showfield($lang['AdminDBType']." [0]",1,"dbtype");
$r .= " <td colspan=\"2\" valign=\"top\">\n";
$r .= " <select name=\"dbtype\">\n";
foreach($db->tlist as $i => $f) {
@@ -400,45 +400,45 @@
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= $this->showfield($lang['AdminDBAlias']." [0]",0,"dbalias");
+ $r .= $this->showfield($lang['AdminDBAlias']." [0]",0,"dbalias");
$r .= " <td colspan=\"5\" valign=\"top\"><input size=\"". min($table['database']['dbalias'][size],30) ."\" maxlength=\"".$table['database']['dbalias'][size]."\" name=\"dbalias\" id=\"dbalias\" value=\"". $tutos[dbalias][0] ."\"><br />\n";
$r .= $this->info_help_test('dbalias');
$r .= " </td>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= $this->showfield($lang['AdminDBHost']." [0]",1,"dbhost");
+ $r .= $this->showfield($lang['AdminDBHost']." [0]",1,"dbhost");
$r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['dbhost'][size],30) ."\" maxlength=\"". $table['database']['dbhost'][size] ."\" name=\"dbhost\" id=\"dbhost\" value=\"". $tutos[dbhost][0] ."\"><br />\n";
$r .= $this->info_help_test('dbhost');
$r .= " </td>\n";
- $r .= $this->showfield($lang['AdminDBPort']." [0]",1,"dbport");
+ $r .= $this->showfield($lang['AdminDBPort']." [0]",1,"dbport");
$r .= " <td colspan=\"2\" valign=\"top\"><input size=\"5\" maxlength=\"5\" name=\"dbport\" id=\"dbport\" value=\"". $tutos[dbport][0] ."\"><br />\n";
$r .= $this->info_help_test('dbport');
$r .= " </td>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= $this->showfield($lang['AdminDBUser']." [0]",1,"dbuser");
+ $r .= $this->showfield($lang['AdminDBUser']." [0]",1,"dbuser");
$r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['dbuser'][size],30) ."\" maxlength=\"". $table['database']['dbuser'][size] ."\" name=\"dbuser\" id=\"dbuser\" value=\"". $tutos[dbuser][0] ."\"><br />\n";
$r .= $this->info_help_test('dbuser');
$r .= " </td>\n";
- $r .= $this->showfield($lang['AdminDBPass']." [0]",0,"dbpasswd");
+ $r .= $this->showfield($lang['AdminDBPass']." [0]",0,"dbpasswd");
$r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['dbpass'][size],30) ."\" maxlength=\"". $table['database']['dbpass'][size] ."\" name=\"dbpasswd\" id=\"dbpasswd\" value=\"". $tutos[dbpasswd][0] ."\"><br />\n";
$r .= $this->info_help_test('dbpasswd');
$r .= " </td>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= $this->showfield($lang['AdminDBPrefix']." [0]",0,"dbprefix");
+ $r .= $this->showfield($lang['AdminDBPrefix']." [0]",0,"dbprefix");
$r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['prefix'][size],10) ."\" maxlength=\"". $table['database']['prefix'][size] ."\" name=\"dbprefix\" id=\"dbprefix\" value=\"". $tutos[dbprefix][0] ."\"><br />\n";
$r .= $this->info_help_test('dbprefix');
$r .= " </td>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= $this->showfield($lang['AdminDBRep']." [0]",0,"repository");
+ $r .= $this->showfield($lang['AdminDBRep']." [0]",0,"repository");
$r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['repository'][size],50) ."\" maxlength=\"". $table['database']['repository'][size] ."\" name=\"repository\" id=\"repository\" value=\"". $tutos[repository][0] ."\"><br />\n";
$r .= $this->info_help_test('repository');
$r .= " </td>\n";
@@ -483,4 +483,4 @@
<!--
SVN Info $Id$
$Author$
--->
\ No newline at end of file
+-->
Modified: trunk/php/admin/customize_show.php
===================================================================
--- trunk/php/admin/customize_show.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/admin/customize_show.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2007 - 2013 by Gero Kohnert
+ * Copyright 2007 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -102,7 +102,7 @@
$lang3[$i][$i2] = '';
}
$r .= $this->OverviewRowStart($line);
- $r .= ' <td> $lang[\''. $i .'\'][\''. $i2.'\'] = </td>'."\n";
+ $r .= ' <td>    $lang[\''. $i .'\'][\''. $i2.'\'] = </td>'."\n";
$r .= ' <td>"'. myentities($j2) .'"</td>'."\n";
$r .= ' <td>"<input name="lg2_'.$i.'__'.$i2.'" value="'. $lang2[$i][$i2] .'" />"</td>'."\n";
$r .= ' <td>"<input name="lg3_'.$i.'__'.$i2.'" value="'. $lang3[$i][$i2] .'" />"</td>'."\n";
@@ -120,7 +120,7 @@
$r .= ' <td>$lang[\''. $i .'\'] = </td>'."\n";
$r .= ' <td>"'. myentities($j) .'"</td>'."\n";
$r .= ' <td>"<input name="lg2_'.$i.'" value="'. $lang2[$i] .'" />"</td>'."\n";
- $r .= ' <td>"<input name="lg3_'.$i.'" value="'. $lang3[$i] .'" />" </td>'."\n";
+ $r .= ' <td>"<input name="lg3_'.$i.'" value="'. $lang3[$i] .'" />" </td>'."\n";
$r .= $this->OverviewRowEnd($line++);
}
}
@@ -221,4 +221,4 @@
<!--
SVN Info $Id$
$Author$
--->
\ No newline at end of file
+-->
Modified: trunk/php/admin/scheme.php
===================================================================
--- trunk/php/admin/scheme.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/admin/scheme.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001-2013 by Gero Kohnert
+ * Copyright 2001-2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -47,7 +47,7 @@
flush();
$out = 0;
if ( is_object($this->obj->conn) || is_resource($this->obj->conn) ) {
- $r .= " Looks OK <i>(". $this->obj->gettype() ." -> ". $this->obj .")</i> !<br />\n";
+ $r .= "  Looks OK <i>(". $this->obj->gettype() ." -> ". $this->obj .")</i> !<br />\n";
} else {
$r .= "failed to open Database <br />";
flush();
@@ -393,4 +393,4 @@
<!--
SVN Info $Id$
$Author$
--->
\ No newline at end of file
+-->
Modified: trunk/php/admin/table_custom_show.php
===================================================================
--- trunk/php/admin/table_custom_show.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/admin/table_custom_show.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2007 - 2013 by Gero Kohnert
+ * Copyright 2007 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -57,7 +57,7 @@
$pre .= $this->OverviewRowStart($line);
$pre .= ' <td colspan="11"><b>'.$tbl[name];
if (isset($tbl[Desc])) {
- $pre .= ' <i>('.$tbl[Desc].')</i>';
+ $pre .= '  <i>('.$tbl[Desc].')</i>';
}
$pre .= "</b></td>\n";
$pre .= $this->OverviewRowEnd($line);
@@ -131,4 +131,4 @@
<!--
SVN Info $Id$
$Author$
--->
\ No newline at end of file
+-->
Modified: trunk/php/admin/update.php
===================================================================
--- trunk/php/admin/update.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/admin/update.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2013 by Gero Kohnert
+ * Copyright 2002 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -43,10 +43,10 @@
}
echo $f[Desc] ."<br />\n";
if (!isset($f[name])) {
- echo ' unknown name '.$f[Desc].' ('.$i2.') ';
+ echo ' unknown name '.$f[Desc].' ('.$i2.') ';
continue;
}
- echo " Table ". $f[name];
+ echo " Table ". $f[name];
if (!is_object($this->obj->createtable($f))) {
echo ' not created: <span class="warn">'. $this->obj->lasterror .'</span>';
} else {
@@ -69,10 +69,10 @@
if (isset($f2['ftype']) && ($f2['ftype'] == 'ObjectRel')) continue;
if (isset($f2['ftype']) && ($f2['ftype'] == 'ObjectRelBack')) continue;
if (!isset($f[name])) {
- echo ' unknown name '.$f[Desc].' ('.$i2.') ';
+ echo ' unknown name '.$f[Desc].' ('.$i2.') ';
continue;
}
- echo ' Column '.$f[name].' ('.$i2.') ';
+ echo ' Column '.$f[name].' ('.$i2.') ';
if (!is_object($this->obj->createcolumn($f[name],$i2,$f2))) {
echo 'not created: <span class="warn">'. $this->obj->lasterror .'</span>';
// nothing created (try an alter table to fix sizes)
@@ -274,4 +274,4 @@
<!--
SVN Info $Id$
$Author$
--->
\ No newline at end of file
+-->
Modified: trunk/php/admin_show.php
===================================================================
--- trunk/php/admin_show.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/admin_show.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2013 by Gero Kohnert
+ * Copyright 2001 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -634,9 +634,9 @@
$tutos['pagescript'] .= "$('#jquery').html(jQuery().jquery);\n";
if ($this->getLayoutName() == 'mobile_layout')
- $tutos['pagescript'] .= "$('#jqmversion').html(', JQuery Mobile:'+$.mobile.version);\n";
+ $tutos['pagescript'] .= "$('#jqmversion').html(', JQuery Mobile:'+$.mobile.version);\n";
else
- $tutos['pagescript'] .= "$('#jqueryui').html(', JQuery UI:'+$.ui.version);\n";
+ $tutos['pagescript'] .= "$('#jqueryui').html(', JQuery UI:'+$.ui.version);\n";
if (function_exists('apache_get_version')) {
$r .= $this->ContentRowStart();
Modified: trunk/php/admin_sync.php
===================================================================
--- trunk/php/admin_sync.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/admin_sync.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2012 by Gero Kohnert
+ * Copyright 2001 - 2014 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -10,6 +10,8 @@
* @module admin_sync
* @package BASE
*/
+$tutos['files'][__FILE__] = '$Rev$';
+
require_once 'webelements.p3';
require_once 'permission.p3';
@@ -29,7 +31,7 @@
global $current_user;
$r = '';
-# echo $r->numfields()." :".$r->numrows() ."<br />\n";
+ # echo $r->numfields()." :".$r->numrows() ."<br />\n";
$fc = $res->numfields();
$b = 0;
$upd = "UPDATE ". $dbconn2->prefix . $t[name] ;
@@ -48,7 +50,7 @@
$fn = strtoupper($res->fieldname($b));
$ft = strtoupper($res->fieldtype($b));
$fv = $res->get($a,$fn);
-# echo $b .": |". $fn ."|". $fv ."|". $ft ."|<br />";
+ # echo $b .": |". $fn ."|". $fv ."|". $ft ."|<br />";
// OLD VERSIONS
if ( ($t[name] == "products") && ( ($fn == "MANAGER") || ($fn == "SELLER") || ($fn == "MANAGER2") ) ) {
$b++;
@@ -129,7 +131,7 @@
if ( $pre == "(" ) {
$r .= "<span class=\"warn\"> no values ???</span><br />\n";
$q[2] = $r; # infos
- return $q;
+ return $q;
}
$flds .= ")";
$vals .= ")";
@@ -138,7 +140,7 @@
$q[1] = $upd;
$q[2] = $r; # infos
- return $q;
+ return $q;
}
/**
@@ -295,7 +297,7 @@
$q2 = $this->result2insert($dbconn1,$dbconn2,$table[$i],$res,$a);
$r .= $q2[2];
$dbconn2->Exec($q2[0]);
- # $r .= " ". $fc ." ". $q2[0] ."<br />\n";
+ # $r .= "  ". $fc ." ". $q2[0] ."<br />\n";
flush();
$a++;
}
@@ -397,14 +399,14 @@
$r .= " <th colspan=\"3\">". $lang['AdminDBSync'] ."</th>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= " <th> </th>\n";
+ $r .= " <th> </th>\n";
$r .= " <th>". $lang['AdminDBSource'] ."</th>\n";
$r .= " <th>". $lang['AdminDBTarget'] ."</th>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= " <td> </td>\n";
+ $r .= " <td> </td>\n";
$r .= " <td>". $db1->getLink() ."</td>\n";
$r .= " <td>". $db2->getLink() ."</td>\n";
$r .= "</tr>\n";
@@ -472,7 +474,7 @@
// Does this make sense ?
if ( ($this->what != 1 ) && ($db1->lastsync->notime) ) {
$r .= "<tr>\n";
- $r .= $this->showfield(" ");
+ $r .= $this->showfield(" ");
$r .= " <td colspan=\"2\"><span class=\"warn\">You must first sync before update</span></td>\n";
$r .= "</tr>\n";
$stop = 1;
@@ -482,7 +484,7 @@
// because it the source was reinstalled or something like this
if ( ($this->what != 1 ) && ($seq1 < $db1->lastid) ) {
$r .= "<tr>\n";
- $r .= $this->showfield(" ");
+ $r .= $this->showfield(" ");
$r .= " <td colspan=\"2\"><span class=\"warn\">Source out of sync (". $seq1 ." < ". $db1->lastid .")</span></td>\n";
$r .= "</tr>\n";
$stop = 1;
@@ -491,7 +493,7 @@
// because it the target was reinstalled or something like this
if ( ($this->what != 1 ) && ($seq2 < $db1->lastid) ) {
$r .= "<tr>\n";
- $r .= $this->showfield(" ");
+ $r .= $this->showfield(" ");
$r .= " <td colspan=\"2\"><span class=\"warn\">Target out of sync (". $seq2 ." < ". $db1->lastid .")</span></td>\n";
$r .= "</tr>\n";
$stop = 1;
@@ -570,8 +572,8 @@
$r .= "<br />\n". $current_user->dbconn->db->getLink();
$this->addHidden("to",$this->dbconn->db->id);
} else {
-# show local available DBs
- $r .= " <select size=\"". $tutos['maxshow']."\" name=\"to\">\n";
+ # show local available DBs
+ $r .= " <select size=\"". $tutos['maxshow']."\" name=\"to\">\n";
@reset($dblist);
while ( list ($i,$f) = @each ($dblist) ) {
if ( $i < 1000 ) {
Modified: trunk/php/adodb-time.inc.php
===================================================================
--- trunk/php/adodb-time.inc.php 2013-12-27 10:36:12 UTC (rev 1207)
+++ trunk/php/adodb-time.inc.php 2014-01-02 16:03:06 UTC (rev 1208)
@@ -1,1287 +1,1285 @@
-<?php
-/**
-ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://php.weblogs.com/adodb_date_time_library
-
-PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix
-and 1970-2038 on Windows due to integer overflow for dates beyond
-those years. This library overcomes these limitations by replacing the
-native function's signed integers (normally 32-bits) with PHP floating
-point numbers (normally 64-bits).
-
-Dates from 100 A.D. to 3000 A.D. and later
-have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the
-future, but this is a theoretical limit as the computation of that year
-would take too long with the current implementation of adodb_mktime().
-
-This library replaces native functions as follows:
-
-<pre>
- getdate() with adodb_getdate()
- date() with adodb_date()
- gmdate() with adodb_gmdate()
- mktime() with adodb_mktime()
- gmmktime() with adodb_gmmktime()
- strftime() with adodb_strftime()
- strftime() with adodb_gmstrftime()
-</pre>
-
-The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT,
-and date() will convert from GMT to local time, but daylight savings is
-not handled currently.
-
-This library is independant of the rest of ADOdb, and can be used
-as standalone code.
-
-PERFORMANCE
-
-For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside
-the 32-bit signed integer range.
-
-GREGORIAN CORRECTION
-
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
-October 4, 1582 (Julian) was followed immediately by Friday, October 15,
-1582 (Gregorian).
-
-Since 0.06, we handle this correctly, so:
-
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
- == 24 * 3600 (1 day)
-
-=============================================================================
-
-COPYRIGHT
-
-(c) 2003-2005 John Lim and released under BSD-style license except for code by
-jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
-and originally found at http://www.php.net/manual/en/function.mktime.php
-
-=============================================================================
-
-BUG REPORTS
-
-These should be posted to the ADOdb forums at
-
- http://phplens.com/lens/lensforum/topics.php?id=4
-
-=============================================================================
-
-FUNCTION DESCRIPTIONS
-
-
-** FUNCTION adodb_getdate($date=false)
-
-Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a
-heuristic the first time adodb_getdate is called.
-
-
-** FUNCTION adodb_date($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-The format fields that adodb_date supports:
-
-<pre>
- a - "am" or "pm"
- A - "AM" or "PM"
- d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
- D - day of the week, textual, 3 letters; e.g. "Fri"
- F - month, textual, long; e.g. "January"
- g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
- G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
- h - hour, 12-hour format; i.e. "01" to "12"
- H - hour, 24-hour format; i.e. "00" to "23"
- i - minutes; i.e. "00" to "59"
- j - day of the month without leading zeros; i.e. "1" to "31"
- l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
- L - boolean for whether it is a leap year; i.e. "0" or "1"
- m - month; i.e. "01" to "12"
- M - month, textual, 3 letters; e.g. "Jan"
- n - month without leading zeros; i.e. "1" to "12"
- O - Difference to Greenwich time in hours; e.g. "+0200"
- Q - Quarter, as in 1, 2, 3, 4
- r - RFC 822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
- s - seconds; i.e. "00" to "59"
- S - English ordinal suffix for the day of the month, 2 characters;
- i.e. "st", "nd", "rd" or "th"
- t - number of days in the given month; i.e. "28" to "31"
- T - Timezone setting of this machine; e.g. "EST" or "MDT"
- U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
- w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
- Y - year, 4 digits; e.g. "1999"
- y - year, 2 digits; e.g. "99"
- z - day of the year; i.e. "0" to "365"
- Z - timezone offset in seconds (i.e. "-43200" to "43200").
- The offset for timezones west of UTC is always negative,
- and for those east of UTC is always positive.
-</pre>
-
-Unsupported:
-<pre>
- B - Swatch Internet time
- I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
- W - ISO-8601 week number of year, weeks starting on Monday
-
-</pre>
-
-
-** FUNCTION adodb_date2($fmt, $isoDateString = false)
-Same as adodb_date, but 2nd parameter accepts iso date, eg.
-
- adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
-
-** FUNCTION adodb_gmdate($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-
-** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
-
-Converts a local date to a unix timestamp. Unlike the function mktime(), it supports
-dates outside the 1901 to 2038 range. All parameters are optional.
-
-
-** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
-
-Converts a gmt date to a unix timestamp. Unlike the function gmmktime(), it supports
-dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters
-are currently compulsory.
-
-** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
-Convert a timestamp to a formatted GMT date.
-
-** FUNCTION adodb_strftime($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. Internally converts $fmt into
-adodb_date format, then echo result.
-
-For best results, you can define the local date format yourself. Define a global
-variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
-adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
-
- eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-
- Supported format codes:
-
-<pre>
- %a - abbreviated weekday name according to the current locale
- %A - full weekday name according to the current locale
- %b - abbreviated month name according to the current locale
- %B - full month name according to the current locale
- %c - preferred date and time representation for the current locale
- %d - day of the month as a decimal number (range 01 to 31)
- %D - same as %m/%d/%y
- %e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
- %h - same as %b
- %H - hour as a decimal number using a 24-hour clock (range 00 to 23)
- %I - hour as a decimal number using a 12-hour clock (range 01 to 12)
- %m - month as a decimal number (range 01 to 12)
- %M - minute as a decimal number
- %n - newline character
- %p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale
- %r - time in a.m. and p.m. notation
- %R - time in 24 hour notation
- %S - second as a decimal number
- %t - tab character
- %T - current time, equal to %H:%M:%S
- %x - preferred date representation for the current locale without the time
- %X - preferred time representation for the current locale without the date
- %y - year as a decimal number without a century (range 00 to 99)
- %Y - year as a decimal number including the century
- %Z - time zone or name or abbreviation
- %% - a literal `%' character
-</pre>
-
- Unsupported codes:
-<pre>
- %C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
- %g - like %G, but without the century.
- %G - The 4-digit year corresponding to the ISO week number (see %V).
- This has the same format and value as %Y, except that if the ISO week number belongs
- to the previous or next year, that year is used instead.
- %j - day of the year as a decimal number (range 001 to 366)
- %u - weekday as a decimal number [1,7], with 1 representing Monday
- %U - week number of the current year as a decimal number, starting
- with the first Sunday as the first day of the first week
- %V - The ISO 8601:1988 week number of the current year as a decimal number,
- range 01 to 53, where week 1 is the first week that has at least 4 days in the
- current year, and with Monday as the first day of the week. (Use %G or %g for
- the year component that corresponds to the week number for the specified timestamp.)
- %w - day of the week as a decimal, Sunday being 0
- %W - week number of the current year as a decimal number, starting with the
- first Monday as the first day of the first week
-</pre>
-
-=============================================================================
-
-NOTES
-
-Useful url for generating test timestamps:
- http://www.4webhelp.net/us/timestamp.php
-
-Possible future optimizations include
-
-a. Using an algorithm similar to Plauger's in "The Standard C Library"
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
-work outside 32-bit signed range, so i decided not to implement it.
-
-b. Implement daylight savings, which looks awfully complicated, see
- http://webexhibits.org/daylightsaving/
-
-
-CHANGELOG
-
-- 18 July 2005 0.21
-- In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. C...
[truncated message content] |