Changeset 26438


Ignore:
Timestamp:
06/22/10 20:08:13 (7 years ago)
Author:
flack
Message:

synchronize with ragna branch

Location:
branches/developers/flack/acltuning
Files:
1 deleted
142 edited
18 copied

Legend:

Unmodified
Added
Removed
  • branches/developers/flack/acltuning/be.crsolutions.mollom/config/manifest.inc

    r25413 r26438  
    22'icon' => 'be.crsolutions.mollom/mollom.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/cc.kaktus.discussion/config/manifest.inc

    r25416 r26438  
    11'name' => 'cc.kaktus.discussion',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'state' => 'beta',
    44'class_definitions' => array
  • branches/developers/flack/acltuning/cc.kaktus.import/config/manifest.inc

    r25416 r26438  
    44'purecode' => false,
    55/* when using pear packaging, versions > 1 are stable */
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'devel',
    88/* use this to set default privileges */
  • branches/developers/flack/acltuning/com.affronter.iplocation/config/manifest.inc

    r25413 r26438  
    11'name' => 'com.affronter.iplocation',
    22'purecode' => true,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'icon' => 'stock-icons/16x16/stock_internet.png',
    55'state' => 'stable',
  • branches/developers/flack/acltuning/com.affronter.langredirector/config/manifest.inc

    r25413 r26438  
    11'name' => 'com.affronter.langredirector',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'icon' => 'stock-icons/16x16/jump-to.png',
    55'state' => 'devel',
  • branches/developers/flack/acltuning/com.spamspan.obfuscator/config/manifest.inc

    r25416 r26438  
    11'name' => 'com.spamspan.obfuscator',
    22'purecode' => true,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/de.bitfolge.feedcreator/config/manifest.inc

    r25413 r26438  
    22'icon' => 'net.nemein.rss/rss-16.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/de.linkm.sitemap/config/manifest.inc

    r25413 r26438  
    33'description' => 'Automatic sitemap',
    44'purecode' => false,
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'package.xml' => array
  • branches/developers/flack/acltuning/fi.hut.htmlimport/config/manifest.inc

    r25413 r26438  
    11'name' => 'fi.hut.htmlimport',
    22'purecode' => true,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/fi.hut.loginbroker/config/manifest.inc

    r25413 r26438  
    11'name' => 'fi.hut.loginbroker',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/fi.hut.ssi/config/manifest.inc

    r25416 r26438  
    11'name' => 'fi.hut.ssi',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/fi.hut.staticdumps/config/manifest.inc

    r25413 r26438  
    11'name' => 'fi.hut.staticdumps',
    22'purecode' => true,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/fi.mik.lentopaikkakisa/config/manifest.inc

    r25413 r26438  
    22'icon' => 'fi.mik.lentopaikkakisa/lentopaikkakisa.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array
  • branches/developers/flack/acltuning/fi.protie.basket/config/manifest.inc

    r25416 r26438  
    11'name' => 'fi.protie.basket',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'state' => 'stable',
    44'purecode' => true,
  • branches/developers/flack/acltuning/fi.protie.checkout/config/manifest.inc

    r25416 r26438  
    11'name' => 'fi.protie.checkout',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'state' => 'alpha',
    44'class_definitions' => array
  • branches/developers/flack/acltuning/fi.protie.host/config/manifest.inc

    r25416 r26438  
    11'name' => 'fi.protie.host',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'state' => 'alpha',
    44'package.xml' => array
  • branches/developers/flack/acltuning/fi.protie.navigation/config/manifest.inc

    r25413 r26438  
    11'name' => 'fi.protie.navigation',
    22'icon' => 'fi.protie.navigation/navigation.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'purecode' => true,
  • branches/developers/flack/acltuning/fi.protie.payments/config/manifest.inc

    r25416 r26438  
    11'name' => 'fi.protie.payments',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'state' => 'alpha',
    44'purecode' => true,
  • branches/developers/flack/acltuning/fi.protie.shop/config/manifest.inc

    r25416 r26438  
    11'name' => 'fi.protie.shop',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'state' => 'beta',
    44'class_definitions' => array
  • branches/developers/flack/acltuning/midcom.admin.babel/config/manifest.inc

    r25413 r26438  
    33'description' => 'MidCOM localization utility',
    44'purecode' => true,
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'privileges' => array
    77(
  • branches/developers/flack/acltuning/midcom.admin.folder/config/manifest.inc

    r25416 r26438  
    22'icon' => 'stock-icons/16x16/folder.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array
  • branches/developers/flack/acltuning/midcom.admin.help/config/manifest.inc

    r25413 r26438  
    33'description' => 'On-site help displayer',
    44'purecode' => true,
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'privileges' => array(),
  • branches/developers/flack/acltuning/midcom.admin.libconfig/config/manifest.inc

    r25413 r26438  
    22'description' => 'Library configuration tool',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'privileges' => array(),
    66'class_definitions' => array(),
  • branches/developers/flack/acltuning/midcom.admin.settings/config/manifest.inc

    r25413 r26438  
    33'description' => 'This module handles MidCOM local configuration.',
    44'purecode' => true,
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'privileges' => array
  • branches/developers/flack/acltuning/midcom.admin.user/config/manifest.inc

    r25413 r26438  
    33'icon' => 'midcom.admin.user/user-manager.png',
    44'purecode' => true,
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'privileges' => array
    77(
  • branches/developers/flack/acltuning/midcom.core/midcom/services/multilang.php

    r26387 r26438  
    293293        $real_lang = self::get_lang();
    294294        if (!isset($langs[$real_lang])) return;
    295         $langs[$real_lang] = false;
    296295
    297296        if ($is_update)
     
    311310                            $langs[$language->code] = false;
    312311                        }
    313 
    314                         if (!$lang0)
     312                        else if (!$lang0)
    315313                        {
    316314                            if (   is_null($parent)
    317                                 && $language->code != $real_lang)
     315                                && $language->id != $object->lang)
    318316                            {
    319317                                $parent = $language->code;
     
    331329                    }
    332330                }
     331
     332                if (!$lang0)
     333                {
     334                    if (!$langs[$real_lang])
     335                    {
     336                        $parent = null;
     337                    }
     338                }
    333339            }
    334340
     
    352358            {
    353359                $detach = !self::is_object_equal_in_lang($object, $parent);
     360            }
     361            else
     362            {
     363                if ($lang0)
     364                {
     365                    if ($langs[$real_lang])
     366                    {
     367                        $detach = false;
     368                    }
     369                }
    354370            }
    355371
     
    435451                if (!$lang_exists)
    436452                {
    437                     self::is_real(false);
    438                     $object->update();
    439                     self::is_real(true);
    440 
    441                     $lang_exists = true;
    442 
    443                     $object->set_parameter($domain, $real_lang, true);
     453                    if (   !$object->lang
     454                        && !isset($langs[''])
     455                        && !$GLOBALS['midcom_config']['multilang_lang0_langs'])
     456                    {
     457                        self::is_real(false);
     458                        $object->update();
     459                        self::is_real(true);
     460
     461                        $lang_exists = true;
     462
     463                        $object->set_parameter($domain, $real_lang, true);
     464                    }
     465                    else
     466                    {
     467                        return;
     468                    }
    444469                }
    445470            }
     
    505530            if ($languages = $object->get_languages())
    506531            {
     532                $default_lang = self::get_default_lang();
    507533                $real_lang = self::get_lang();
    508534
    509535                $object_langs = array();
     536                $auto_has_master = false;
     537
    510538                foreach ($languages as $language)
    511539                {
     540                    $object_langs[$language->code] = false;
    512541                    if (!$object->get_parameter($domain, $language->code))
    513542                    {
    514                         $object_langs[] = $language->code;
     543                        $object_langs[$language->code] = true;
     544
     545                        if (   $GLOBALS['midcom_config']['multilang_auto_langs']
     546                            && !$auto_has_master
     547                            && in_array($language->code, $GLOBALS['midcom_config']['multilang_auto_langs']))
     548                        {
     549                            $auto_has_master = true;
     550                        }
     551                    }
     552                }
     553
     554                if (   $GLOBALS['midcom_config']['multilang_auto_langs']
     555                    && !$auto_has_master)
     556                {
     557                    if (   !isset($object_langs[$default_lang])
     558                        || !$object_langs[$default_lang]
     559                        || (   $default_lang == ''
     560                            && !$GLOBALS['midcom_config']['multilang_lang0_langs'])
     561                       )
     562                    {
     563                        $auto_has_master = true;
    515564                    }
    516565                }
     
    519568                {
    520569                    if (   $GLOBALS['midcom_config']['multilang_auto_langs']
     570                        && $auto_has_master
    521571                        && in_array($language->code, $GLOBALS['midcom_config']['multilang_auto_langs']))
    522572                    {
     
    525575
    526576                    if (   $GLOBALS['midcom_config']['multilang_lang0_langs']
     577                        && $object_langs[$language->code]
    527578                        && in_array($language->code, $GLOBALS['midcom_config']['multilang_lang0_langs']))
    528579                    {
     
    531582
    532583                    $object_in_lang = $object;
    533 
    534584                    $langs = array($language->code);
    535 
    536585                    $delete = false;
    537                     if (!in_array($language->code, $object_langs))
     586
     587                    if (!$object_langs[$language->code])
    538588                    {
    539589                        if ($object_in_lang = self::get_object_in_lang($object, $language->code, true))
     
    558608                    }
    559609
    560                     midgard_connection::set_lang($language->code);
    561                     self::sync($object_in_lang, self::langs($langs), $domain, $is_update, 'disabled');
    562                     midgard_connection::set_lang($real_lang);
    563 
    564610                    if (   !$GLOBALS['midcom_config']['multilang_lang0_langs']
    565611                        && $language->code == ''
    566                         && $object_in_lang0 = self::get_object_in_lang($object, '', true))
    567                     {
    568                         foreach ($object_langs as $lang)
    569                         {
    570                             if (   $object_in_lang = self::get_object_in_lang($object, $lang, true)
    571                                 && self::are_objects_equal($object_in_lang, $object_in_lang0))
     612                        && !$delete
     613                        && $object_in_lang = self::get_object_in_lang($object, '', true))
     614                    {
     615                        foreach ($object_langs as $lang => $translated)
     616                        {
     617                            if ($lang == $language->code) continue;
     618
     619                            $object_in_langx = self::get_object_in_lang($object, $lang, true);
     620
     621                            if (   $object_in_langx
     622                                && self::are_objects_equal($object_in_langx, $object_in_lang))
    572623                            {
    573624                                $delete = true;
     
    575626                            }
    576627                        }
    577                         $object_in_lang = $object_in_lang0;
    578628                    }
    579629
    580630                    if ($delete)
    581631                    {
     632                        $lang = '';
     633                        foreach ($object_langs as $lang => $translated)
     634                        {
     635                            if ($lang == $language->code) continue;
     636
     637                            break;
     638                        }
     639                        // Not at all needed but prefer lang0 if it can be used
     640                        if (   $lang != ''
     641                            && $language->code != '')
     642                        {
     643                            if (isset($object_langs['']))
     644                            {
     645                                $lang = '';
     646                            }
     647                        }
     648                        if ($lang != $language->code)
     649                        {
     650                            midgard_connection::set_default_lang($lang);
     651                        }
     652                        else
     653                        {
     654                            continue;
     655                        }
     656                        midgard_connection::set_lang($language->code);
     657
    582658                        self::is_real(false);
    583                         $default_lang = self::get_default_lang();
    584                         while ($lang = array_shift($object_langs))
    585                         {
    586                             if ($language->code == '')
    587                             {
    588                                 if ($lang == '') continue;
    589                             }
    590                             else
    591                             {
    592                                 break;
    593                             }
    594                         }
    595                         if ($lang)
    596                         {
    597                             // Not at all needed but prefer lang0 if it can be used
    598                             if (   $lang != ''
    599                                 && $language->code != '')
    600                             {
    601                                 if (in_array('', $object_langs))
    602                                 {
    603                                     $lang = '';
    604                                 }
    605                             }
    606                             midgard_connection::set_default_lang($lang);
    607                         }
    608                         else
    609                         {
    610                             continue;
    611                         }
    612                         midgard_connection::set_lang($language->code);
     659                        $constraints = array
     660                        (
     661                            'domain' => $domain,
     662                            'name' => $language->code,
     663                        );
     664                        $object->purge_parameters($constraints);
    613665                        $object_in_lang->delete();
     666                        self::is_real(true);
     667
    614668                        midgard_connection::set_default_lang($default_lang);
    615669                        midgard_connection::set_lang($real_lang);
    616                         self::is_real(true);
     670                    }
     671                    else
     672                    {
     673                        midgard_connection::set_lang($language->code);
     674                        self::sync($object_in_lang, self::langs($langs), $domain, $is_update, 'disabled');
     675                        midgard_connection::set_lang($real_lang);
    617676                    }
    618677                }
  • branches/developers/flack/acltuning/midcom.helper.activitystream/config/manifest.inc

    r25416 r26438  
    1717    ),
    1818),
    19 'version' => '8.09.8',
     19'version' => '8.09.9',
    2020'state' => 'stable',
    2121'package.xml' => array
  • branches/developers/flack/acltuning/midcom.helper.datamanager/config/manifest.inc

    r25413 r26438  
    22'icon' => 'midcom.helper.datamanager/datamanager.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/midcom.helper.datamanager2/config/manifest.inc

    r25413 r26438  
    11'name' => 'midcom.helper.datamanager2',
    22'icon' => 'midcom.helper.datamanager2/datamanager.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'purecode' => true,
  • branches/developers/flack/acltuning/midcom.helper.filesync/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_refresh.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/midcom.helper.imagepopup/config/manifest.inc

    r25413 r26438  
    33'description' => 'Image upload and insertion tool',
    44'purecode' => true,
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'privileges' => array(),
  • branches/developers/flack/acltuning/midcom.helper.reflector/config/manifest.inc

    r25413 r26438  
    11'name' => 'midcom.helper.reflector',
    22'purecode' => true,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'icon' => 'stock-icons/16x16/stock_folder-properties.png',
    55'state' => 'stable',
  • branches/developers/flack/acltuning/midcom.helper.replicator/config/manifest.inc

    r25416 r26438  
    22'icon' => 'midcom.helper.replicator/replicate-server-16.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array
  • branches/developers/flack/acltuning/midcom.helper.schemaapi/config/manifest.inc

    r25413 r26438  
    11'name' => 'midcom.helper.schemaapi',
    22'purecode' => true,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/midcom.helper.search/config/manifest.inc

    r25413 r26438  
    11'name' => 'midcom.helper.search',
    22'icon' => 'stock-icons/16x16/search.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'purecode' => false,
  • branches/developers/flack/acltuning/midcom.helper.weather/config/manifest.inc

    r25416 r26438  
    22'icon' => 'midcom.helper.weather/weather.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/midcom.helper.xml/config/manifest.inc

    r25413 r26438  
    22'icon' => 'midcom.helper.xml/xml.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'privileges' => array(),
    66'class_definitions' => array(),
  • branches/developers/flack/acltuning/midcom.helper.xsspreventer/config/manifest.inc

    r25413 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/midcom.services.at/config/manifest.inc

    r25413 r26438  
    77    'midcom_dba_classes.inc',
    88),
    9 'version' => '8.09.8',
     9'version' => '8.09.9',
    1010'state' => 'stable',
    1111'package.xml' => array
  • branches/developers/flack/acltuning/midgard.admin.asgard/config/manifest.inc

    r25416 r26438  
    22'icon' => 'midgard.admin.asgard/asgard2-16.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array
  • branches/developers/flack/acltuning/midgard.admin.wizards/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_internet.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/midgard.webdav.styles/config/manifest.inc

    r25413 r26438  
    11'name' => 'midgard.webdav.styles',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.fernmark.pedigree/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.fernmark.pedigree',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nehmer.account/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.account',
    22'icon' => 'stock-icons/16x16/stock_person.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'class_definitions' => array
  • branches/developers/flack/acltuning/net.nehmer.blog/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.blog',
    22'icon' => 'net.nehmer.blog/news-listing.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'class_definitions' => array
  • branches/developers/flack/acltuning/net.nehmer.buddylist/config/manifest.inc

    r25412 r26438  
    11'name' => 'net.nehmer.buddylist',
    22'icon' => 'stock-icons/16x16/stock_people.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'class_definitions' => array
    55(
  • branches/developers/flack/acltuning/net.nehmer.comments/config/manifest.inc

    r26219 r26438  
    22
    33'name' => 'net.nehmer.comments',
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'icon' => 'stock-icons/16x16/stock-discussion.png',
    66'class_definitions' => array
  • branches/developers/flack/acltuning/net.nehmer.jobmarket/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.jobmarket',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'state' => 'stable',
    44'class_definitions' => array
  • branches/developers/flack/acltuning/net.nehmer.mail/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.mail',
    22'icon' => 'stock-icons/16x16/mail-reply-all.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'package.xml' => array
  • branches/developers/flack/acltuning/net.nehmer.markdown/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.markdown',
    22'icon' => 'net.nehmer.markdown/markdown.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'purecode' => true,
  • branches/developers/flack/acltuning/net.nehmer.marketplace/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.marketplace',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'class_definitions' => array
    44(
  • branches/developers/flack/acltuning/net.nehmer.publications/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.publications',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'class_definitions' => array
    44(
  • branches/developers/flack/acltuning/net.nehmer.static/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nehmer.static',
    2 'version' => '8.09.8',
     2'version' => '8.09.9',
    33'icon' => 'stock-icons/16x16/document.png',
    44'state' => 'stable',
  • branches/developers/flack/acltuning/net.nemein.alphabeticalindex/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.alphabeticalindex',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.approvenotifier/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/page-approved.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'package.xml' => array
  • branches/developers/flack/acltuning/net.nemein.attention/config/manifest.inc

    r25413 r26438  
    22'icon' => 'net.nemein.attention/apml-icon-16x16.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.beaexporter/config/manifest.inc

    r25413 r26438  
    66    'midcom_dba_classes.inc',
    77),
    8 'version' => '8.09.8',
     8'version' => '8.09.9',
    99'state' => 'stable',
    1010'package.xml' => array
  • branches/developers/flack/acltuning/net.nemein.calendar/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_event.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.discussion/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock-discussion.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array
  • branches/developers/flack/acltuning/net.nemein.faq/config/manifest.inc

    r25416 r26438  
    11'name' => 'net.nemein.faq',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.favourites/config/manifest.inc

    r25413 r26438  
    22'icon' => 'net.nemein.favourites/favorite.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.featured/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.featured',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.feedcollector/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.feedcollector',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.flashplayer/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/media-playback-start.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.hourview2/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.hourview2',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.infobox/config/manifest.inc

    r26306 r26438  
    22'icon' => 'stock-icons/16x16/document-text.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.infobox/main.php

    r26306 r26438  
    6969        $data = array();
    7070        $path = substr($_MIDGARD['uri'], strlen($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX)));
     71        if (!$path)
     72        {
     73            $path = '';
     74        }
    7175        $qb = net_nemein_infobox_infobox_dba::new_query_builder();
    7276        $qb->add_constraint('topic', '=', $_MIDCOM->get_context_data(MIDCOM_CONTEXT_CONTENTTOPIC)->id);
  • branches/developers/flack/acltuning/net.nemein.lastupdates/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.lastupdates',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.midgardregistry/config/manifest.inc

    r25416 r26438  
    44'purecode' => false,
    55/* when using pear packaging, versions > 1 are stable */
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'devel',
    88/* use this to set default privileges */
  • branches/developers/flack/acltuning/net.nemein.netmon/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.netmon',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.openid/config/manifest.inc

    r25427 r26438  
    22'icon' => 'net.nemein.openid/openid.gif',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.openidprovider/config/manifest.inc

    r25426 r26438  
    22'name' => 'net.nemein.openidprovider',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.organizations/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_home.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.pearserver/config/manifest.inc

    r25416 r26438  
    11'name' => 'net.nemein.pearserver',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'devel',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.personnel/config/manifest.inc

    r25413 r26438  
    22'icon' => 'net.nemein.personnel/personnel.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.ping/config/manifest.inc

    r25413 r26438  
    22'icon' => 'net.nemein.ping/ping.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.quickpoll/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.quickpoll',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.redirector/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_jump-to.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'privileges' => array
    66(
  • branches/developers/flack/acltuning/net.nemein.registrations/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.registrations',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array
  • branches/developers/flack/acltuning/net.nemein.repeathandler/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/repeating-event.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'privileges' => array(),
    66'class_definitions' => array(),
  • branches/developers/flack/acltuning/net.nemein.reservations/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.reservations',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.rss/config/manifest.inc

    r25413 r26438  
    22'icon' => 'net.nemein.rss/rss-16.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.shoppingcart/config/manifest.inc

    r25412 r26438  
    11'name' => 'net.nemein.shoppingcart',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.simpledb/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_data-edit-table.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.tag/config/manifest.inc

    r25416 r26438  
    22'icon' => 'net.nemein.tag/tag-16.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.updatenotification/config/manifest.inc

    r25413 r26438  
    11'name' => 'net.nemein.updatenotification',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/net.nemein.wiki/config/manifest.inc

    r25413 r26438  
    22'icon' => 'net.nemein.wiki/wiki.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/no.bergfald.rcs/config/manifest.inc

    r25413 r26438  
    33'description' => 'Front and backend for a versioning library',
    44'purecode' => true,
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'privileges' => array(),
  • branches/developers/flack/acltuning/no.odindata.quickform/config/manifest.inc

    r25413 r26438  
    22'description' => 'A simple email form generator',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/no.odindata.quickform2/config/manifest.inc

    r25413 r26438  
    22'description' => 'Submit forms to email ',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array (),
  • branches/developers/flack/acltuning/no.odindata.quickform2/config/schemadb_config.inc

    r22215 r26438  
    2020            ),
    2121            'widget' => 'text',
    22             'default'  => "",
    2322        ),
    2423        'mail_address_to' => array
     
    151150            ),
    152151            'widget_text_height' => '4em',
    153             'default' => '',
    154152            'helptext'  => 'this message is displayed after the user has submitted the form',
    155153        ),
  • branches/developers/flack/acltuning/org.maemo.brainstorm/config/manifest.inc

    r25416 r26438  
    22'icon' => 'org.maemo.brainstorm/idea.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array
  • branches/developers/flack/acltuning/org.maemo.cas/config/manifest.inc

    r25416 r26438  
    22'name' => 'org.maemo.cas',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/org.maemo.devcodes/config/manifest.inc

    r25413 r26438  
    11'name' => 'org.maemo.devcodes',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array
  • branches/developers/flack/acltuning/org.maemo.gforgeprofileupdater/config/manifest.inc

    r25413 r26438  
    11'name' => 'org.maemo.gforgeprofileupdater',
    22'purecode' => true,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/org.maemo.packages/config/manifest.inc

    r25416 r26438  
    11'name' => 'org.maemo.packages',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array
  • branches/developers/flack/acltuning/org.maemo.packages/config/mgdschema.xml

    r26146 r26438  
    9292        <property name="status" type="unsigned integer" />
    9393        <property name="uploader" type="guid" link="midgard_person:guid" />
    94         <property name="versionscore" type="unsigned integer" />
     94        <property name="versionscore" type="unsigned integer" index="yes" />
    9595        <property name="source" type="unsigned integer" link="org_maemo_packages_source:id" />
    9696    </type>
  • branches/developers/flack/acltuning/org.maemo.packages/handler/packageinstance/apt.php

    r26193 r26438  
    7979            if (!$package_instance)
    8080            {
    81                 $_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Package instance not found!');
     81                //$_MIDCOM->generate_error(MIDCOM_ERRCRIT, 'Package instance not found!');
     82                continue;
    8283            }
    8384
     
    8788        $count = 0;
    8889        //Get dependency tree 5 levels deep.
     90        $processed = array();
    8991        for ($i = 0; $i < 5; $i++)
    9092        {
    9193            foreach($return_package_instances as $pi)
    9294            {
    93                 $this->get_dependency_tree($pi->guid, $return_package_instances);
     95                if (!isset($processed[$pi->guid]))
     96                {
     97                    $this->get_dependency_tree($pi->guid, $return_package_instances);
     98                    $processed[$pi->guid] = true;
     99                }
    94100            }
    95101            $guids = array();
     
    116122
    117123        $this->_package_instance = &$filtered_instances;
    118         $this->_repository = &$repository;
    119 //        $this->_package = &$package[0];
     124        $this->_repository = &$repository[0];
    120125
    121126        return true;
     
    124129    private function get_dependency_tree($guid, &$return_package_instances)
    125130    {
    126         $instance = new org_maemo_packages_packageinstance_dba($guid);
     131        $instance = org_maemo_packages_packageinstance_dba::get_cached($guid);
    127132        if (!empty($instance->depends))
    128133        {
    129             $repository = new org_maemo_packages_repository_dba($instance->repository);
     134            $repository = org_maemo_packages_repository_dba::get_cached($instance->repository);
    130135
    131136            $deplist = $instance->depends;
     
    223228                        if ($package_instance)
    224229                        {
    225                             $return_package_instances[] = $package_instance[0];
     230                            if ($package_instance[0]->md5sum != '')
     231                            {
     232                                $return_package_instances[] = $package_instance[0];
     233                            }
    226234                        }
    227235
     
    277285    function _show_install($handler_id, &$data)
    278286    {
     287        $this->_request_data['repository'] = $this->_repository;
    279288        foreach ($this->_package_instance as $package_instance)
    280289        {
  • branches/developers/flack/acltuning/org.maemo.packages/handler/repository/queue.php

    r26272 r26438  
    685685        $tests=array();
    686686        $c = 0; // limit the tree depth
     687        $processed = array();
    687688        while(count($tests) <> count($return_guids))
    688689        {
     
    691692            foreach($tests as $test => $dummy)
    692693            {
    693                 $this->get_dependency_tree($test, &$return_guids);
     694                if (!isset($processed[$test]))
     695                {
     696                    $this->get_dependency_tree($test, &$return_guids);
     697                    $processed[$test] = true;
     698                }
    694699            }
    695700            //echo "Round: ".$c."\n";
     
    705710        $btests=array();
    706711        $c = 0; // limit the tree depth
     712        $build_processed = array();
    707713        while(count($btests) <> count($return_build_guids))
    708714        {
     
    711717            foreach($btests as $test => $dummy)
    712718            {
    713                 $this->get_build_depends($test, &$return_build_guids);
     719                if (!isset($build_processed[$test]))
     720                {
     721                    $this->get_build_depends($test, &$return_build_guids);
     722                    $build_processed[$test] = true;
     723                }
     724                if (!isset($processed[$test]))
     725                {
     726                    $this->get_dependency_tree($test, &$return_build_guids);
     727                    $processed[$test] = true;
     728                }
    714729            }
    715730
  • branches/developers/flack/acltuning/org.maemo.packages/style/apt_install_item.php

    r26248 r26438  
    33$package = $data['package'];
    44$package_instance = $data['package_instance'];
     5$repository = $data['repository'];
    56$depends = htmlspecialchars_decode($package_instance->depends);
    67$predepends = htmlspecialchars_decode($package_instance->predepends);
     
    2526Installed-Size: &(package_instance->installedsize);
    2627
    27 Architecture: armel
     28Architecture: &(repository->arch);
     29
    2830Version: &(package_instance->version);
    2931
  • branches/developers/flack/acltuning/org.maemo.productstats/config/manifest.inc

    r25416 r26438  
    66'purecode' => true,
    77/* when using pear packaging, versions > 1 are stable */
    8 'version' => '8.09.8',
     8'version' => '8.09.9',
    99'state' => 'stable',
    1010/* use this to set default privileges */
  • branches/developers/flack/acltuning/org.maemo.socialdesktop/config/manifest.inc

    r25416 r26438  
    11'name' => 'org.maemo.socialdesktop',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/org.maemo.socialnews/config/manifest.inc

    r25413 r26438  
    11'name' => 'org.maemo.socialnews',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/org.openpsa.calendar/config/manifest.inc

    r25413 r26438  
    1010    'midcom_dba_classes.inc',
    1111),
    12 'version' => '8.09.8',
     12'version' => '8.09.9',
    1313'state' => 'stable',
    1414'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.calendarwidget/config/manifest.inc

    r25413 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.contacts/config/manifest.inc

    r25413 r26438  
    66    'midcom_dba_classes.inc',
    77),
    8 'version' => '8.09.8',
     8'version' => '8.09.9',
    99'state' => 'stable',
    1010'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.contacts/handler/group/view.php

    r26311 r26438  
    8585    {
    8686        $_MIDCOM->auth->require_valid_user();
    87        
     87
    8888        // Get the requested group object
    8989        $this->_load($args[0]);
     
    134134        // This handler uses Ajax, include the handler javascripts
    135135        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . "/org.openpsa.helpers/ajaxutils.js");
    136        
     136
    137137        $_MIDCOM->set_pagetitle($this->_group->official);
    138138
     
    264264        }
    265265        $siteconfig = org_openpsa_core_siteconfig::get_instance();
    266         org_openpsa_relatedto_plugin::add_journal_entry_button($this->_view_toolbar, $this->_contact->guid);
    267266
    268267        $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices');
  • branches/developers/flack/acltuning/org.openpsa.contacts/handler/person/view.php

    r26311 r26438  
    3636     * @var midcom_core_user
    3737     */
    38     private $_person_user; 
     38    private $_person_user;
    3939
    4040    /**
     
    4545     */
    4646    private $_controller = null;
    47    
     47
    4848    /**
    4949     * Simple default constructor.
     
    5353        parent::__construct();
    5454    }
    55    
     55
    5656    function _on_initialize()
    5757    {
     
    7373    {
    7474        $schemadb_person = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_person'));
    75        
     75
    7676        $this->_modify_schema();
    77                
     77
    7878        $this->_controller = midcom_helper_datamanager2_controller::create('ajax');
    7979        $this->_controller->schemadb =& $schemadb_person;
     
    171171        // This handler uses Ajax, include the javascript
    172172        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . "/org.openpsa.helpers/ajaxutils.js");
    173        
     173
    174174        $this->_populate_toolbar($handler_id);
    175175        $_MIDCOM->bind_view_to_object($this->_contact, $this->_controller->datamanager->schema->name);
     
    179179        return true;
    180180    }
    181    
     181
    182182    /**
    183183     * Helper function that populates the toolbar with the necessary items
    184      * 
     184     *
    185185     * @param string $handler_id the ID of the current handler
    186186     */
     
    277277        );
    278278        org_openpsa_relatedto_plugin::add_button($this->_view_toolbar, $this->_contact->guid);
    279         org_openpsa_relatedto_plugin::add_journal_entry_button($this->_view_toolbar, $this->_contact->guid);
    280279
    281280        $qb = org_openpsa_contacts_buddy_dba::new_query_builder();
  • branches/developers/flack/acltuning/org.openpsa.contactwidget/config/manifest.inc

    r25413 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.core/config/manifest.inc

    r25413 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.core/ui.php

    r26370 r26438  
    2525
    2626        //needed js/css-files for jqgrid
    27         $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/org.openpsa.core/jqGrid-3.6.5/js/i18n/grid.locale-en.js');
    28         $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/org.openpsa.core/jqGrid-3.6.5/js/jquery.jqGrid.min.js');
     27        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/org.openpsa.core/jqGrid-3.7.1/js/i18n/grid.locale-en.js');
     28        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/org.openpsa.core/jqGrid-3.7.1/js/jquery.jqGrid.min.js');
    2929        $_MIDCOM->add_jsfile(MIDCOM_JQUERY_UI_URL . '/ui/ui.resizable.js');
    3030
     
    3636                'type'  => 'text/css',
    3737                'media' => 'all',
    38                 'href'  => MIDCOM_STATIC_URL . "/org.openpsa.core/jqGrid-3.6.5/css/ui.jqgrid.css",
     38                'href'  => MIDCOM_STATIC_URL . "/org.openpsa.core/jqGrid-3.7.1/css/ui.jqgrid.css",
    3939            )
    4040        );
     
    4646                'type'  => 'text/css',
    4747                'media' => 'all',
    48                 'href'  => MIDCOM_STATIC_URL . "/org.openpsa.core/jqGrid-3.6.5/css/ui.custom.css",
     48                'href'  => MIDCOM_STATIC_URL . "/org.openpsa.core/jqGrid-3.7.1/css/ui.custom.css",
    4949            )
    5050        );
  • branches/developers/flack/acltuning/org.openpsa.directmarketing/config/manifest.inc

    r25416 r26438  
    66    'midcom_dba_classes.inc',
    77),
    8 'version' => '8.09.8',
     8'version' => '8.09.9',
    99'state' => 'stable',
    1010'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.documents/config/manifest.inc

    r25413 r26438  
    77    'midcom_dba_classes.inc',
    88),
    9 'version' => '8.09.8',
     9'version' => '8.09.9',
    1010'package.xml' => array
    1111(
  • branches/developers/flack/acltuning/org.openpsa.expenses/config/manifest.inc

    r25413 r26438  
    11'name' => 'org.openpsa.expenses',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/org.openpsa.expenses/handler/hours/admin.php

    r25728 r26438  
    183183            case 'save':
    184184                $this->_hour_report->modify_hours_by_time_slot();
    185                 $_MIDCOM->relocate("hours/edit/{$this->_hour_report->guid}/");
    186                 // This will exit.
    187 
    188             case 'cancel':
    189                 if ($data['task'] == 0)
     185                if (count($args) > 1)
    190186                {
    191                     $_MIDCOM->relocate('');
     187                    $_MIDCOM->relocate("hours/task/" . $parent->guid . "/");
    192188                }
    193189                else
    194190                {
    195                     // TODO: Look up projects node
    196                     //$_MIDCOM->relocate("{$data['task']}/");
     191                    $_MIDCOM->relocate("hours/edit/{$this->_hour_report->guid}/");
     192                }
     193                // This will exit.
     194
     195            case 'cancel':
     196                if (count($args) > 1)
     197                {
     198                    $_MIDCOM->relocate("hours/task/" . $parent->guid . "/");
     199                }
     200                else
     201                {
    197202                    $_MIDCOM->relocate('');
    198203                }
  • branches/developers/flack/acltuning/org.openpsa.helpers/config/manifest.inc

    r25413 r26438  
    33'privileges' => array(),
    44'class_definitions' => array(),
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.httplib/config/manifest.inc

    r25413 r26438  
    22'icon' => 'org.openpsa.httplib/httplib.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/org.openpsa.imp/config/manifest.inc

    r26151 r26438  
    33'privileges' => array(),
    44'class_definitions' => array(),
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.interviews/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_landline-phone.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'privileges' => array(),
    66'class_definitions' => array(),
  • branches/developers/flack/acltuning/org.openpsa.invoices/config/manifest.inc

    r26292 r26438  
    22'icon' => 'stock-icons/16x16/stock_mail-open.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/org.openpsa.jabber/config/manifest.inc

    r25413 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.mail/config/manifest.inc

    r25412 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.mypage/config/manifest.inc

    r25413 r26438  
    33'privileges' => array(),
    44'class_definitions' => array(),
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.mypage/style/show-today.php

    r26311 r26438  
    4343    {
    4444        ?>
    45         <div class="journal" style="min-width:80%; padding-bottom:20px;">
     45        <div class="journal" style="max-width:80%;padding-bottom:20px;">
     46        <div style="min-width: 90%;">
    4647        <table id="treegrid"></table> <div id="ptreegrid"></div>
    4748        </div>
     49        </div>
    4850        <script type="text/javascript">
     51
     52        function jqgrid_resize()
     53        {
     54            var new_width = jQuery("#gbox_treegrid").parent().attr('clientWidth') - 5;
     55            jQuery("#treegrid").jqGrid().setGridWidth(new_width);
     56        }
    4957        //call for jqgrid-plugin
    5058        $(document).ready(
     
    7987                 ],
    8088                pager : "#ptreegrid",
    81                 autoWidth: true,
     89                width: '100%',
    8290                hoverrows: true,
    8391                rownumbers: true,
     
    8694                caption: "<?php echo $_MIDCOM->i18n->get_string('journal entries', 'org.openpsa.relatedto');?>",
    8795             });
    88              $("#gbox_treegrid").css('float' , 'none');
     96             jQuery("#gbox_treegrid").css('float' , 'none');
     97
     98             jqgrid_resize();
     99
     100             jQuery(window).resize(function()
     101             {
     102                jqgrid_resize();
     103             });
     104
    89105        });
     106
    90107
    91108        </script>
  • branches/developers/flack/acltuning/org.openpsa.notifications/config/manifest.inc

    r25413 r26438  
    33'purecode' => true,
    44'privileges' => array(),
    5 'version' => '8.09.8',
     5'version' => '8.09.9',
    66'state' => 'stable',
    77'class_definitions' => array
  • branches/developers/flack/acltuning/org.openpsa.products/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/package.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/org.openpsa.projects/config/manifest.inc

    r25413 r26438  
    66    'midcom_dba_classes.inc'
    77),
    8 'version' => '8.09.8',
     8'version' => '8.09.9',
    99'state' => 'stable',
    1010'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.qbpager/config/manifest.inc

    r25413 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/org.openpsa.relatedto/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/hidden.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/org.openpsa.relatedto/handler/relatedto.php

    r25244 r26438  
    2424    /**
    2525     * The mode we're in
    26      * 
     26     *
    2727     * @var string
    2828     */
     
    3131    /**
    3232     * The sort order
    33      * 
     33     *
    3434     * @var string
    3535     */
     
    3838    /**
    3939     * The link array
    40      * 
     40     *
    4141     * @var array
    4242     */
     
    126126            );
    127127        }
    128 
    129128        // Load "Create X" buttons for all the related info
    130129        $relatedto_button_settings = org_openpsa_relatedto_plugin::common_toolbar_buttons_defaults();
     
    165164            MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('view related information', 'org.openpsa.relatedto')
    166165        );
     166
     167        //add journal-entry-button
     168        org_openpsa_relatedto_plugin::add_journal_entry_button($this->_view_toolbar, $this->_object->guid);
    167169
    168170        $_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp);
     
    329331        midcom_show_style('relatedto_list_bottom');
    330332    }
    331    
     333
    332334    /**
    333335     * Sorts the given link array based on $this->_sort
     
    392394     *
    393395     * See the _show_render documentation for details about styling
    394      * 
     396     *
    395397     * @param array &$link The necessary link information
    396398     * @param object &other_obj The link target
     
    405407        $this->_request_data['icon'] = $ref->get_object_icon($other_obj);
    406408
    407         //Make sure we have the component classes available and 
     409        //Make sure we have the component classes available and
    408410        //fallback to default renderer if not
    409411        if (!$_MIDCOM->componentloader->load_graceful($link['component']))
    410412        {
    411413            $this->_render_line_default($link, $other_obj);
    412             return; 
     414            return;
    413415        }
    414416
     
    470472     *
    471473     * See the _show_render documentation for details about styling
    472      * 
     474     *
    473475     * @param array &$link The necessary link information
    474476     * @param object &other_obj The link target
     
    483485     *
    484486     * See the _show_render documentation for details about styling
    485      * 
     487     *
    486488     * @param array &$link The necessary link information
    487489     * @param object &other_obj The link target
     
    498500     *
    499501     * See the _show_render documentation for details about styling
    500      * 
     502     *
    501503     * @param array &$link The necessary link information
    502504     * @param object &other_obj The link target
     
    586588     *
    587589     * See the _show_render documentation for details about styling
    588      * 
     590     *
    589591     * @param array &$link The necessary link information
    590592     * @param object &other_obj The link target
     
    610612     *
    611613     * See the _show_render documentation for details about styling
    612      * 
     614     *
    613615     * @param array &$link The necessary link information
    614616     * @param object &other_obj The link target
     
    639641     *
    640642     * See the _show_render documentation for details about styling
    641      * 
     643     *
    642644     * @param array &$link The necessary link information
    643645     * @param object &other_obj The link target
     
    674676     *
    675677     * See the _show_render documentation for details about styling
    676      * 
     678     *
    677679     * @param array &$link The necessary link information
    678680     * @param object &other_obj The link target
     
    699701     *
    700702     * See the _show_render documentation for details about styling
    701      * 
     703     *
    702704     * @param array &$link The necessary link information
    703705     * @param object &other_obj The link target
     
    724726     * Tries to find certain properties likely to hold semi-useful information about
    725727     * the object, failing that outputs class and guid.
    726      * 
     728     *
    727729     * @param array &$link The necessary link information
    728730     * @param object &other_obj The link target
     
    739741        if ($object_url)
    740742        {
    741             $object_label = '<a href="' . $object_url . '" target="' . $class . $this->_object->guid . '">' . $object_label . '</a>'; 
     743            $object_label = '<a href="' . $object_url . '" target="' . $class . $this->_object->guid . '">' . $object_label . '</a>';
    742744        }
    743745
     
    754756    /**
    755757     * Renders (if necessary) controls for confirming/deleting link object
    756      * 
     758     *
    757759     * @param array &$link The necessary link information
    758760     * @param object &other_obj The link target
     
    781783        echo "</ul>\n";
    782784    }
    783    
     785
    784786    /**
    785787     * @param mixed $handler_id The ID of the handler.
  • branches/developers/flack/acltuning/org.openpsa.relatedto/locale/default.de.txt

    r26311 r26438  
    4949
    5050---STRING followUp
    51 Datum zur Wiedervorlage
     51Wiedervorlagedatum
    5252---STRINGEND
    5353
  • branches/developers/flack/acltuning/org.openpsa.relatedto/style/show_entries_html.php

    r26311 r26438  
    2020            colModel:[
    2121                {name:'id',index:'id', hidden:true, key:true },
    22                 {name:'name', index: 'name', width: 100 },
    23                 {name:'description',index: 'description', width: 70 },
     22                {name:'name', index: 'name' },
     23                {name:'description',index: 'description' },
    2424                {name:'index_date' , index: 'index_date' , hidden:true},
    2525                {name:'remind_date', index:'index_date', sorttype: "date", datefmt: "d.M.Y", fixed: true},
    26                 {name:'closed',index:'closed', width: 90, fixed: true  }
     26                {name:'closed',index:'closed', fixed: true  }
    2727             ],
    2828            pager : "#ptreegrid",
    29             autoWidth: true,
     29            width: '100%',
    3030            height: 'auto',
    3131            forceFit: true,
  • branches/developers/flack/acltuning/org.openpsa.reports/config/manifest.inc

    r25413 r26438  
    66    'midcom_dba_classes.inc',
    77),
    8 'version' => '8.09.8',
     8'version' => '8.09.9',
    99'package.xml' => array
    1010(
  • branches/developers/flack/acltuning/org.openpsa.sales/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/currency.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'class_definitions' => array
  • branches/developers/flack/acltuning/org.openpsa.smslib/config/manifest.inc

    r25413 r26438  
    44'privileges' => array(),
    55'class_definitions' => array(),
    6 'version' => '8.09.8',
     6'version' => '8.09.9',
    77'state' => 'stable',
    88'package.xml' => array
  • branches/developers/flack/acltuning/org.routamc.gallery/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/images.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
  • branches/developers/flack/acltuning/org.routamc.photostream/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/camera.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array
  • branches/developers/flack/acltuning/org.routamc.positioning/config/manifest.inc

    r25416 r26438  
    77    'midcom_dba_classes.inc',
    88),
    9 'version' => '8.09.8',
     9'version' => '8.09.9',
    1010'state' => 'stable',
    1111'package.xml' => array
  • branches/developers/flack/acltuning/org.routamc.statusmessage/config/manifest.inc

    r25416 r26438  
    11'name' => 'org.routamc.statusmessage',
    22'purecode' => false,
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'privileges' => array(),
  • branches/developers/flack/acltuning/pl.olga.mnogosearch/config/manifest.inc

    r25413 r26438  
    11'name' => 'pl.olga.mnogosearch',
    22'icon' => 'stock-icons/16x16/view.png',
    3 'version' => '8.09.8',
     3'version' => '8.09.9',
    44'state' => 'stable',
    55'package.xml' => array
  • branches/developers/flack/acltuning/pl.olga.tellafriend/config/manifest.inc

    r25413 r26438  
    22'icon' => 'stock-icons/16x16/stock_mail-send.png',
    33'purecode' => true,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'privileges' => array(),
    66'state' => 'stable',
  • branches/developers/flack/acltuning/pl.olga.windguru/config/manifest.inc

    r25413 r26438  
    22'icon' => 'pl.olga.windguru/weather.png',
    33'purecode' => false,
    4 'version' => '8.09.8',
     4'version' => '8.09.9',
    55'state' => 'stable',
    66'privileges' => array(),
Note: See TracChangeset for help on using the changeset viewer.