Re: [PHP-CVS] cvs: php4 /ext/midgard midgard.c

2001-02-22 Thread Emiliano

Andi Gutmans wrote:
> 
> You only have the module globals during requests (rinit/rshutdown). You
> can't access them in module init/module shutdown.

Yeah, I realized that moments later and removed it. But 
ZEND_INIT_MODULE_GLOBALS
will call the init_globals function before the request starts, right?

> >  PHP_MINIT_FUNCTION(midgard)
> >  {
> > MidgardClassPtr *midgard_class;
> >+
> >+   MGDLS_FETCH();
> >+   MGDG(rcfg) = NULL;
> >+   MGDG(dcfg) = NULL;
> >
> > ZEND_INIT_MODULE_GLOBALS(midgard, php_midgard_init_globals, NULL);

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-03-19 Thread Emiliano

Colin Viebrock wrote:

> There is also the license issue (which I know has been discussed before).
> But the first thing I read on the Midguard website is:
> 
> Midgard will always implement an OS development to publishing
> solution, future releases will include APIs for implementing
> commercial applications.

All of Midgard that could affect PHP is LGPL. There are applications
written using Midgard, which do not affect PHP in any way, which
are under the X license. Glibc, expat, mysqlclient, etc, all
"include APIs for implementing commercial applications". And
note that commercial != closed source in the first place.

> [There is also the fact that Midguard accepts donations and collects
> membership fees ... how is that going to change if Midguard is part of the
> main PHP distribution?]

MySQL access functions were in PHP long before it went open source. I'm
not saying that Midgard is on the same level of general usefullness
but just that the fact that there's an organization behind it
doesn't change it's licensing.

> But, to me at least, Midguard seems to be code that is a "layer above" what
> I would feel belongs in the main PHP distribution.  In the same way the DB
> abstraction class is (even the C version of it) ... and that they both
> belong in PEAR.

This is a discussion that I'm fully open to.

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-03-19 Thread Emiliano

Zeev Suraski wrote:

> >MySQL access functions were in PHP long before it went open source. I'm
> >not saying that Midgard is on the same level of general usefullness
> >but just that the fact that there's an organization behind it
> >doesn't change it's licensing.
> 
> MySQL was always opensource.  It was perhaps not opensource(tm), but it was
> opensource, before people came along and put rules on what opensource means.

OK, substitute OCI8, the argument stands.

> I tend to agree to Colin's statement.  I don't see the big added value (to
> everyone involved) in distributing midgard alongside PHP, and one of the
> reasons PEAR was born was for such extensions exactly.

Not a problem for me. But how is PEAR being made available, then?

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-03-19 Thread Emiliano

Sterling Hughes wrote:

> Yes.  But the midgard extension doesn't really do that, it provides some
> propreitary functions and classes for use by Midgard only.  The reason its
> being distributed as an extension is --

Proprietary? If you mean 'only disclose functionality to deal with' then
all
extensions to PHP are proprietary.

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-03-19 Thread Emiliano

Zeev Suraski wrote:

> >OK, substitute OCI8, the argument stands.
> 
> That's only an interface module though.  OCI8 isn't a part of PHP...

True, but as said: all elements that could possibly touch PHP
are LGPLd.

> >Not a problem for me. But how is PEAR being made available, then?
> 
> PEAR is available already.  There aren't any C modules in it yet, though.

Yes, but how will users be accessing it?

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-03-19 Thread Emiliano

Jani Taskinen wrote:

> >It probably won't get finished until people start using it.  The midgard
> >people may be the right people for the job :)
> 
> One question about this: Could we setup a separate module for Pear in the
> CVS? As now it's also 'bundled' with php.

That's exactly what I meant.

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-03-19 Thread Emiliano

Zeev Suraski wrote:

> Not quite :)  The main difference is that, unlike most other extensions,
> this extension isn't a 'glue' layer that connects PHP to some external
> resource.  In this case, we're including the resource itself.  It's more
> similar to including the source code of MySQL or PostgreSQL inside PHP, not
> a module that connects to them...

There's quite a bit of Midgard that's not in PHP. But what you're saying
is that there's too much application logic in our PHP code, I guess, and
that's simply true. We're working on that right now.

> - Is it mutually exclusive to other alternatives?  The problem Colin raised
> does exist, there are quite a few content management applications for PHP
> out there, and it's a bit unfair to them to bundle a specific one inside PHP.

Mutually exclusive? You mean if you activate the others won't work? No.

> - The license issue - does the inclusion of midgard effect the overall
> license restrictions of PHP or not?

No. Period. We have no interest in doing something like it. Besides,
talk about
pointing a bazooka at your foot...

> - Is the midgard group willing and interested in playing by the php-dev
> rules?  In particular, "Thou shalt never break the CVS build" is one of the
> 'higher laws' around here :)

Willing, absolutely. The initial checkin had a problem of always being
activated,
and the changes in PHP from 4.0.4pl1 to 4.0.5 appearantly changed some
things in the
autoconf setup and the generated files that caught us by surprise.

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP] POST in Apache server

2006-12-15 Thread Emiliano
Hi all,

I'm new in the php world and I have a problem. I want to invoke a php scr=
ipt from a web page hosted on an Apache server. The php script writes and=
deletes a file but, to be able to do that, I have to make the user to be=
myself and not the Apache server. In order to do that below is the code =
I use in the html to invoke the php script:

http://www.aa.dd.cc/cgi-bin/cgiwrap/user/script.php"; meth=
od=3D"post">
value1 *: 
value2 *: 


where script.php is placed inside ~/user/public_html/cgi-bin

The problem is that when the script is launched, as soon as the html in v=
isited, I get this error:

PHP Notice: Undefined index: val1 in /net/people/user/public_html/cgi-b=
in/script.php on line 14
PHP Notice: Undefined index: val2 in /net/people/user/public_html/cgi-b=
in/script.php on line 16

In other words, the POST issued inside the html seems not to work because=
the values val1 and val2 are not found.

If instead I do the following in the html code:


value1 *: 
value2 *: 


having placed script.php in the same directory where the html is, the POS=
T succeeds but of course the script is not able to delete the file it is =
supposed to work on because the owner becomes the apache server.

I need the first method (script.php inside cgi-bin) to work.
Does anybody know the way to solve the problem?
Any help will be appreciated,
thanks,
-emiliano


--
Passa a Infostrada. ADSL e Telefono senza limiti e senza canone Telecom
http://click.libero.it/infostrada16dic06


--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP] POST in Apache server

2006-12-15 Thread Emiliano
Hi all,

I'm new in the php world and I have a problem. I want to invoke a php script 
from a web page hosted on an Apache server. The php script writes and deletes a 
file but, to be able to do that, I have to make the user to be myself and not 
the Apache server. In order to do that below is the code
I use in the html to invoke the php script:

http://www.aa.dd.cc/cgi-bin/cgiwrap/user/script.php"; 
method="post">
value1 *: 
value2 *: 


where script.php is placed inside ~/user/public_html/cgi-bin

The problem is that when the script is launched, as soon as the html in 
visited, I get this error:

PHP Notice: Undefined index: val1 in 
/net/people/user/public_html/cgi-bin/script.php on line 14
PHP Notice: Undefined index: val2 in 
/net/people/user/public_html/cgi-bin/script.php on line 16

In other words, the POST issued inside the html seems not to work because the 
values val1 and val2 are not found.

If instead I do the following in the html code:


value1 *: 
value2 *: 


having placed script.php in the same directory where the html is, the POST 
succeeds but of course the script is not able to delete the file it is supposed 
to work on because the owner becomes the apache server.

I need the first method (script.php inside cgi-bin) to work.
Does anybody know the way to solve the problem?
Any help will be appreciated,
thanks,
-emiliano



--
Passa a Infostrada. ADSL e Telefono senza limiti e senza canone Telecom
http://click.libero.it/infostrada16dic06


--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP] POST in Apache server

2006-12-15 Thread Emiliano
Hi Richard,

sorry for bothering you, but can you please give me few more details about how 
to use isset to solve my problem?

-e



> On Fri, December 15, 2006 7:39 pm, Emiliano wrote:
> > PHP Notice: Undefined index: val1 in
> > /net/people/user/public_html/cgi-b=
> > in/script.php on line 14
> > PHP Notice: Undefined index: val2 in
> > /net/people/user/public_html/cgi-b=
> > in/script.php on line 16
>
> http://php.net/isset
>
> --
> Some people have a "gift" link here.
> Know what I want?
> I want you to buy a CD from some starving artist.
> http://cdbaby.com/browse/from/lynch
> Yeah, I get a buck. So?
>
> 


--
Passa a Infostrada. ADSL e Telefono senza limiti e senza canone Telecom
http://click.libero.it/infostrada16dic06


--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP] POST in Apache server

2006-12-15 Thread Emiliano
oh ok, I understand that. However, my problem is different: I need those values 
that instead are not found. The question is: why the POST in the chunck of code 
inside the html doesn't work? Why is the php script not finding the values 
posted in the html?

Thanks,
-emiliano


> >> On Fri, December 15, 2006 7:39 pm, Emiliano wrote:
> >> > PHP Notice: Undefined index: val1 in
> >> > /net/people/user/public_html/cgi-b=
> >> > in/script.php on line 14
>
> >>
> >> http://php.net/isset
> >>
>
>
> On Fri, December 15, 2006 8:15 pm, Emiliano wrote:
> > sorry for bothering you, but can you please give me few more details
> > about how to use isset to solve my problem?
>
> Well, in line 14, where you start using $_GET['val1'] or
> $_POST['val1'] or $_REQUEST['val1'] without bothering to check if it
> exists or not, put in a check to see if it exists before you try to
> use it.
>
> Something like:
>if (isset($_POST['val1']){
> //do something with val1 now that we know it's here
>   }
>   //don't do anything with 'val1' cuz she's not there
> ?>
>
> --
> Some people have a "gift" link here.
> Know what I want?
> I want you to buy a CD from some starving artist.
> http://cdbaby.com/browse/from/lynch
> Yeah, I get a buck. So?
>
> 


--
Passa a Infostrada. ADSL e Telefono senza limiti e senza canone Telecom
http://click.libero.it/infostrada16dic06


--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP] POST in Apache server

2006-12-15 Thread Emiliano
Yes Casey, I'm using the submit button

-emiliano



> >> On Fri, December 15, 2006 7:39 pm, Emiliano wrote:
> >> > PHP Notice: Undefined index: val1 in
> >> > /net/people/user/public_html/cgi-b=
> >> > in/script.php on line 14
>
> >>
> >> http://php.net/isset
> >>
>
>
> On Fri, December 15, 2006 8:15 pm, Emiliano wrote:
> > sorry for bothering you, but can you please give me few more details
> > about how to use isset to solve my problem?
>
> Well, in line 14, where you start using $_GET['val1'] or
> $_POST['val1'] or $_REQUEST['val1'] without bothering to check if it
> exists or not, put in a check to see if it exists before you try to
> use it.
>
> Something like:
>if (isset($_POST['val1']){
> //do something with val1 now that we know it's here
>   }
>   //don't do anything with 'val1' cuz she's not there
> ?>
>
> --
> Some people have a "gift" link here.
> Know what I want?
> I want you to buy a CD from some starving artist.
> http://cdbaby.com/browse/from/lynch
> Yeah, I get a buck. So?
>
> 


--
Passa a Infostrada. ADSL e Telefono senza limiti e senza canone Telecom
http://click.libero.it/infostrada16dic06


--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP] POST in Apache server

2006-12-15 Thread Emiliano
ok, this is what I get:

Array
(
)

PHP Notice:  Undefined index:  val1 in 
/net/people/user/public_html/cgi-bin/mail.php on line 18
PHP Notice:  Undefined index:  val2 in 
/net/people/user/public_html/cgi-bin/mail.php on line 20

-emiliano


