Next few changes - see commit messages

[kojoty]

No description provided.

[kojoty]

@deg-pl, @harrieklomp, @andrixnet

Please check if in your nodes settings.inc.php all calls to class "cache" (/lib/cache.php) are removed:

all things like: cache::TYPE_TRADITIONAL should be replaced to GeoCacheCommons::TYPE_TRADITIONAL

After merge this PR there will not be /lib/cache.php anymore.

[deg-pl]

@kojoty It produces error "ErrorException: ClassPathDictionary::getClassPath: ERROR: Trying to load unknown class: GeoCacheCommons" (in settings.inc.php)

[kojoty]

@kojoty It produces error "ErrorException: ClassPathDictionary::getClassPath: ERROR: Trying to load unknown class: GeoCacheCommons" (in settings.inc.php)

Just add:
use src\Models\GeoCache\GeoCacheCommons to settings.inc.php - it should work then without any issue. That's why I wrote comment above.

[harrieklomp]

Done at OCNL

[harrieklomp]

Done on OCUS

[deg-pl]

Done on OC PL and OC UK.

@kojoty Tak to jest, jeśli się zmienia konfigurację OC o północy między układaniem paneli a układaniem paneli ;). Dzięki.

[kojoty]

Done on OC PL and OC UK.

@kojoty Tak to jest, jeśli się zmienia konfigurację OC o północy między układaniem paneli a układaniem paneli ;). Dzięki.

bo jest stara zasada przodków którą znano już prawdopodobnie w XVIw.: niedziela dzień święty - w niedzielę nie trzeba paneli układać - trzeba wtedy kod OC refaktorować!

[andrixnet]

OCRO and OCUS pending.
Does this PR influence this: #2087 ?

[kojoty]

OCRO and OCUS pending.
Does this PR influence this: #2087 ?

I afraid the answer must be: YES
andrixnet: #2087 is huge, and it seems to be much more important - what is a way to merge it?
Is this ready in your opinion? If yes, I can sit and review it today evening (250+ files - it will be cool I guess) - my smaller PR can wait...

[andrixnet]

IMO it is ready, at least according to my experience and knowledge of the code and all the research I did. There still is however a chance I might have missed something.

See it live here: http://ocro.dev.andrix.eu/

[andrixnet]

I will try to be around the computer in the evening, 22:00 - 24:00 EET

[kojoty]

OK, I've checked and can confirm that the conficts with BIG PR #2087 (with new types) are quite easy to resolve - if OCUS and OCRO are ready (no cache:: use in settings.inc.php) we can merge this.

[kojoty]

@andrixnet Can you confirm that OCRo and OCUs are read for this commit - I mean no references to cache:: in settings.inc.php

I would like to merge this - and next I will resolve conflicts in #2087 when we decide to merge it.

[andrixnet]

OCRO has

    $config['forbidenCacheTypes'] = array(
        cache::TYPE_GEOPATHFINAL
    );

I droppped it.
(anyway, with #2087 it becomes invalid anyway).

Beware that settingsDefault.inc.php still contains references:

    /**
     * not allowed cache types (user cannot create caches of this types).
     *
     * Cachetypes must be lib/cache.php constant TYPE_*
     */
    'forbidenCacheTypes' => array(
        cache::TYPE_VIRTUAL,
        cache::TYPE_WEBCAM,
        cache::TYPE_GEOPATHFINAL
    ),
    /**
     * cache limits for user. If user is allowed to place limited nomber of spec
     * place cachetype and limit here.
     *
     * Cachetypes must be lib/cache.php constant TYPE_*
     */
    'cacheLimitByTypePerUser' => array(
        cache::TYPE_OWNCACHE => 1,
    ),

[kojoty]

@andrixnet Thanks,

don't worry about settingsDefault.inc.php - this is a part of the code so I can control it by repo modification - opposite to settings.inc.php where I don't have an access