> On your script page, add
>
>  echo "";
>  print_r($_REQUEST);
>  echo "";
>
> and tell us the result.
>
> On 12/15/06, Emiliano <[EMAIL PROTECTED]> wrote:
> > Yes Casey, I'm using the submit button
> >
> > -emiliano
> >
> >
> >
> > > >> On Fri, December 15, 2006 7:39 pm, Emiliano wrote:
> > > >> > PHP Notice: Undefined index: val1 in
> > > >> > /net/people/user/public_html/cgi-b=
> > > >> > in/script.php on line 14
> > >
> > > >>
> > > >> http://php.net/isset
> > > >>
> > >
> > >
> > > On Fri, December 15, 2006 8:15 pm, Emiliano wrote:
> > > > sorry for bothering you, but can you please give me few more details
> > > > about how to use isset to solve my problem?
> > >
> > > Well, in line 14, where you start using $_GET['val1'] or
> > > $_POST['val1'] or $_REQUEST['val1'] without bothering to check if it
> > > exists or not, put in a check to see if it exists before you try to
> > > use it.
> > >
> > > Something like:
> > >  > >   if (isset($_POST['val1']){
> > > //do something with val1 now that we know it's here
> > >   }
> > >   //don't do anything with 'val1' cuz she's not there
> > > ?>
> > >
> > > --
> > > Some people have a "gift" link here.
> > > Know what I want?
> > > I want you to buy a CD from some starving artist.
> > > http://cdbaby.com/browse/from/lynch
> > > Yeah, I get a buck. So?
> > >
> > >
> >
> >
> > --
> > Passa a Infostrada. ADSL e Telefono senza limiti e senza canone Telecom
> > http://click.libero.it/infostrada16dic06
> >
> >
> > --
> > PHP General Mailing List (http://www.php.net/)
> > To unsubscribe, visit: http://www.php.net/unsub.php
> >
> >
> 


--
Passa a Infostrada. ADSL e Telefono senza limiti e senza canone Telecom
http://click.libero.it/infostrada16dic06


--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in access.c article.c attachment.c calendar.c config.m4 element.c event.c eventmember.c file.c fudge genentry.pl group.c host.c image.c mail.c member.c mgd_access.h mgd_article.h mg

2001-02-12 Thread Emiliano

Sterling Hughes wrote:

> Hopefully without risking another lengthy thread...
> 
> What does this extension allow me (the common web developer to do)?

http://www.midgard-project.org/topic/165.html

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in access.c article.c attachment.c calendar.c config.m4 element.cevent.c eventmember.c file.c fudge genentry.pl group.c ho

2001-02-12 Thread Emiliano

Derick Rethans wrote:
> 
> On Mon, 12 Feb 2001, Emiliano wrote:
> 
> > http://www.midgard-project.org/topic/165.html
> 
> Well, that's a nice project, but why does it need to be in the PHP CVS?

I don't really understand this question. It's a PHP extension. Why do
the mysql,
or the imap extensions need to be in php cvs?

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in access.c article.c attachment.c calendar.c config.m4 element.c event.c eventmember.c file.c fudge genentry.pl group.c host.c image.c mail.c member.c mgd_access.h mgd_article.

2001-02-12 Thread Emiliano

"Sean R. Bright" wrote:
> 
> This is distributed as GNU and the GNU license is splattered throughout, is
> that a problem as we have seen with readline?

I'm not familiar with the problems you may have had with readline. If
there's a licencing
issue I'd love to talk about it.

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in access.c article.c attachment.c calendar.c config.m4 element.c event.c eventmember.c file.c fudge genentry.pl group.c ho

2001-02-12 Thread Emiliano

James Moore wrote:
> 
> > > http://www.midgard-project.org/topic/165.html
> >
> > Well, that's a nice project, but why does it need to be in the PHP CVS?
> 
> Just too add to this.. I dont see what place midgard has in PHP CVS, If I go
> and create a totally separate project which isnt a PHP extension really then
> can I put it in CVS along with everyone else?? I dont think Midgard has a
> place here maybe in a separate module or in PEAR (which would be ideal for
> it) but why main CVS? It just doesnt fit.

It _is_ a PHP extension. PEAR only hosts things written in PHP itself,
right?
Midgard is written in C, midgard applications are written in PHP using
the Midgard
extensions. I don't see the problem. _Every_ PHP extension I see
utilizes
external libraries and/or servers, and so does Midgard.

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in access.c article.c attachment.c calendar.c config.m4 element.cevent.c eventmember.c file.c fudge genentry.pl group.c

2001-02-13 Thread Emiliano

Stanislav Malyshev wrote:
> 
> E>> I'm not familiar with the problems you may have had with readline.
> E>> If there's a licencing issue I'd love to talk about it.
> 
> Basically, PHP code is non-GPL, thus you cannot have any GPL code
> distributed with PHP (since it makes all PHP "derived work", by RMSs
> logic).

Really? I support the GPL but this sounds like reversed logic to me.
Anyhow, we have no issue with the PHP part of midgard being LGPL.
The libs it links to allready are.

> We had problems with readline, since it's licensed as GPL. Now we
> have non-GPL readline implementation (though I fear nobody uses it - I
> don't really know why).

Where would you use readline in PHP?

Emile

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP] Error uploading a file

2002-11-14 Thread Emiliano Marmonti
Hello all,

  when I try to upload a file I receive the following error:
   
  Warning: Max file size of 2 bytes exceeded - file [Archivo] not saved in 
Unknown on line 

  I've looked into php.ini and it has the limit set to 2Mb. Have looked using 
phpinfo and everything looks OK. I'm sure this code was working, I'm using PHP 
v 4.01pl2

Anu help?
Thanks a lot
Emiliano Marmonti



  



-
This mail sent through IMP: http://horde.org/imp/

-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php




[PHP] proxy looses cookie

2002-06-04 Thread Emiliano Marmonti

Dear PHP-People:

Anybody knows why when I configure in my Explorer that uses a proxy, the value of 
the cookie that I has set with setcookie(...) is lost. When I disable the proxy, the 
cookie value is remained.

Anybody has had the same problem?
Thanks a lot.
Emiliano Marmonti



[PHP] Cookies?

2002-06-04 Thread Emiliano Marmonti

Dear PHP-People:

Anybody knows why when I configure in my Explorer that uses a proxy, the value of 
the cookie that I has set with setcookie(...) is lost. When I disable the proxy, the 
cookie value is remained.

Anybody has had the same problem?
Thanks a lot.
Emiliano Marmonti



[PHP] A question

2002-07-02 Thread Emiliano Marmonti

Dear people:

I have a development that I made a year ago. In the first screen I set a cookie 
that is used along all the parts of the software. This cookie establish the language 
of the software. Now some people that are installing the software are reporting me 
problems using the software like this first cookie doesn´t arrive to the navigators. 
They are installing newer versions of PHP than I have. Could be a problem of the 
globals variables? I have used the cookie like a global value along all the php files.

Thanks a lot.
Emiliano Marmonti



[PHP] A little problem

2001-01-17 Thread Emiliano Marmonti

Hello all

 I have a little problem: Sometimes when you invokes some .php page, appears "could 
not redefine function...". It looks like a Web server problem because If you try again 
one or two times, the same operation works Ok. I´m using PHP 4, Win 98 SR2, PWS and 
MySql for Windows.

Thanks.

Emiliano Marmonti




[PHP-CVS] cvs: php4 /ext/midgard Makefile.in article.c attachment.c element.c event.c eventmember.c file.c group.c host.c image.c member.c mgd_oop.h midgard.c oop.c page.c pageelement.c pagelink.c person.c preferences.c sitegroup.c snippet.c snippetdir.c style.c topic.c

2001-02-21 Thread Emiliano Heyns

emile   Wed Feb 21 14:18:55 2001 EDT

  Modified files:  
/php4/ext/midgard   Makefile.in article.c attachment.c element.c 
event.c eventmember.c file.c group.c host.c 
image.c member.c mgd_oop.h midgard.c oop.c page.c 
pageelement.c pagelink.c person.c preferences.c 
sitegroup.c snippet.c snippetdir.c style.c 
topic.c 
  Log:
  Centralized object fetching for get_object_by_guid
  
  

Index: php4/ext/midgard/Makefile.in
diff -u php4/ext/midgard/Makefile.in:1.3 php4/ext/midgard/Makefile.in:1.4
--- php4/ext/midgard/Makefile.in:1.3Sat Feb 17 15:21:49 2001
+++ php4/ext/midgard/Makefile.inWed Feb 21 14:18:54 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.3 2001/02/17 23:21:49 emile Exp $
+# $Id: Makefile.in,v 1.4 2001/02/21 22:18:54 emile Exp $
 #
 #   Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 #   Copyright (C) 2000 The Midgard Project ry
@@ -29,6 +29,7 @@
 snippetdir.c style.c sitegroup.c \
 preparser-parser.c preparser-scanner.c \
 preparser.c
+
 LTLIBRARY_SHARED_NAME = midgard.la
 LTLIBRARY_SHARED_LIBADD  = $(MIDGARD_SHARED_LIBADD)
 
Index: php4/ext/midgard/article.c
diff -u php4/ext/midgard/article.c:1.5 php4/ext/midgard/article.c:1.6
--- php4/ext/midgard/article.c:1.5  Tue Feb 20 16:24:56 2001
+++ php4/ext/midgard/article.c  Wed Feb 21 14:18:54 2001
@@ -1,4 +1,4 @@
-/* $Id: article.c,v 1.5 2001/02/21 00:24:56 davidg Exp $
+/* $Id: article.c,v 1.6 2001/02/21 22:18:54 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -396,18 +396,7 @@
WRONG_PARAM_COUNT;
}
 
-   php_midgard_get(&MidgardArticle, return_value,
-   "id,up,topic,name,title,abstract,content,author,"
-   "Date_format(created,'%d.%m.%Y') AS date,"
-   "Date_format(created,'%D %b. %Y') AS adate,"
-   "Date_format(created,'%D %M %Y') AS aldate,"
-   "extra1,extra2,extra3,article.score,type,"
-   "Unix_Timestamp(created) AS created,creator,"
-   "Unix_Timestamp(revised) AS revised,revisor,revision,"
-   "Unix_Timestamp(approved) AS approved,approver,"
-   "Unix_Timestamp(locked) AS locked,locker,"
-   "url,icon,view,print,"
-   CALENDAR_FIELDS, "article", (*id)->value.lval);
+   php_midgard_get_object(return_value, MIDGARD_OBJECT_ARTICLE, (*id)->value.lval);
 }
 
 MGD_FUNCTION(get_article_by_name)
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.4 php4/ext/midgard/attachment.c:1.5
--- php4/ext/midgard/attachment.c:1.4   Mon Feb 19 08:39:19 2001
+++ php4/ext/midgard/attachment.c   Wed Feb 21 14:18:54 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.4 2001/02/19 16:39:19 davidg Exp $
+/* $Id: attachment.c,v 1.5 2001/02/21 22:18:54 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -356,9 +356,7 @@
else if (aid == MGD_ERR_INVALID_NAME) { WRONG_PARAM_COUNT; }
else if (aid < 0) { RETURN_FALSE_BECAUSE(aid); }
 
-   php_midgard_get(&MidgardAttachment, return_value,
-   "id,name,title,mimetype,score,author,created,ptable,pid",
-   "blobs", aid);
+   php_midgard_get_object(return_value, MIDGARD_OBJECT_BLOBS, aid);
 }
 
 MGD_FUNCTION(serve_attachment)
Index: php4/ext/midgard/element.c
diff -u php4/ext/midgard/element.c:1.3 php4/ext/midgard/element.c:1.4
--- php4/ext/midgard/element.c:1.3  Sat Feb 17 15:21:49 2001
+++ php4/ext/midgard/element.c  Wed Feb 21 14:18:54 2001
@@ -1,4 +1,4 @@
-/* $Id: element.c,v 1.3 2001/02/17 23:21:49 emile Exp $
+/* $Id: element.c,v 1.4 2001/02/21 22:18:54 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -48,10 +48,7 @@
}
convert_to_long_ex(id);
 
-   php_midgard_get(&MidgardElement,
-   return_value,
-   "id,style,name,value",
-   "element", (*id)->value.lval);
+ php_midgard_get_object(return_value, MIDGARD_OBJECT_ELEMENT, 
+(*id)->value.lval);
break;
case 2:
if (zend_get_parameters_ex(2, &style, &name) != SUCCESS) {
Index: php4/ext/midgard/event.c
diff -u php4/ext/midgard/event.c:1.3 php4/ext/midgard/event.c:1.4
--- php4/ext/midgard/event.c:1.3  

[PHP-CVS] cvs: php4 /ext/midgard oop.c

2001-03-04 Thread Emiliano Heyns

emile   Sun Mar  4 13:54:00 2001 EDT

  Modified files:  
/php4/ext/midgard   oop.c 
  Log:
  Fetch sitegroup field if available
  
  
Index: php4/ext/midgard/oop.c
diff -u php4/ext/midgard/oop.c:1.9 php4/ext/midgard/oop.c:1.10
--- php4/ext/midgard/oop.c:1.9  Tue Feb 27 17:00:32 2001
+++ php4/ext/midgard/oop.c  Sun Mar  4 13:54:00 2001
@@ -1,4 +1,4 @@
-/* $Id: oop.c,v 1.9 2001/02/28 01:00:32 davidg Exp $
+/* $Id: oop.c,v 1.10 2001/03/04 21:54:00 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -454,6 +454,12 @@
 
 void php_midgard_get_object(zval *return_value, int table, int id)
 {
+#if HAV_MIDGARD_SITEGROUPS
+#define MGD_GET_OBJECT_SITEGROUP_FIELD ",sitegroup"
+#else
+#define MGD_GET_OBJECT_SITEGROUP_FIELD ""
+#endif
+
switch (table) {
   case MIDGARD_OBJECT_ARTICLE:
  php_midgard_get(&MidgardArticle, return_value,
@@ -467,37 +473,42 @@
"Unix_Timestamp(approved) AS approved,approver,"
"Unix_Timestamp(locked) AS locked,locker,"
"url,icon,view,print,"
-   CALENDAR_FIELDS,
+   CALENDAR_FIELDS
+MGD_GET_OBJECT_SITEGROUP_FIELD,
 "article", id);
  break;
 
   case MIDGARD_OBJECT_BLOBS:
  php_midgard_get(&MidgardAttachment, return_value,
-"id,name,title,mimetype,score,author,created,ptable,pid",
+"id,name,title,mimetype,score,author,created,ptable,pid"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
   "blobs", id);
  break;
 
   case MIDGARD_OBJECT_ELEMENT:
  php_midgard_get(&MidgardElement, return_value,
-"id,style,name,value",
+"id,style,name,value" MGD_GET_OBJECT_SITEGROUP_FIELD,
 "element", id);
  break;
 
   case MIDGARD_OBJECT_EVENT:
  php_midgard_get(&MidgardEvent, return_value,
 "id,up,start,end,title,description,"
-   "type,extra,owner,creator,created,revisor,revised,revision,busy", 
+   "type,extra,owner,creator,created,revisor,revised,revision,busy"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
 "event", id);
  break;
 
   case MIDGARD_OBJECT_EVENTMEMBER:
- php_midgard_get(&MidgardEventMember, return_value, "id,eid,uid,extra",
+ php_midgard_get(&MidgardEventMember, return_value, "id,eid,uid,extra"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
 "eventmember", id);
  break;
 
   case MIDGARD_OBJECT_FILE:
  php_midgard_get(&MidgardFile, return_value,
-"id,article,type,name,content,size,md5",
+"id,article,type,name,content,size,md5"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
 "file", id);
  break;
 
@@ -505,14 +516,16 @@
  php_midgard_get(&MidgardGroup, return_value, 
 "id,name,official," ADDRESS_FIELDS ","
GROUP_HOMEPAGE_FIELDS "," GROUP_EMAIL_FIELDS ","
-   "extra,owner",
+   "extra,owner"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
 "grp", id);
  break;
 
   case MIDGARD_OBJECT_HOST:
  php_midgard_get(&MidgardHost, return_value,
"id,name,port,online,root,style,info&1 AS 
auth,owner,prefix,"
-   HOSTNAME_FIELD,
+   HOSTNAME_FIELD
+MGD_GET_OBJECT_SITEGROUP_FIELD,
"host", id);
  break;
 
@@ -520,32 +533,37 @@
  php_midgard_get(&MidgardImage, return_value,
 "id,src,x,y,info&1=1 AS offline,"
"If(info&1,Concat(''),'') AS img",
+   "'\" width=\"',x,'\" height=\"',y,'\">'),'') AS img"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
"image", id);
  break;
 
   case MIDGARD_OBJECT_MEMBER:
  php_midgard_get(&MidgardMember, return_value,
-"id,gid,uid,extra", "member", id);
+"id,gid,uid,extra" MGD_GET_OBJECT_SITEGROUP_FIELD,
+"member", id);
  break;
 
   case MIDGARD_OBJECT_PAGE:
  php_midgard_get(&MidgardPage, return_value,
 "id,up,name,style,title,changed,content,author,"
-   "info&1=1 AS auth,info&2=2 AS active",
+   "info&1=1 AS auth,info&2=2 AS active"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
 "page", id);
  break;
 
   case MIDGARD_OBJECT_PAGEELEMENT:
  php_midgard_get(&MidgardPageElement, return_value,
-"id,page,name,value,info&1 AS inherit",
+"id,page,name,value,info&1 AS inherit"
+MGD_GET_OBJECT_SITEGROUP_FIELD,
 "pageelement", id);
 

[PHP-CVS] cvs: php4 /ext/midgard sitegroup.c

2001-03-05 Thread Emiliano Heyns

emile   Tue Mar  6 00:12:52 2001 EDT

  Modified files:  
/php4/ext/midgard   sitegroup.c 
  Log:
  Bug #123
  
  
Index: php4/ext/midgard/sitegroup.c
diff -u php4/ext/midgard/sitegroup.c:1.6 php4/ext/midgard/sitegroup.c:1.7
--- php4/ext/midgard/sitegroup.c:1.6Tue Feb 27 17:00:32 2001
+++ php4/ext/midgard/sitegroup.cTue Mar  6 00:12:52 2001
@@ -1,4 +1,4 @@
-/* $Id: sitegroup.c,v 1.6 2001/02/28 01:00:32 davidg Exp $
+/* $Id: sitegroup.c,v 1.7 2001/03/06 08:12:52 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -265,7 +265,8 @@
   (*zv_table)->value.str.val,
   "sitegroup=$d", (*zv_id)->value.lval,
   (*zv_sitegroup)->value.lval);
-   PHP_UPDATE_REPLIGARD((*zv_table)->value.str.val, (*zv_id)->value.lval);
+   mgd_update_repligard(mgd_handle(), (*zv_table)->value.str.val, 
+(*zv_id)->value.lval,
+  (*zv_sitegroup)->value.lval);
 }
 
 MidgardProperty MidgardSitegroupProperties [] = {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard article.c element.c event.c eventmember.c file.c group.c host.c page.c pageelement.c preferences.c snippet.c snippetdir.c style.c topic.c

2001-03-06 Thread Emiliano Heyns

emile   Tue Mar  6 02:35:03 2001 EDT

  Modified files:  
/php4/ext/midgard   article.c element.c event.c eventmember.c file.c 
group.c host.c page.c pageelement.c preferences.c 
snippet.c snippetdir.c style.c topic.c 
  Log:
  Object integrity checks cleanup
  
  

Index: php4/ext/midgard/article.c
diff -u php4/ext/midgard/article.c:1.10 php4/ext/midgard/article.c:1.11
--- php4/ext/midgard/article.c:1.10 Tue Feb 27 17:00:31 2001
+++ php4/ext/midgard/article.c  Tue Mar  6 02:35:02 2001
@@ -1,4 +1,4 @@
-/* $Id: article.c,v 1.10 2001/02/28 01:00:31 davidg Exp $
+/* $Id: article.c,v 1.11 2001/03/06 10:35:02 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -543,39 +543,18 @@
convert_to_string_ex(extra3);
convert_to_long_ex(type);
 
-   /* author must NOT be 0 */
-   if (!(*author)->value.lval)
-  RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
+   if (!mgd_exists_id(mgd_handle(), "person", "id=$id", (*author)->value.lval))
+   RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
 
-   if (!istopicowner((*topic)->value.lval)) {
-   RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
-   }
+   if (!mgd_exists_id(mgd_handle(), "topic", "id=$id", (*topic)->value.lval))
+   RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
 
-#if HAVE_MIDGARD_SITEGROUPS
-   /* up must be in same SG or be 0 */
-   if ((*up)->value.lval != 0 && !mgd_exists_id(mgd_handle(), "article",
- "id=$d AND sitegroup IN (0,$d)",
- (*up)->value.lval,
- mgd_sitegroup(mgd_handle( {
-   RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-   }
+   if ((*up)->value.lval != 0 && !mgd_exists_id(mgd_handle(), "article", "id=$id", 
+(*up)->value.lval))
+   RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
 
-   /* topic must be in same SG or be 0 */
-   if ((*topic)->value.lval != 0 && !mgd_exists_id(mgd_handle(), "topic",
-"id=$d AND sitegroup IN (0,$d)",
-(*topic)->value.lval,
-mgd_sitegroup(mgd_handle
-  ( {
-  RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
-   }
-   /* author must be in same SG */
-   if (!mgd_exists_id(mgd_handle(), "person",
- "id=$d AND sitegroup IN (0,$d)",
- (*author)->value.lval,
- mgd_sitegroup(mgd_handle( {
-  RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
+   if (!istopicowner((*topic)->value.lval)) {
+   RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
}
-#endif
 
php_midgard_create(return_value, "article",
   "up,topic,name,title,abstract,content,author,"
@@ -655,9 +634,7 @@
 MGD_FUNCTION(bool, update_article_replyto, (int id, int up))
 {
zval **id, **up;
-#if HAVE_MIDGARD_SITEGROUPS
int parent_topic;
-#endif
RETVAL_FALSE;
CHECK_MGD;
 
@@ -668,33 +645,32 @@
convert_to_long_ex(id);
convert_to_long_ex(up);
 
+   if ((*up)->value.lval != 0) {
 #if HAVE_MIDGARD_SITEGROUPS
-   parent_topic =
-  mgd_idfield(mgd_handle(), "topic", "article", (*up)->value.lval);
-   /* up must be in same SG or be 0 */
-   if ((*up)->value.lval != 0
-   && !mgd_exists_bool(mgd_handle(), "article src, article tgt",
-  "src.id=$d AND tgt.id=$d"
-  " AND (src.sitegroup=tgt.sitegroup"
-  " OR src.sitegroup=0" " OR tgt.sitegroup=0)",
-  (*id)->value.lval, (*up)->value.lval)) {
-   RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
+   if (!mgd_exists_bool(mgd_handle(), "article src, article tgt",
+   
+"src.id=$d AND tgt.id=$d"
+   " AND 
+(src.sitegroup=tgt.sitegroup"
+  
+ " OR src.sitegroup=0"
+  
+ " OR tgt.sitegroup=0)",
+   
+(*id)->value.lval, (*up)->value.lval)) {
+  RETURN_FALSE_BECAUSE(MGD_ERR_SITEGROUP_VIOLATION);
}
+#else
+   if (!mgd_exists_id(mgd_handle(), "article", "id=$d", (*up)->value.lval))
+

[PHP-CVS] cvs: php4 /ext/midgard attachment.c element.c event.c eventmember.c file.c group.c host.c image.c member.c mgd_internal.h midgard.c page.c pageelement.c pagelink.c php_midgard.h preferences.c snippet.c snippetdir.c style.c topic.c

2001-03-10 Thread Emiliano Heyns

emile   Sat Mar 10 14:43:11 2001 EDT

  Modified files:  
/php4/ext/midgard   attachment.c element.c event.c eventmember.c 
file.c group.c host.c image.c member.c 
mgd_internal.h midgard.c page.c pageelement.c 
pagelink.c php_midgard.h preferences.c snippet.c 
snippetdir.c style.c topic.c 
  Log:
  Fetch sitegroup field when listing objects
  
  

Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.7 php4/ext/midgard/attachment.c:1.8
--- php4/ext/midgard/attachment.c:1.7   Wed Feb 28 07:50:06 2001
+++ php4/ext/midgard/attachment.c   Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.7 2001/02/28 15:50:06 davidg Exp $
+/* $Id: attachment.c,v 1.8 2001/03/10 22:43:10 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -224,7 +224,7 @@
}
 
php_midgard_select(&MidgardAttachment, return_value,
-  "id,name,title,mimetype,score,author,created",
+  "id,name,title,mimetype,score,author,created" 
+SITEGROUP_SELECT,
   "blobs", "ptable=$q AND pid=$d", order,
   (*zv_table)->value.str.val, (*zv_id)->value.lval);
 }
Index: php4/ext/midgard/element.c
diff -u php4/ext/midgard/element.c:1.6 php4/ext/midgard/element.c:1.7
--- php4/ext/midgard/element.c:1.6  Tue Mar  6 02:35:02 2001
+++ php4/ext/midgard/element.c  Sat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: element.c,v 1.6 2001/03/06 10:35:02 emile Exp $
+/* $Id: element.c,v 1.7 2001/03/10 22:43:10 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -27,7 +27,7 @@
IDINIT;
CHECK_MGD;
php_midgard_select(&MidgardElement, return_value,
-  "id,name", "element", "style=$d", "name", id);
+  "id,name" SITEGROUP_SELECT, "element", "style=$d", "name", 
+id);
 }
 
 MGD_FUNCTION(ret_type, get_element, (type param))
Index: php4/ext/midgard/event.c
diff -u php4/ext/midgard/event.c:1.9 php4/ext/midgard/event.c:1.10
--- php4/ext/midgard/event.c:1.9Tue Mar  6 02:35:02 2001
+++ php4/ext/midgard/event.cSat Mar 10 14:43:10 2001
@@ -1,4 +1,4 @@
-/* $Id: event.c,v 1.9 2001/03/06 10:35:02 emile Exp $
+/* $Id: event.c,v 1.10 2001/03/10 22:43:10 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -278,12 +278,12 @@
 
 if (typev == -1)
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
-  "description,type,extra,owner,busy",
+  "description,type,extra,owner,busy" 
+SITEGROUP_SELECT,
   "event", "event.up=$d",
   sortv, (*id)->value.lval);
 else
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
-  "description,type,extra,owner,busy",
+  "description,type,extra,owner,busy" 
+SITEGROUP_SELECT,
   "event",
   "event.type=$d AND event.up=$d",
   sortv, typev, (*id)->value.lval);
@@ -335,7 +335,7 @@
 
 if (typev == -1)
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
-  "description,type,extra,owner,busy",
+  "description,type,extra,owner,busy" 
+SITEGROUP_SELECT,
   "event", "event.up=$d AND "
   "((event.start>=$d AND 
event.start<=$d) OR "
   "(event.start<=$d AND 
event.end>=$d) OR "
@@ -346,7 +346,7 @@
   
(*start)->value.lval,(*end)->value.lval);
 else
php_midgard_select(&MidgardEvent, return_value, "id,up,start,end,title,"
-  "description,type,extra,owner,busy",
+  "description,type,extra,owner,busy" 
+SITEGROUP_SELECT,
   "event",
   "event.type=$d AND event.up=$d AND "
   "((event.start>=$d AND 
event.start<=$d) OR "
@@ -402,12 +402,12 @@
RETURN_FALSE_BECAUSE(MGD_ERR_ERROR);
if (typev == -1)
php_midgard_select(&MidgardEvent,

[PHP-CVS] cvs: php4 /ext/midgard article.c

2001-03-13 Thread Emiliano Heyns

emile   Tue Mar 13 23:57:46 2001 EDT

  Modified files:  
/php4/ext/midgard   article.c 
  Log:
  Test parameter for existance before use.
  
  
Index: php4/ext/midgard/article.c
diff -u php4/ext/midgard/article.c:1.15 php4/ext/midgard/article.c:1.16
--- php4/ext/midgard/article.c:1.15 Mon Mar 12 02:19:37 2001
+++ php4/ext/midgard/article.c  Tue Mar 13 23:57:46 2001
@@ -1,4 +1,4 @@
-/* $Id: article.c,v 1.15 2001/03/12 10:19:37 davidg Exp $
+/* $Id: article.c,v 1.16 2001/03/14 07:57:46 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -852,7 +852,7 @@
if (!mgd_exists_id(mgd_handle(), "topic", "id=$d", (*topic)->value.lval))
RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
 
-   if ((*up)->value.lval != 0 && !mgd_exists_id(mgd_handle(), "article", "id=$d", 
(*up)->value.lval))
+   if (up && (*up)->value.lval != 0 && !mgd_exists_id(mgd_handle(), "article", 
+"id=$d", (*up)->value.lval))
RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
 
if (!istopicowner((*topic)->value.lval)) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard midgard.c

2001-03-15 Thread Emiliano Heyns

emile   Thu Mar 15 02:56:56 2001 EDT

  Modified files:  
/php4/ext/midgard   midgard.c 
  Log:
  Remove php_error for situations where Midgard is loaded but not configured
  (which is valid).
  
  
Index: php4/ext/midgard/midgard.c
diff -u php4/ext/midgard/midgard.c:1.22 php4/ext/midgard/midgard.c:1.23
--- php4/ext/midgard/midgard.c:1.22 Sat Mar 10 14:43:10 2001
+++ php4/ext/midgard/midgard.c  Thu Mar 15 02:56:56 2001
@@ -1,4 +1,4 @@
-/* $Id: midgard.c,v 1.22 2001/03/10 22:43:10 emile Exp $
+/* $Id: midgard.c,v 1.23 2001/03/15 10:56:56 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -390,9 +390,10 @@
MGDG(rcfg) = (midgard_request_config *)
ap_get_module_config(r->request_config, midgard_module);
if(MGDG(rcfg) == NULL) {
+  /* Midgard is probably not enabled for this host, only log debug info */
MGD_LOG_START("Cannot get midgard module config")
MGD_LOG_END()
-   php_error(E_NOTICE, "Cannot get midgard module config");
+
MGDG(rcfg) = NULL;
MGDG(dcfg) = NULL;
return SUCCESS;
@@ -403,6 +404,10 @@
if(MGDG(dcfg) == NULL) {
MGD_LOG_START("Cannot get midgard module directory config")
MGD_LOG_END()
+
+  /* this is an error, since if we can get the module config we should
+ also be able to get this
+  */
php_error(E_NOTICE, "Cannot get midgard module directory config");
MGDG(rcfg) = NULL;
MGDG(dcfg) = NULL;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard attachment.c

2001-03-15 Thread Emiliano Heyns

emile   Thu Mar 15 13:57:49 2001 EDT

  Modified files:  
/php4/ext/midgard   attachment.c 
  Log:
  closing file after serving it.
  
  
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.10 php4/ext/midgard/attachment.c:1.11
--- php4/ext/midgard/attachment.c:1.10  Sun Mar 11 15:30:36 2001
+++ php4/ext/midgard/attachment.c   Thu Mar 15 13:57:48 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.10 2001/03/11 23:30:36 davidg Exp $
+/* $Id: attachment.c,v 1.11 2001/03/15 21:57:48 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -434,6 +434,7 @@
if (sapi_send_headers() != SUCCESS) {
mgd_free_pool(pool);
mgd_release(res);
+  fclose(fp);
 
RETURN_FALSE_BECAUSE(MGD_ERR_INTERNAL);
}
@@ -442,6 +443,7 @@
PHPWRITE(buf, b);
}
 
+   fclose(fp);
mgd_free_pool(pool);
mgd_release(res);
RETVAL_TRUE;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard article.c

2001-03-16 Thread Emiliano Heyns

emile   Fri Mar 16 07:01:35 2001 EDT

  Modified files:  
/php4/ext/midgard   article.c 
  Log:
  String used as long.
  
  
Index: php4/ext/midgard/article.c
diff -u php4/ext/midgard/article.c:1.16 php4/ext/midgard/article.c:1.17
--- php4/ext/midgard/article.c:1.16 Tue Mar 13 23:57:46 2001
+++ php4/ext/midgard/article.c  Fri Mar 16 07:01:35 2001
@@ -1,4 +1,4 @@
-/* $Id: article.c,v 1.16 2001/03/14 07:57:46 emile Exp $
+/* $Id: article.c,v 1.17 2001/03/16 15:01:35 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -780,6 +780,7 @@
zval **url, **calstart, **caldays, **icon, **view, **print;
zval **extra1, **extra2, **extra3;
zval **type, **score, **up, *self;
+   long upval;
 
RETVAL_FALSE;
CHECK_MGD;
@@ -852,8 +853,11 @@
if (!mgd_exists_id(mgd_handle(), "topic", "id=$d", (*topic)->value.lval))
RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
 
-   if (up && (*up)->value.lval != 0 && !mgd_exists_id(mgd_handle(), "article", 
"id=$d", (*up)->value.lval))
-   RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
+   if (up) {
+  upval = atol((*up)->value.str.val);
+  if (upval != 0 && !mgd_exists_id(mgd_handle(), "article", "id=$d", upval))
+ RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
+   }
 
if (!istopicowner((*topic)->value.lval)) {
RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard midgard.c

2001-03-19 Thread Emiliano Heyns

emile   Mon Mar 19 01:49:59 2001 EDT

  Modified files:  
/php4/ext/midgard   midgard.c 
  Log:
  return userid from mgd_auth_midgard
  
  
Index: php4/ext/midgard/midgard.c
diff -u php4/ext/midgard/midgard.c:1.23 php4/ext/midgard/midgard.c:1.24
--- php4/ext/midgard/midgard.c:1.23 Thu Mar 15 02:56:56 2001
+++ php4/ext/midgard/midgard.c  Mon Mar 19 01:49:58 2001
@@ -1,4 +1,4 @@
-/* $Id: midgard.c,v 1.23 2001/03/15 10:56:56 emile Exp $
+/* $Id: midgard.c,v 1.24 2001/03/19 09:49:58 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -742,7 +742,7 @@
 
default:
if (rv >= 0) {
-   RETVAL_TRUE;
+   RETVAL_LONG(rv);
}
else {
RETURN_FALSE_BECAUSE(MGD_ERR_INTERNAL);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP] Mysql question

2002-02-06 Thread Emiliano Marmonti

I have a site using PHP & Mysql. About a month ago to now one of the tables
gets corrupted with the message Got Error 127... I fix it and everything
works OK, except every time I loose 1 record.

Today I could obtain mysql.err from the machine and I could see whenever an
error is produced by date, previously I have the following line:

020205  9:57:46  Aborted connection 137 to db: 'Biblioteca' user: 'ODBC'
host: `localhost' (Server shutdown in progress)
020205  9:57:46  Aborted connection 124 to db: 'Biblioteca' user: 'ODBC'
host: `localhost' (Server shutdown in progress)
or

020205 12:55:51  Aborted connection 377 to db: 'Biblioteca' user: 'ODBC'
host: `localhost' (Unknown error)
020205 13:05:37  Aborted connection 504 to db: 'Biblioteca' user: 'ODBC'
host: `localhost' (Unknown error)


It doesn´t seems too clear for me because no ODBC client should be accessing
to the database. Should I suppose that an unautorized ODBC client is
breaking the table or could be another problem?

Thanks a lot.
Emiliano.





Re: [PHP] Mysql question

2002-02-06 Thread Emiliano Marmonti

Yes, sorry by the off-topic but I wanted to know if wnybody here could help
me because in mysql I couldn´t find any answer. Also I have seen a lot of
questions relative to mysql answered here.

But you´re right it´s a off-topic.
Emiliano.




-Original Message-
From: Sam Masiello <[EMAIL PROTECTED]>
To: Emiliano Marmonti <[EMAIL PROTECTED]>
Date: Wednesday, February 06, 2002 12:45 PM
Subject: Re: [PHP] Mysql question


>
>This is really a question for a MySQL mailing list, not a PHP list since
>this question has nothing to do with PHP.  You can email the MySQL mailing
>list at [EMAIL PROTECTED], and you can join the MySQL mailing list off
>of the MySQL web site at www.mysql.com.
>
>HTH
>
>Sam Masiello
>Software Quality Assurance Engineer
>Synacor
>(716) 853-1362 X289
>[EMAIL PROTECTED]
>
>- Original Message -
>From: "Emiliano Marmonti" <[EMAIL PROTECTED]>
>To: "Lista PHP" <[EMAIL PROTECTED]>
>Sent: Wednesday, February 06, 2002 4:32 AM
>Subject: [PHP] Mysql question
>
>
>I have a site using PHP & Mysql. About a month ago to now one of the tables
>gets corrupted with the message Got Error 127... I fix it and everything
>works OK, except every time I loose 1 record.
>
>Today I could obtain mysql.err from the machine and I could see whenever an
>error is produced by date, previously I have the following line:
>
>020205  9:57:46  Aborted connection 137 to db: 'Biblioteca' user: 'ODBC'
>host: `localhost' (Server shutdown in progress)
>020205  9:57:46  Aborted connection 124 to db: 'Biblioteca' user: 'ODBC'
>host: `localhost' (Server shutdown in progress)
>or
>
>020205 12:55:51  Aborted connection 377 to db: 'Biblioteca' user: 'ODBC'
>host: `localhost' (Unknown error)
>020205 13:05:37  Aborted connection 504 to db: 'Biblioteca' user: 'ODBC'
>host: `localhost' (Unknown error)
>
>
>It doesn´t seems too clear for me because no ODBC client should be
accessing
>to the database. Should I suppose that an unautorized ODBC client is
>breaking the table or could be another problem?
>
>Thanks a lot.
>Emiliano.
>
>
>
>


-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php




[PHP] newbie problem under Solaris

2002-04-30 Thread Emiliano Marmonti

Hi people,

I know there is a lot of material about it. I´m installing PHP under Solaris 8 and 
obtain the message that gcc cannot create executables. I know that gcc has libraries 
that are not installed by default under Solaris. If I download a version of gcc newer 
and complete will I pass this problem? Can you recommend me a site with some 
instructions about doing that (I never had to install gcc)? Is a hard work?

Thanks in advance

-
Emiliano H.Marmonti
Informático Módulo de Bibliotecas
Programa SIU
Ministerio de Educación de la Nación



[PHP] Another doubt in Solaris-PHP install

2002-05-03 Thread Emiliano Marmonti

Hi people,
I've downloaded gcc package, make package and libtool package for proper compiling.
I have finished the config process.
When I try to make appears:

libtool: ar not found
make[1] Error 1

But I can invoke libtool
I'm using Solaris 8 under a SPARC machine
Thanks a lot.

-
Emiliano H.Marmonti
Informático Módulo de Bibliotecas
Programa SIU
Ministerio de Educación de la Nación



[PHP] Using zip files

2001-11-24 Thread Emiliano Marmonti



Hi people,
 
    I´m looking for alternatives in 
using zip files. Our users should upload into our server zipped files and we 
need to unzip this files and process it. I have read there is a library that 
could be used like an extension, but I´ve tried to use it from NT and don´t 
seems like the extension was added and when I try to use the commands PHP says 
that don´t recognoice the commands. In the other hand somebody has told me that 
PHP must be recompiled for using this library. Our platform is Windows NT but in 
the future could be Solaris.
 
    Anybody could send me your 
experience?
 
    Thanks in advance.
    
Emiliano.

-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]


[PHP] ZIP Files?

2001-11-25 Thread Emiliano Marmonti




Hi people,
 
    I´m looking for alternatives in 
using zip files. Our users should upload into our server zipped files and we 
need to unzip this files and process it. I have read there is a library that 
could be used like an extension, but I´ve tried to use it from NT and don´t 
seems like the extension was added and when I try to use the commands PHP says 
that don´t recognoice the commands. In the other hand somebody has told me that 
PHP must be recompiled for using this library. Our platform is Windows NT but in 
the future could be Solaris.
 
    Anybody could send me your 
experience?
 
    Thanks in advance.
    
Emiliano

-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]


[PHP] ZIp files? Help needed...

2001-11-28 Thread Emiliano Marmonti

Hi people,

I´m looking for alternatives in using zip files. Our users should upload into our 
server zipped files and we need to unzip this files and process it. I have read there 
is a library that could be used like an extension, but I´ve tried to use it from NT 
and don´t seems like the extension was added and when I try to use the commands PHP 
says that don´t recognoice the commands. In the other hand somebody has told me that 
PHP must be recompiled for using this library. Our platform is Windows NT but in the 
future could be Solaris.

Anybody could send me your experience?




[PHP-CVS] cvs: php4 /ext/midgard article.c

2001-03-21 Thread Emiliano Heyns

emile   Wed Mar 21 06:53:29 2001 EDT

  Modified files:  
/php4/ext/midgard   article.c 
  Log:
  Disallow duplicate article names under one parent
  
  
Index: php4/ext/midgard/article.c
diff -u php4/ext/midgard/article.c:1.17 php4/ext/midgard/article.c:1.18
--- php4/ext/midgard/article.c:1.17 Fri Mar 16 07:01:35 2001
+++ php4/ext/midgard/article.c  Wed Mar 21 06:53:28 2001
@@ -1,4 +1,4 @@
-/* $Id: article.c,v 1.17 2001/03/16 15:01:35 emile Exp $
+/* $Id: article.c,v 1.18 2001/03/21 14:53:28 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -556,6 +556,11 @@
RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
}
 
+   if (mgd_exists_id(mgd_handle(), "article", "topic=$d AND name=$q",
+ (*topic)->value.lval, (*name)->value.str.val)) {
+  RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
+   }
+
php_midgard_create(return_value, "article",
   "up,topic,name,title,abstract,content,author,"
   "url,calstart,caldays,icon,view,print,"
@@ -857,6 +862,11 @@
   upval = atol((*up)->value.str.val);
   if (upval != 0 && !mgd_exists_id(mgd_handle(), "article", "id=$d", upval))
  RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
+   }
+
+   if (mgd_exists_id(mgd_handle(), "article", "topic=$d AND name=$q AND id<>$d",
+ (*topic)->value.lval, (*name)->value.str.val, (*id)->value.lval)) {
+  RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
}
 
if (!istopicowner((*topic)->value.lval)) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard article.c element.c page.c pageelement.c topic.c

2001-03-22 Thread Emiliano Heyns

emile   Thu Mar 22 07:11:41 2001 EDT

  Modified files:  
/php4/ext/midgard   article.c element.c page.c pageelement.c topic.c 
  Log:
  Added update duplicate checks
  
  
Index: php4/ext/midgard/article.c
diff -u php4/ext/midgard/article.c:1.18 php4/ext/midgard/article.c:1.19
--- php4/ext/midgard/article.c:1.18 Wed Mar 21 06:53:28 2001
+++ php4/ext/midgard/article.c  Thu Mar 22 07:11:40 2001
@@ -1,4 +1,4 @@
-/* $Id: article.c,v 1.18 2001/03/21 14:53:28 emile Exp $
+/* $Id: article.c,v 1.19 2001/03/22 15:11:40 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -556,7 +556,8 @@
RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
}
 
-   if (mgd_exists_id(mgd_handle(), "article", "topic=$d AND name=$q",
+   /* skip duplicate check for empty names because the name isn't mandatory */
+   if ((*name)->value.str.len && mgd_exists_id(mgd_handle(), "article", "topic=$d AND 
+name=$q",
  (*topic)->value.lval, (*name)->value.str.val)) {
   RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
}
@@ -864,7 +865,8 @@
  RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
}
 
-   if (mgd_exists_id(mgd_handle(), "article", "topic=$d AND name=$q AND id<>$d",
+   /* skip duplicate check for empty names because the name isn't mandatory */
+   if ((*name)->value.str.len && mgd_exists_id(mgd_handle(), "article", "topic=$d AND 
+name=$q AND id<>$d",
  (*topic)->value.lval, (*name)->value.str.val, (*id)->value.lval)) {
   RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
}
Index: php4/ext/midgard/element.c
diff -u php4/ext/midgard/element.c:1.7 php4/ext/midgard/element.c:1.8
--- php4/ext/midgard/element.c:1.7  Sat Mar 10 14:43:10 2001
+++ php4/ext/midgard/element.c  Thu Mar 22 07:11:40 2001
@@ -1,4 +1,4 @@
-/* $Id: element.c,v 1.7 2001/03/10 22:43:10 emile Exp $
+/* $Id: element.c,v 1.8 2001/03/22 15:11:40 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -146,6 +146,11 @@
if (!isstyleowner(mgd_idfield(mgd_handle(), "style", "element",
  (*id)->value.lval)))
   RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
+
+   if (mgd_exists_id(mgd_handle(), "element", "style=$d AND name=$q AND id<>$d",
+ mgd_idfield(mgd_handle(), "style", "element", (*id)->value.lval),
+ (*name)->value.str.val, (*id)->value.lval))
+  RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
 
php_midgard_update(return_value, "element", "name=$q,value=$q",
   (*id)->value.lval,
Index: php4/ext/midgard/page.c
diff -u php4/ext/midgard/page.c:1.12 php4/ext/midgard/page.c:1.13
--- php4/ext/midgard/page.c:1.12Sat Mar 10 14:43:10 2001
+++ php4/ext/midgard/page.c Thu Mar 22 07:11:40 2001
@@ -1,4 +1,4 @@
-/* $Id: page.c,v 1.12 2001/03/10 22:43:10 emile Exp $
+/* $Id: page.c,v 1.13 2001/03/22 15:11:40 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -255,6 +255,11 @@

if (!mgd_exists_id(mgd_handle(), "person", "id=$d", (*author)->value.lval))
   RETURN_FALSE_BECAUSE(MGD_ERR_NOT_EXISTS);
+
+   if (mgd_exists_id(mgd_handle(), "page", "up=$d AND name=$q AND id<>$d",
+ mgd_idfield(mgd_handle(), "up", "page", (*id)->value.lval),
+ (*name)->value.str.val, (*id)->value.lval))
+  RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
 
php_midgard_update(return_value, "page",
   "name=$q,style=$d,title=$q,changed=Curdate(),"
Index: php4/ext/midgard/pageelement.c
diff -u php4/ext/midgard/pageelement.c:1.7 php4/ext/midgard/pageelement.c:1.8
--- php4/ext/midgard/pageelement.c:1.7  Sat Mar 10 14:43:10 2001
+++ php4/ext/midgard/pageelement.c  Thu Mar 22 07:11:40 2001
@@ -1,4 +1,4 @@
-/* $Id: pageelement.c,v 1.7 2001/03/10 22:43:10 emile Exp $
+/* $Id: pageelement.c,v 1.8 2001/03/22 15:11:40 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -145,6 +145,11 @@
if (!ispageowner(mgd_idfield(mgd_handle(), "page", "pageelement",
 (*id)->value.lval)))
   RETURN_FALSE_BECAUSE(MGD_ERR_ACCESS_DENIED);
+
+   if (mgd_exists_id(mgd_handle(), "pageelement", "page=$d AND name=$q AND id<>$d",
+ mgd_idfield(mgd_handle(), "page", "pageelement", (*id)->value.lval),
+ (*name)->value.str.val, (*id)->value.lval))
+  RETURN_FALSE_BECAUSE(MGD_ERR_DUPLICATE);
 
php_midgard_update(return_value, "pageelement",
   "name=$q,value=$q,info=$d", (*id)->value.lval,
Index: php4/ext/midgard/top

[PHP] A problem under Solaris

2001-03-22 Thread Emiliano Marmonti

Hello all

  I´m trying to compile PHP 4.0 under Solaris 8.0 - SPARC 250. When I try to configure 
using the appropiate script, it test for the existence of one package called lex and 
another called flex, both couldn´t be found and the script can´t continue. Anybody has 
be in the same trouble? Any idea? What are those packages?

Thanks in advance
Emiliano




Re: [PHP] A problem under Solaris

2001-03-22 Thread Emiliano Marmonti

Thank you Sebastian,
but I want to know what is flex (and I don´t know where could I obtain it).

Thanks again.
Emiliano.



-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP] Another problem installing PHP under Solaris 8.0

2001-03-23 Thread Emiliano Marmonti

Dear Friends:

   I have had another problem, after succesfully find flex package installed
in this machine and make a link to a folder that is included in PATH.
After ./configure, after the message that PHP was configured OK, following
the instructions I write: make.

   This is the error that appears

Making all in Zend
make[1]: Entering directory '/usr/local/php-4.0.4pl1/Zend'
/bin/sh../libtool --silent --mode=link gcc -g -02 -o libZend_c.la
zend_language_scanner.lo zend_ini_scanner.lo
../libtool: ar: not found
make[1]: *** [libZend_c.la] Error 1
leaving directory
make[1]: *** [all- recursive] Error 1

I have looked at /php folder and exists a file called libtool. Anybody
knows what is the problem?

Thank you very much
Emiliano.




-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP] Another problem installing PHP under Solaris 8.0

2001-03-26 Thread Emiliano Marmonti


 Dear Friends:

I have had another problem, after succesfully find flex package
installed
 in this machine and make a link to a folder that is included in PATH.
 After ./configure, after the message that PHP was configured OK, following
 the instructions I write: make.

This is the error that appears

 Making all in Zend
 make[1]: Entering directory '/usr/local/php-4.0.4pl1/Zend'
 /bin/sh../libtool --silent --mode=link gcc -g -02 -o libZend_c.la
 zend_language_scanner.lo zend_ini_scanner.lo
 ../libtool: ar: not found
 make[1]: *** [libZend_c.la] Error 1
 leaving directory
 make[1]: *** [all- recursive] Error 1

 I have looked at /php folder and exists a file called libtool. Anybody
 knows what is the problem?

 Thank you very much
 Emiliano.





-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP] Again and again problem installing under Solaris

2001-03-27 Thread Emiliano Marmonti

Dear Friends

Before all, Thank you Joe, the ar package was the solution and was located
at the same place that you told me.
Now ,after making and installing all, PHP doesn´t work. I followed this
process:

./configure --with-mysql --with-apxs=/usr/apache/bin/apxs
make
make install

I have had a little problem with make install because it doesn´t find
httpd.conf. I have posted it in a folder that could find and locate the
change in the folder that originally was. Now the httpd.conf loads the
module of PHP, the module is located where httpd.conf says, there is a
PHP.INI where should be, but a simple test page doesn´t work. I have looked
at httpd.conf and found some sections that define Directories where could
follow a script secuence. I must generate a section for my PHP test folder?
Is there another special configuration? I´m using Apache 1.3.9

Thank you all.
Emiliano.



-- 
PHP General Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard preparser.c

2001-03-30 Thread Emiliano Heyns

emile   Fri Mar 30 00:15:05 2001 EDT

  Modified files:  
/php4/ext/midgard   preparser.c 
  Log:
  Don't restat the connection, trust mod_midgard
  
  
Index: php4/ext/midgard/preparser.c
diff -u php4/ext/midgard/preparser.c:1.7 php4/ext/midgard/preparser.c:1.8
--- php4/ext/midgard/preparser.c:1.7Tue Feb 27 17:00:32 2001
+++ php4/ext/midgard/preparser.cFri Mar 30 00:15:05 2001
@@ -1,4 +1,4 @@
-/* $Id: preparser.c,v 1.7 2001/02/28 01:00:32 davidg Exp $
+/* $Id: preparser.c,v 1.8 2001/03/30 08:15:05 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -296,7 +296,7 @@
/* EEH: if the page database has been defined you will want to include 
snippets from there too. */
if (rcfg->database.page && rcfg->database.page->handle
&& rcfg->database.page->handle->mgd) {
-   mgd_select_database(php_rqst, rcfg->database.page, rcfg);
+   mgd_select_database(php_rqst, rcfg->database.page, rcfg, FALSE);
db = rcfg->database.page->name; 
MGD_LOG_START("Midgard: fetching snippet '%s' from database %s")
MGD_LOG_ARG((*file)->value.str.val)
@@ -338,7 +338,7 @@
MGD_LOG_ARG(name)
MGD_LOG_ARG(db)
MGD_LOG_END()
-   mgd_select_database(php_rqst, rcfg->database.main, rcfg);
+   mgd_select_database(php_rqst, rcfg->database.main, rcfg, FALSE);
}
 
RETVAL_STRING(part,1);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL LICENSE Makefile.in README.session article.c attachment.c calendar.c config.m4 config.m4.session element.c event.c eventmember.c file.c group.c host.c image.c mail.c member.c mgd_access.h mgd_article.h mgd_attachment.h mgd_calendar.h mgd_element.h mgd_errno.pl mgd_event.h mgd_eventmember.h mgd_file.h mgd_group.h mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h mgd_member.h mgd_oop.h mgd_page.h mgd_pageelement.h mgd_pagelink.h mgd_person.h mgd_preferences.h mgd_preparser.h mgd_session.h mgd_sitegroup.h mgd_snippet.h mgd_snippetdir.h mgd_style.h mgd_topic.h midgard.c mkall oop.c page.c pageelement.c pagelink.c parameter.c person.c php_midgard.h preferences.c preparser-parser.y preparser-scanner.l preparser.c session.c session.modules.c session.sql sitegroup.c snippet.c snippetdir.c style.c topic.c

2001-03-31 Thread Emiliano Heyns

emile   Sat Mar 31 16:23:56 2001 EDT

  Removed files:   
/php4/ext/midgard   .cvsignore ChangeLog INSTALL LICENSE Makefile.in 
README.session article.c attachment.c calendar.c 
config.m4 config.m4.session element.c event.c 
eventmember.c file.c group.c host.c image.c 
mail.c member.c mgd_access.h mgd_article.h 
mgd_attachment.h mgd_calendar.h mgd_element.h 
mgd_errno.pl mgd_event.h mgd_eventmember.h 
mgd_file.h mgd_group.h mgd_host.h mgd_image.h 
mgd_internal.h mgd_mail.h mgd_member.h mgd_oop.h 
mgd_page.h mgd_pageelement.h mgd_pagelink.h 
mgd_person.h mgd_preferences.h mgd_preparser.h 
mgd_session.h mgd_sitegroup.h mgd_snippet.h 
mgd_snippetdir.h mgd_style.h mgd_topic.h 
midgard.c mkall oop.c page.c pageelement.c 
pagelink.c parameter.c person.c php_midgard.h 
preferences.c preparser-parser.y 
preparser-scanner.l preparser.c session.c 
session.modules.c session.sql sitegroup.c 
snippet.c snippetdir.c style.c topic.c 
  Log:
  
  



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP] Problem installing PHP under NT service Pack 4

2001-07-20 Thread Emiliano Marmonti

Hello!

We have had a problem trying to install as ISAPI Module PHP. Allways appears with 
a down oriented red dot in Filters. The unique solution is configuring as CGI. Anybody 
can help?

Thanks in advance...

Emiliano H.Marmonti




[PHP] mail function problem

2001-07-27 Thread Emiliano Marmonti

Dears:

I have a problem using mail function under the default IIS's SMTP. Appears an 
error, something like:

Unknown error in line 3

   Line 3 only have the instruction mail ("[EMAIL PROTECTED]","[TEST] Hola","Mensaje 
de Prueba"). 

I have tested the use of this function using another SMTP server (shareware) and works 
OK. I have tried to echo what is returning the instruction, and no returns, only the 
error message. Anybody knows what could be happening?

Thanks in advance
Emiliano Marmonti
  



[PHP] Urgent!!! Forum code

2001-08-22 Thread Emiliano Marmonti

Anybody knows a good & free PHP with Mysql code for implementing a forum?

-----
Emiliano H.Marmonti
Informático Módulo de Bibliotecas
Programa SIU
Ministerio de Educación de la Nación



[PHP] More about forums

2001-08-22 Thread Emiliano Marmonti

Dear people:

I have tested the address you have send me. I like one or two but thay are too 
complex, I don´t need registration, sessions, etc. Only I need a mail input line, a 
person line input and the text. Pretty simple but I can´t find anything like this.

Could anybody help me? Thanks a lot

-
Emiliano H.Marmonti
Informático Módulo de Bibliotecas
Programa SIU
Ministerio de Educación de la Nación



[PHP] windows files and folders permission

2013-08-22 Thread Emiliano Boragina
Night everyone, I did a upload page and when upload a JPG file this is not
available. Why this happens? Thanks a lot.


Emiliano Boragina | gráfico + web
desarrollos & comunicación

+ 15 33 92 60 02
» emiliano.borag...@gmail.com

© 2013




--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP] files and folders windows permission

2013-08-23 Thread Emiliano Boragina
Hi everyone, sorry my ugly english. I did an upload file form. Works
very good. Upload the files in the right folder, with the right name.
I use chmod 0644, and for try I use 0777. But always the files are
copyed blocked. I cant see them with windows preview for example. I
read in forums that is Windows fault. How can I fix this? Thanks a
lot.

-- 

Emiliano Boragina | gráfico + web
desarrollos & comunicación

+ 15 33 92 60 02
» emiliano.borag...@gmail.com

© 2013


--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP] FINDER

2007-10-24 Thread Emiliano Boragina
Hi everyone.

 

I need to know how do I do a FINDER of clinics for zones.

I am new in PHP, so my knowloge is not much.

The user of this finder select the zone from the list, and click in the
button, and them show a list of clinic with its data info (name, address,
phones, etc)

 

Thanks a lot!

Emiliano

 

 

 



[PHP] while

2008-02-23 Thread Emiliano Boragina
Hi everyone

I am beginner

I have the following code:

 

";

 $resultado = mysql_query ("select * from alumnos where Curso like
'$buscar'" , $conexion);

 while ( $registro = mysql_fetch_row ($resultado)) {

   echo "";

   foreach ( $registro as $clave ) {

echo "" . $clave . "";

   }

 }

 echo "";

?>









 

I want to add a message when find results on the DB: “Find n results”, when
don’t find results: “0 results”.

How and where I must write the IF, and how I do for the n (number of
results) appear.

 

Thanks a lot!

Nice weekend!

 

 

+  _
   // Emiliano Boragina _

   // Diseño & Comunicación //
+  _

   // [EMAIL PROTECTED]  /
   // 15 40 58 60 02 ///
+  _

 



[PHP] validate + if

2008-02-23 Thread Emiliano Boragina
Hi list!

 

I have a form.

I validated it with javascript.

Do the validation, but send the form information.

How can I prevent send the information and stay in the form?

When validate all correctly send the info, but if the form isn’t complete
correctly don’t send.

 

Thanks!

 

+  _
   // Emiliano Boragina _

   // Diseño & Comunicación //
+  _

   // [EMAIL PROTECTED]  /
   // 15 40 58 60 02 ///
+  _

 



[PHP] mysql_field_name

2008-02-23 Thread Emiliano Boragina
Hi list

 

I have the following code:

 

";

 $resultado = mysql_query ("select * from registro" , $conexion);

 while ( $registro = mysql_fetch_row ($resultado)) {

   echo "";

   foreach ( $registro as $clave ) {

echo "" . mysql_field_name($resultado, '') .
"";

   }

   echo "";

   echo "";

   foreach ( $registro as $clave ) {

echo "" . $clave . "";

   }

 }

 echo "";

?>

 

But the result is two TR with only the first field name of the DB.

I want to see all fields name of the DB and only in one TR… how can I do
that (in code please)?

 

Thanks.

 

+  _
   // Emiliano Boragina _

   // Diseño & Comunicación //
+  _

   // [EMAIL PROTECTED]  /
   // 15 40 58 60 02 ///
+  _

 



[PHP] dont print echo

2008-02-28 Thread Emiliano Boragina
Hi list…

All this in the same php:

 

















 

When I try the php the echo "no picture =("; is there. How can I do to don’t
appears the message before I upload de picture.

Thanks.

 

 

+  _
   // Emiliano Boragina _

   // Diseño & Comunicación //
+  _

   // [EMAIL PROTECTED]  /
   // 15 40 58 60 02 ///
+  _

 



[PHP] php + copy file

2008-04-02 Thread Emiliano Boragina
Hello

 

I have the next code:

 

 

 

-- archive_a_subir.php --

 



 

 

 

 

 



 

 

 

In archive_subir.php:

 

 

 



 

 

 

You can see this in  <http://www.portbora.com.ar/foro/archivo_a_subir.php>
http://www.portbora.com.ar/foro/archivo_a_subir.php,

when I run these appears the next warning

 

 

 

Warning: copy(subidos/) [ < <http://www.portbora.com.ar/foro/function.copy>
http://www.portbora.com.ar/foro/function.copy>

function.copy]: failed to open stream: Is a directory in
/home/pu000561/public_html/foro/archivo_subir.php on line 3

 

 

 

Why this? How can I run correctly?

 

Thanks.

 

 

 

+  

+ _

   // Emiliano Boragina _

 

   // Diseño & Comunicación //

+  

+ _

 

   // [EMAIL PROTECTED]  /

   // 15 40 58 60 02 ///

+  

+ _



[PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in access.c article.c attachment.c calendar.c config.m4 element.c event.c eventmember.c file.c fudge genentry.pl group.c host.c image.c mail.c member.c mgd_access.h mgd_article.h mgd_attachment.h mgd_calendar.h mgd_element.h mgd_errno.c mgd_errno.h mgd_errno.pl mgd_event.h mgd_eventmember.h mgd_file.h mgd_group.h mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h mgd_member.h mgd_midgard.h mgd_oop.h mgd_page.h mgd_pageelement.h mgd_pagelink.h mgd_person.h mgd_preferences.h mgd_preparser.h mgd_sitegroup.h mgd_snippet.h mgd_snippetdir.h mgd_style.h mgd_topic.h midgard-logo.h midgard-root.php midgard-team.h midgard.c mkall oop.c page.c pageelement.c pagelink.c parameter.c person.c php4_porting.txt php_midgard.h preferences.c preparser-parser.y preparser-scanner.l preparser.c sitegroup.c snippet.c snippetdir.c style.c test-db.tar.gz topic.c /ext/midgard/logo midgard-logo.gif mklogo.c

2001-02-12 Thread Emiliano Heyns

emile   Mon Feb 12 09:23:37 2001 EDT

  Added files: 
/php4/ext/midgard   .cvsignore ChangeLog INSTALL Makefile.in access.c 
article.c attachment.c calendar.c config.m4 
element.c event.c eventmember.c file.c fudge 
genentry.pl group.c host.c image.c mail.c 
member.c mgd_access.h mgd_article.h 
mgd_attachment.h mgd_calendar.h mgd_element.h 
mgd_errno.c mgd_errno.h mgd_errno.pl mgd_event.h 
mgd_eventmember.h mgd_file.h mgd_group.h 
mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h 
mgd_member.h mgd_midgard.h mgd_oop.h mgd_page.h 
mgd_pageelement.h mgd_pagelink.h mgd_person.h 
mgd_preferences.h mgd_preparser.h mgd_sitegroup.h 
mgd_snippet.h mgd_snippetdir.h mgd_style.h 
mgd_topic.h midgard-logo.h midgard-root.php 
midgard-team.h midgard.c mkall oop.c page.c 
pageelement.c pagelink.c parameter.c person.c 
php4_porting.txt php_midgard.h preferences.c 
preparser-parser.y preparser-scanner.l 
preparser.c sitegroup.c snippet.c snippetdir.c 
style.c test-db.tar.gz topic.c 
/php4/ext/midgard/logo  midgard-logo.gif mklogo.c 
  Log:
  Midgard 1.4.1 initial checkin
  
  


Index: php4/ext/midgard/.cvsignore
+++ php4/ext/midgard/.cvsignore
deps
libs
CVS
Makefile
access.lo
access.o
access.slo
acinclude.m4
aclocal.m4
article.lo
article.o
article.slo
attachment.lo
attachment.o
attachment.slo
build
calendar.lo
calendar.o
calendar.slo
config.cache
config.guess
config.log
config.status
config.sub
config_vars.mk
configure
configure.in
dynlib.m4
element.lo
element.o
element.slo
event.lo
event.o
event.slo
eventmember.lo
eventmember.o
eventmember.slo
file.lo
file.o
file.slo
group.lo
group.o
group.slo
host.lo
host.o
host.slo
image.lo
image.o
image.slo
install-sh
libs.mk
libtool
ltconfig
ltmain.sh
mail.lo
mail.o
mail.slo
member.lo
member.o
member.slo
mgd_errno.lo
mgd_errno.o
mgd_errno.slo
midgard.la
midgard.lo
midgard.o
midgard.slo
missing
mkinstalldirs
modules
oop.lo
oop.o
oop.slo
page.lo
page.o
page.slo
pageelement.lo
pageelement.o
pageelement.slo
pagelink.lo
pagelink.o
pagelink.slo
parameter.lo
parameter.o
parameter.slo
person.lo
person.o
person.slo
php_config.h
php_config.h.in
preferences.lo
preferences.o
preferences.slo
preparser-parser.h
preparser-parser.lo
preparser-parser.o
preparser-parser.slo
preparser-scanner.lo
preparser-scanner.o
preparser-scanner.slo
preparser.c.bk
preparser.lo
preparser.o
preparser.slo
sitegroup.lo
sitegroup.o
sitegroup.slo
snippet.lo
snippet.o
snippet.slo
snippetdir.lo
snippetdir.o
snippetdir.slo
style.lo
style.o
style.slo
topic.lo
topic.o
topic.slo

Index: php4/ext/midgard/Makefile.in
+++ php4/ext/midgard/Makefile.in
# $Id: Makefile.in,v 1.1 2001/02/12 17:23:36 emile Exp $

LTLIBRARY_NAME= libmidgard.la
LTLIBRARY_SOURCES = mgd_errno.c midgard.c article.c \
parameter.c attachment.c oop.c \
access.c topic.c element.c mail.c \
group.c file.c host.c image.c member.c \
calendar.c event.c eventmember.c page.c \
pageelement.c pagelink.c person.c \
preferences.c snippet.c \
snippetdir.c style.c sitegroup.c \
preparser-parser.c preparser-scanner.c \
preparser.c
LTLIBRARY_SHARED_NAME = midgard.la
LTLIBRARY_SHARED_LIBADD  = $(MIDGARD_SHARED_LIBADD)

YFLAGS=-d -v -p mgd
EXTRA_CFLAGS=-ggdb -Wall `$(GLIBCONFIG) --cflags`
include $(top_srcdir)/build/dynlib.mk

mgd_errno.c mgd_errno.h: mgd_errno.pl
perl mgd_errno.pl


Index: php4/ext/midgard/access.c
+++ php4/ext/midgard/access.c
/* $Id: access.c,v 1.1 2001/02/12 17:23:36 emile Exp $
 *
 * Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 * Copyright (C) 2000 The Midgard Project ry
 * Copyright (C) 2000 Emiliano Heyns, Aurora SA
 *
 * 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 Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#i

[PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-02-13 Thread Emiliano Heyns

emile   Tue Feb 13 08:13:34 2001 EDT

  Modified files:  
/php4/ext/midgard   config.m4 
  Log:
  Misplaced if spotted by Sascha
  
  
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.2 php4/ext/midgard/config.m4:1.3
--- php4/ext/midgard/config.m4:1.2  Tue Feb 13 03:58:34 2001
+++ php4/ext/midgard/config.m4  Tue Feb 13 08:13:34 2001
@@ -1,42 +1,42 @@
-dnl dnl $Id: config.m4,v 1.2 2001/02/13 11:58:34 sas Exp $
-dnl dnl config.m4 for extension midgard
-dnl dnl don't forget to call PHP_EXTENSION(midgard)
-dnl 
-dnl AC_PROG_YACC
-dnl AC_DECL_YYTEXT
-dnl AC_PROG_LEX
-dnl 
-dnl PHP_ARG_WITH(midgard, for midgard support,
-dnl [  --with-midgard  Include midgard 1.4 support])
-dnl 
-dnl if test "$PHP_MIDGARD" != "no"; then
-dnl   if test "$PHP_MIDGARD" != "yes"; then
-dnl AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-dnl AC_ADD_INCLUDE("$PHP_MIDGARD/include")
-dnl   else
-dnl AC_ADD_LIBRARY(midgard)
-dnl   fi
-dnl   AC_DEFINE(HAVE_MIDGARD, 1, [ ])
-dnl   PHP_EXTENSION(midgard, $ext_shared)
-dnl fi
-dnl 
-dnl dnl EEH/TODO: Add checks for apache-static compilation
-dnl AC_PATH_PROG(APXS, apxs)
-dnl if test -z $APXS; then
-dnl   AC_MSG_ERROR(apxs not found.)
-dnl fi
-dnl APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
-dnl AC_ADD_INCLUDE($APACHE_INCLUDES)
-dnl 
-dnl AC_PATH_PROG(GLIBCONFIG, glib-config)
-dnl dnl Ackackack... why do people do this?
-dnl if test -z $GLIBCONFIG; then
-dnl   AC_PATH_PROG(GLIBCONFIG, glib12-config)
-dnl fi
-dnl if test -z $GLIBCONFIG; then
-dnl   AC_MSG_ERROR(glib-config not found. Did you install glib?)
-dnl fi
-dnl AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
-dnl LFLAGS="-Pmgd -olex.yy.c"
-dnl 
-dnl PHP_SUBST(GLIBCONFIG)
+dnl $Id: config.m4,v 1.3 2001/02/13 16:13:34 emile Exp $
+dnl config.m4 for extension midgard
+dnl don't forget to call PHP_EXTENSION(midgard)
+
+AC_PROG_YACC
+AC_DECL_YYTEXT
+AC_PROG_LEX
+
+PHP_ARG_WITH(midgard, for midgard support,
+[  --with-midgard  Include midgard 1.4 support])
+
+if test "$PHP_MIDGARD" != "no"; then
+  if test "$PHP_MIDGARD" != "yes"; then
+AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
+AC_ADD_INCLUDE("$PHP_MIDGARD/include")
+  else
+AC_ADD_LIBRARY(midgard)
+  fi
+  AC_DEFINE(HAVE_MIDGARD, 1, [ ])
+  PHP_EXTENSION(midgard, $ext_shared)
+
+dnl EEH/TODO: Add checks for apache-static compilation
+  AC_PATH_PROG(APXS, apxs)
+  if test -z $APXS; then
+AC_MSG_ERROR(apxs not found.)
+  fi
+  APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
+  AC_ADD_INCLUDE($APACHE_INCLUDES)
+  
+  AC_PATH_PROG(GLIBCONFIG, glib-config)
+  dnl Ackackack... why do people do this?
+  if test -z $GLIBCONFIG; then
+AC_PATH_PROG(GLIBCONFIG, glib12-config)
+  fi
+  if test -z $GLIBCONFIG; then
+AC_MSG_ERROR(glib-config not found. Did you install glib?)
+  fi
+  AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
+  LFLAGS="-Pmgd -olex.yy.c"
+  
+  PHP_SUBST(GLIBCONFIG)
+fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard .cvsignore

2001-02-17 Thread Emiliano Heyns

emile   Sat Feb 17 14:45:37 2001 EDT

  Removed files:   
/php4/ext/midgard   .cvsignore 
  Log:
  Added generated files
  
  



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard ChangeLog INSTALL LICENSE Makefile.in access.c article.c attachment.c calendar.c config.m4 element.c event.c eventmember.c file.c fudge genentry.pl group.c host.c image.c mail.c member.c mgd_access.h mgd_article.h mgd_attachment.h mgd_calendar.h mgd_element.h mgd_errno.c mgd_errno.h mgd_errno.pl mgd_event.h mgd_eventmember.h mgd_file.h mgd_group.h mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h mgd_member.h mgd_midgard.h mgd_oop.h mgd_page.h mgd_pageelement.h mgd_pagelink.h mgd_person.h mgd_preferences.h mgd_preparser.h mgd_sitegroup.h mgd_snippet.h mgd_snippetdir.h mgd_style.h mgd_topic.h midgard-root.php midgard.c mkall oop.c page.c pageelement.c pagelink.c parameter.c person.c php4_porting.txt php_midgard.h preferences.c preparser-parser.y preparser-scanner.l preparser.c sitegroup.c snippet.c snippetdir.c style.c topic.c /ext/midgard/logo mklogo.c

2001-02-17 Thread Emiliano Heyns

emile   Sat Feb 17 15:01:51 2001 EDT

  Added files: 
/php4/ext/midgard   LICENSE 

  Removed files:   
/php4/ext/midgard   ChangeLog INSTALL Makefile.in access.c article.c 
attachment.c calendar.c config.m4 element.c 
event.c eventmember.c file.c fudge genentry.pl 
group.c host.c image.c mail.c member.c 
mgd_access.h mgd_article.h mgd_attachment.h 
mgd_calendar.h mgd_element.h mgd_errno.c 
mgd_errno.h mgd_errno.pl mgd_event.h 
mgd_eventmember.h mgd_file.h mgd_group.h 
mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h 
mgd_member.h mgd_midgard.h mgd_oop.h mgd_page.h 
mgd_pageelement.h mgd_pagelink.h mgd_person.h 
mgd_preferences.h mgd_preparser.h mgd_sitegroup.h 
mgd_snippet.h mgd_snippetdir.h mgd_style.h 
mgd_topic.h midgard-root.php midgard.c mkall 
oop.c page.c pageelement.c pagelink.c parameter.c 
person.c php4_porting.txt php_midgard.h 
preferences.c preparser-parser.y 
preparser-scanner.l preparser.c sitegroup.c 
snippet.c snippetdir.c style.c topic.c 
/php4/ext/midgard/logo  mklogo.c 
  Log:
  Trimming, license change (said GPL, actually is LGPL) removed warnings during
  compilation, removed configure bug.
  
  



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in article.c attachment.c calendar.c config.m4 element.c event.c eventmember.c file.c group.c host.c image.c mail.c member.c mgd_access.h mgd_article.h mgd_attachment.h mgd_calendar.h mgd_element.h mgd_errno.pl mgd_event.h mgd_eventmember.h mgd_file.h mgd_group.h mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h mgd_member.h mgd_midgard.h mgd_oop.h mgd_page.h mgd_pageelement.h mgd_pagelink.h mgd_person.h mgd_preferences.h mgd_preparser.h mgd_sitegroup.h mgd_snippet.h mgd_snippetdir.h mgd_style.h mgd_topic.h midgard.c mkall oop.c page.c pageelement.c pagelink.c parameter.c person.c php_midgard.h preferences.c preparser-parser.y preparser-scanner.l preparser.c sitegroup.c snippet.c snippetdir.c style.c topic.c

2001-02-17 Thread Emiliano Heyns

emile   Sat Feb 17 15:21:54 2001 EDT

  Modified files:  
/php4/ext/midgard   .cvsignore ChangeLog INSTALL Makefile.in 
article.c attachment.c calendar.c config.m4 
element.c event.c eventmember.c file.c group.c 
host.c image.c mail.c member.c mgd_access.h 
mgd_article.h mgd_attachment.h mgd_calendar.h 
mgd_element.h mgd_errno.pl mgd_event.h 
mgd_eventmember.h mgd_file.h mgd_group.h 
mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h 
mgd_member.h mgd_midgard.h mgd_oop.h mgd_page.h 
mgd_pageelement.h mgd_pagelink.h mgd_person.h 
mgd_preferences.h mgd_preparser.h mgd_sitegroup.h 
mgd_snippet.h mgd_snippetdir.h mgd_style.h 
mgd_topic.h midgard.c mkall oop.c page.c 
pageelement.c pagelink.c parameter.c person.c 
php_midgard.h preferences.c preparser-parser.y 
preparser-scanner.l preparser.c sitegroup.c 
snippet.c snippetdir.c style.c topic.c 
  Log:
  Remove/Add appearantly doesn't cancel the remove... add separately.
  
  

Index: php4/ext/midgard/.cvsignore
diff -u /dev/null php4/ext/midgard/.cvsignore:1.3
--- /dev/null   Sat Feb 17 15:21:51 2001
+++ php4/ext/midgard/.cvsignore Sat Feb 17 15:21:49 2001
@@ -0,0 +1,122 @@
+.deps
+.libs
+CVS
+Makefile
+access.lo
+access.o
+access.slo
+acinclude.m4
+aclocal.m4
+article.lo
+article.o
+article.slo
+attachment.lo
+attachment.o
+attachment.slo
+build
+calendar.lo
+calendar.o
+calendar.slo
+config.cache
+config.guess
+config.log
+config.status
+config.sub
+config_vars.mk
+configure
+configure.in
+dynlib.m4
+element.lo
+element.o
+element.slo
+event.lo
+event.o
+event.slo
+eventmember.lo
+eventmember.o
+eventmember.slo
+file.lo
+file.o
+file.slo
+group.lo
+group.o
+group.slo
+host.lo
+host.o
+host.slo
+image.lo
+image.o
+image.slo
+install-sh
+libs.mk
+libtool
+ltconfig
+ltmain.sh
+mail.lo
+mail.o
+mail.slo
+member.lo
+member.o
+member.slo
+mgd_errno.c
+mgd_errno.h
+mgd_errno.lo
+mgd_errno.o
+mgd_errno.slo
+midgard.la
+midgard.lo
+midgard.o
+midgard.slo
+missing
+mkinstalldirs
+modules
+oop.lo
+oop.o
+oop.slo
+page.lo
+page.o
+page.slo
+pageelement.lo
+pageelement.o
+pageelement.slo
+pagelink.lo
+pagelink.o
+pagelink.slo
+parameter.lo
+parameter.o
+parameter.slo
+person.lo
+person.o
+person.slo
+php_config.h
+php_config.h.in
+preferences.lo
+preferences.o
+preferences.slo
+preparser-parser.h
+preparser-parser.lo
+preparser-parser.o
+preparser-parser.slo
+preparser-scanner.lo
+preparser-scanner.o
+preparser-scanner.slo
+preparser.c.bk
+preparser.lo
+preparser.o
+preparser.slo
+sitegroup.lo
+sitegroup.o
+sitegroup.slo
+snippet.lo
+snippet.o
+snippet.slo
+snippetdir.lo
+snippetdir.o
+snippetdir.slo
+style.lo
+style.o
+style.slo
+topic.lo
+topic.o
+topic.slo
+y.output
Index: php4/ext/midgard/ChangeLog
diff -u /dev/null php4/ext/midgard/ChangeLog:1.3
--- /dev/null   Sat Feb 17 15:21:51 2001
+++ php4/ext/midgard/ChangeLog  Sat Feb 17 15:21:49 2001
@@ -0,0 +1,175 @@
+2001-01-30 10:07  emile
+
+   * MidgardClassWhatever renamed to MidgardWhatever
+
+2001-01-26 02:09  david
+
+   * httpd.error_log.tgz: this is the httpd error_log associated with
+   the backtrace (see bt.txt).
+
+2001-01-26 02:05  david
+
+   * bt.txt: backtrace of an Asgard request (running out of memory).
+
+2001-01-26 02:04  david
+
+   * preparser-parser.y, preparser-scanner.l, preparser.c: debug
+   version. Lots of log, in httpd error_log and in the browser.
+
+2001-01-25 18:25  david
+
+   * preparser-parser.y, preparser-scanner.l, preparser.c: oops,
+   forgot default rule when in eval'ed quoted strings...
+
+2001-01-25 15:18  david
+
+   * article.c: removed some useless logging in mgd_get_article.
+
+2001-01-25 15:15  david
+
+   * Makefile.in, access.c, article.c, attachment.c, config.m4,
+   element.c, host.c, mgd_access.h, midgard.c, page.c, pageelement.c,
+   pagelink.c, preparser.c, style.c, topic.c: Eliminated the warnings
+   at compile, and cleaned the code.
+
+2001-01-25 04:38  david
+
+   * ab_config.m4, ab_mgd_preparser.h, ab_preparser-parser.y,
+   ab_preparser-scanner.l, ab_preparser.c, config.m4, mgd_preparser.h,
+   mkall, preparser-parser.y, preparser-scanner.l, preparser.c: added
+   Alexander's memory management modifications.  changed the lexer to
+   be more readable (easier to debug).  Status: old admin and VMUC
+   still working, Asgard has the same problem
+
+2001-01-24 21:45  david
+
+   * preparser-parser.y, preparser-scanner.l, preparser.c: Syncing. 
+   Asgard still crashing on form-template snippet but this is not a
+   mgd_include_snippet problem
+
+2001-01-24 20:46  david
+
+   * 

[PHP-CVS] cvs: php4 /ext/midgard .cvsignore

2001-02-18 Thread Emiliano Heyns

emile   Sun Feb 18 01:01:15 2001 EDT

  Modified files:  
/php4/ext/midgard   .cvsignore 
  Log:
  Simplifying .cvsignore (and losing some fat on the way)
  
  
Index: php4/ext/midgard/.cvsignore
diff -u php4/ext/midgard/.cvsignore:1.3 php4/ext/midgard/.cvsignore:1.4
--- php4/ext/midgard/.cvsignore:1.3 Sat Feb 17 15:21:49 2001
+++ php4/ext/midgard/.cvsignore Sun Feb 18 01:01:15 2001
@@ -1,22 +1,12 @@
 .deps
 .libs
+*.lo
+*.slo
 CVS
 Makefile
-access.lo
-access.o
-access.slo
 acinclude.m4
 aclocal.m4
-article.lo
-article.o
-article.slo
-attachment.lo
-attachment.o
-attachment.slo
 build
-calendar.lo
-calendar.o
-calendar.slo
 config.cache
 config.guess
 config.log
@@ -26,97 +16,19 @@
 configure
 configure.in
 dynlib.m4
-element.lo
-element.o
-element.slo
-event.lo
-event.o
-event.slo
-eventmember.lo
-eventmember.o
-eventmember.slo
-file.lo
-file.o
-file.slo
-group.lo
-group.o
-group.slo
-host.lo
-host.o
-host.slo
-image.lo
-image.o
-image.slo
 install-sh
 libs.mk
 libtool
 ltconfig
 ltmain.sh
-mail.lo
-mail.o
-mail.slo
-member.lo
-member.o
-member.slo
 mgd_errno.c
 mgd_errno.h
-mgd_errno.lo
-mgd_errno.o
-mgd_errno.slo
 midgard.la
-midgard.lo
-midgard.o
-midgard.slo
 missing
 mkinstalldirs
 modules
-oop.lo
-oop.o
-oop.slo
-page.lo
-page.o
-page.slo
-pageelement.lo
-pageelement.o
-pageelement.slo
-pagelink.lo
-pagelink.o
-pagelink.slo
-parameter.lo
-parameter.o
-parameter.slo
-person.lo
-person.o
-person.slo
 php_config.h
 php_config.h.in
-preferences.lo
-preferences.o
-preferences.slo
 preparser-parser.h
-preparser-parser.lo
-preparser-parser.o
-preparser-parser.slo
-preparser-scanner.lo
-preparser-scanner.o
-preparser-scanner.slo
 preparser.c.bk
-preparser.lo
-preparser.o
-preparser.slo
-sitegroup.lo
-sitegroup.o
-sitegroup.slo
-snippet.lo
-snippet.o
-snippet.slo
-snippetdir.lo
-snippetdir.o
-snippetdir.slo
-style.lo
-style.o
-style.slo
-topic.lo
-topic.o
-topic.slo
 y.output



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard php_midgard.h preparser.c

2001-02-20 Thread Emiliano Heyns

emile   Tue Feb 20 02:59:56 2001 EDT

  Modified files:  
/php4/ext/midgard   php_midgard.h preparser.c 
  Log:
  Header files moved
  
  
Index: php4/ext/midgard/php_midgard.h
diff -u php4/ext/midgard/php_midgard.h:1.3 php4/ext/midgard/php_midgard.h:1.4
--- php4/ext/midgard/php_midgard.h:1.3  Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/php_midgard.h  Tue Feb 20 02:59:55 2001
@@ -1,4 +1,4 @@
-/* $Id: php_midgard.h,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: php_midgard.h,v 1.4 2001/02/20 10:59:55 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -30,7 +30,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 midgard_request_config *mgd_rcfg();
Index: php4/ext/midgard/preparser.c
diff -u php4/ext/midgard/preparser.c:1.3 php4/ext/midgard/preparser.c:1.4
--- php4/ext/midgard/preparser.c:1.3Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/preparser.cTue Feb 20 02:59:55 2001
@@ -1,4 +1,4 @@
-/* $Id: preparser.c,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: preparser.c,v 1.4 2001/02/20 10:59:55 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -30,8 +30,8 @@
 
 #if HAVE_MIDGARD
 
-#include 
-#include 
+#include 
+#include 
 
 #include "midgard.h"
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard .cvsignore

2001-02-20 Thread Emiliano Heyns

emile   Tue Feb 20 03:00:25 2001 EDT

  Modified files:  
/php4/ext/midgard   .cvsignore 
  Log:
  ignore *.la
  
  
Index: php4/ext/midgard/.cvsignore
diff -u php4/ext/midgard/.cvsignore:1.4 php4/ext/midgard/.cvsignore:1.5
--- php4/ext/midgard/.cvsignore:1.4 Sun Feb 18 01:01:15 2001
+++ php4/ext/midgard/.cvsignore Tue Feb 20 03:00:23 2001
@@ -2,6 +2,7 @@
 .libs
 *.lo
 *.slo
+*.la
 CVS
 Makefile
 acinclude.m4



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard mail.c preparser-parser.y preparser.c

2001-02-20 Thread Emiliano Heyns

emile   Tue Feb 20 03:14:55 2001 EDT

  Modified files:  
/php4/ext/midgard   mail.c preparser-parser.y preparser.c 
  Log:
  header file moved
  
  
Index: php4/ext/midgard/mail.c
diff -u php4/ext/midgard/mail.c:1.3 php4/ext/midgard/mail.c:1.4
--- php4/ext/midgard/mail.c:1.3 Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/mail.c Tue Feb 20 03:14:55 2001
@@ -1,4 +1,4 @@
-/* $Id: mail.c,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: mail.c,v 1.4 2001/02/20 11:14:55 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -20,7 +20,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
Index: php4/ext/midgard/preparser-parser.y
diff -u php4/ext/midgard/preparser-parser.y:1.3 php4/ext/midgard/preparser-parser.y:1.4
--- php4/ext/midgard/preparser-parser.y:1.3 Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/preparser-parser.y Tue Feb 20 03:14:55 2001
@@ -1,5 +1,5 @@
 %{
-/* $Id: preparser-parser.y,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: preparser-parser.y,v 1.4 2001/02/20 11:14:55 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -25,7 +25,7 @@
   #include 
   #include 
   #include "php_midgard.h"
-  #include "midgard.h"
+  #include "midgard/midgard.h"
   #include "mgd_preparser.h"
 %}
 
Index: php4/ext/midgard/preparser.c
diff -u php4/ext/midgard/preparser.c:1.4 php4/ext/midgard/preparser.c:1.5
--- php4/ext/midgard/preparser.c:1.4Tue Feb 20 02:59:55 2001
+++ php4/ext/midgard/preparser.cTue Feb 20 03:14:55 2001
@@ -1,4 +1,4 @@
-/* $Id: preparser.c,v 1.4 2001/02/20 10:59:55 emile Exp $
+/* $Id: preparser.c,v 1.5 2001/02/20 11:14:55 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include "midgard.h"
+#include "midgard/midgard.h"
 
 void php_mgd_call_udf_function(char *type, zval *return_value, zval *arg)
 {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard config.m4 mgd_access.h mgd_preparser.h php_midgard.h

2001-02-20 Thread Emiliano Heyns

emile   Tue Feb 20 03:29:52 2001 EDT

  Modified files:  
/php4/ext/midgard   config.m4 mgd_access.h mgd_preparser.h 
php_midgard.h 
  Log:
  Header file moved.
  
  
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.5 php4/ext/midgard/config.m4:1.6
--- php4/ext/midgard/config.m4:1.5  Sat Feb 17 15:21:49 2001
+++ php4/ext/midgard/config.m4  Tue Feb 20 03:29:51 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.5 2001/02/17 23:21:49 emile Exp $
+dnl $Id: config.m4,v 1.6 2001/02/20 11:29:51 emile Exp $
 
 dnl  Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 dnl  Copyright (C) 2000 The Midgard Project ry
@@ -28,7 +28,7 @@
 if test "$PHP_MIDGARD" != "no"; then
   if test "$PHP_MIDGARD" != "yes"; then
 AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-AC_ADD_INCLUDE("$PHP_MIDGARD/include")
+AC_ADD_INCLUDE("$PHP_MIDGARD/include/midgard")
   else
 AC_ADD_LIBRARY(midgard)
   fi
Index: php4/ext/midgard/mgd_access.h
diff -u php4/ext/midgard/mgd_access.h:1.3 php4/ext/midgard/mgd_access.h:1.4
--- php4/ext/midgard/mgd_access.h:1.3   Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/mgd_access.h   Tue Feb 20 03:29:52 2001
@@ -1,4 +1,4 @@
-/* $Id: mgd_access.h,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: mgd_access.h,v 1.4 2001/02/20 11:29:52 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -21,7 +21,7 @@
 #ifndef MGD_ACCESS_H
 #define MGD_ACCESS_H
 
-#include 
+#include 
 
 #define istopicreader(topic) mgd_istopicreader(mgd_handle(), (topic))
 #define istopicowner(topic) mgd_istopicowner(mgd_handle(),(topic))
Index: php4/ext/midgard/mgd_preparser.h
diff -u php4/ext/midgard/mgd_preparser.h:1.3 php4/ext/midgard/mgd_preparser.h:1.4
--- php4/ext/midgard/mgd_preparser.h:1.3Sat Feb 17 15:21:50 2001
+++ php4/ext/midgard/mgd_preparser.hTue Feb 20 03:29:52 2001
@@ -1,4 +1,4 @@
-/* $Id: mgd_preparser.h,v 1.3 2001/02/17 23:21:50 emile Exp $
+/* $Id: mgd_preparser.h,v 1.4 2001/02/20 11:29:52 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -21,7 +21,7 @@
 #ifndef MGD_PREPARSER_H
 #define MGD_PREPARSER_H
 #include "mgd_internal.h"
-#include "midgard.h"
+#include "midgard/midgard.h"
 #include 
 
 extern MGD_FUNCTION(template);
Index: php4/ext/midgard/php_midgard.h
diff -u php4/ext/midgard/php_midgard.h:1.4 php4/ext/midgard/php_midgard.h:1.5
--- php4/ext/midgard/php_midgard.h:1.4  Tue Feb 20 02:59:55 2001
+++ php4/ext/midgard/php_midgard.h  Tue Feb 20 03:29:52 2001
@@ -1,4 +1,4 @@
-/* $Id: php_midgard.h,v 1.4 2001/02/20 10:59:55 emile Exp $
+/* $Id: php_midgard.h,v 1.5 2001/02/20 11:29:52 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -29,7 +29,7 @@
 #if HAVE_MIDGARD
 
 #include 
-#include 
+#include 
 #include 
 #include 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard midgard.c

2001-02-20 Thread Emiliano Heyns

emile   Tue Feb 20 15:35:35 2001 EDT

  Modified files:  
/php4/ext/midgard   midgard.c 
  Log:
  Initialize globals to NULL at module init
  
  
Index: php4/ext/midgard/midgard.c
diff -u php4/ext/midgard/midgard.c:1.5 php4/ext/midgard/midgard.c:1.6
--- php4/ext/midgard/midgard.c:1.5  Sun Feb 18 10:45:24 2001
+++ php4/ext/midgard/midgard.c  Tue Feb 20 15:35:35 2001
@@ -1,4 +1,4 @@
-/* $Id: midgard.c,v 1.5 2001/02/18 18:45:24 davidg Exp $
+/* $Id: midgard.c,v 1.6 2001/02/20 23:35:35 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -319,6 +319,10 @@
 PHP_MINIT_FUNCTION(midgard)
 {
MidgardClassPtr *midgard_class;
+
+   MGDLS_FETCH();
+   MGDG(rcfg) = NULL;
+   MGDG(dcfg) = NULL;
 
ZEND_INIT_MODULE_GLOBALS(midgard, php_midgard_init_globals, NULL);
 /* Remove comments if you have entries in php.ini



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard midgard.c

2001-02-20 Thread Emiliano Heyns

emile   Tue Feb 20 15:54:07 2001 EDT

  Modified files:  
/php4/ext/midgard   midgard.c 
  Log:
  Argh, that's what init_globals does. Sorry, on auto-pilot fixing things
  in both midgard-php3 and midgard-php4
  
  
Index: php4/ext/midgard/midgard.c
diff -u php4/ext/midgard/midgard.c:1.6 php4/ext/midgard/midgard.c:1.7
--- php4/ext/midgard/midgard.c:1.6  Tue Feb 20 15:35:35 2001
+++ php4/ext/midgard/midgard.c  Tue Feb 20 15:54:05 2001
@@ -1,4 +1,4 @@
-/* $Id: midgard.c,v 1.6 2001/02/20 23:35:35 emile Exp $
+/* $Id: midgard.c,v 1.7 2001/02/20 23:54:05 emile Exp $
 Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -319,10 +319,6 @@
 PHP_MINIT_FUNCTION(midgard)
 {
MidgardClassPtr *midgard_class;
-
-   MGDLS_FETCH();
-   MGDG(rcfg) = NULL;
-   MGDG(dcfg) = NULL;
 
ZEND_INIT_MODULE_GLOBALS(midgard, php_midgard_init_globals, NULL);
 /* Remove comments if you have entries in php.ini



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




[PHP-CVS] cvs: php4 /ext/midgard config.m4

2001-02-20 Thread Emiliano Heyns

emile   Tue Feb 20 16:57:28 2001 EDT

  Modified files:  
/php4/ext/midgard   config.m4 
  Log:
  Source files explicitly include midgard/something.h
  
  
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.6 php4/ext/midgard/config.m4:1.7
--- php4/ext/midgard/config.m4:1.6  Tue Feb 20 03:29:51 2001
+++ php4/ext/midgard/config.m4  Tue Feb 20 16:57:28 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.6 2001/02/20 11:29:51 emile Exp $
+dnl $Id: config.m4,v 1.7 2001/02/21 00:57:28 emile Exp $
 
 dnl  Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
 dnl  Copyright (C) 2000 The Midgard Project ry
@@ -28,7 +28,7 @@
 if test "$PHP_MIDGARD" != "no"; then
   if test "$PHP_MIDGARD" != "yes"; then
 AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-AC_ADD_INCLUDE("$PHP_MIDGARD/include/midgard")
+AC_ADD_INCLUDE("$PHP_MIDGARD/include")
   else
 AC_ADD_LIBRARY(midgard)
   fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]