[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] news_admin/setup tables_current.inc.php, 1.5 tables_u
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] news_admin/setup tables_current.inc.php, 1.5 tables_update.inc.php, 1.3 setup.inc.php, 1.13 phpgw_pl.lang, 1.2 phpgw_fi.lang, 1.2 phpgw_fr.lang, 1.5 phpgw_en.lang, 1.7 default_records.inc.php, 1.4 |
|
Date: |
Wed, 25 May 2005 03:19:00 +0200 |
Update of news_admin/setup
Modified Files:
Branch: MAIN
tables_current.inc.php lines: +8 -7
tables_update.inc.php lines: +74 -4
setup.inc.php lines: +3 -2
phpgw_pl.lang lines: +1 -1
phpgw_fi.lang lines: +13 -13
phpgw_fr.lang lines: +20 -9
phpgw_en.lang lines: +16 -5
default_records.inc.php lines: +4 -4
Log Message:
New CSS version, also supports WYSIWYG editor, still has some kinks to be
ironed out
====================================================
Index: news_admin/setup/tables_current.inc.php
diff -u news_admin/setup/tables_current.inc.php:1.4
news_admin/setup/tables_current.inc.php:1.5
--- news_admin/setup/tables_current.inc.php:1.4 Tue Jun 3 03:15:12 2003
+++ news_admin/setup/tables_current.inc.php Wed May 25 01:19:51 2005
@@ -24,9 +24,11 @@
'news_subject' => array('type' =>
'varchar','precision' => '255','nullable' => True),
'news_submittedby' => array('type' =>
'varchar','precision' => '255','nullable' => True),
'news_content' => array('type' =>
'blob','nullable' => True),
- 'news_status' => array('type' =>
'varchar','precision' => '16','nullable' => True),
+ 'news_begin' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'news_end' => array('type' => 'int','precision'
=> '4','nullable' => True),
'news_cat' => array('type' => 'int','precision'
=> '4','nullable' => True),
- 'news_teaser' => array('type' =>
'varchar','precision' => '255','nullable' => True)
+ 'news_teaser' => array('type' =>
'text','nullable' => True),
+ 'is_html' => array('type' => 'int','precision'
=> '2','nullable' => False,'default' => '0')
),
'pk' => array('news_id'),
'fk' => array(),
@@ -36,20 +38,19 @@
'phpgw_news_export' => array(
'fd' => array(
'cat_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
- //export_types: 0 no export, 1 rss091, 2 rss1,
3 rss2
'export_type' => array('type' =>
'int','precision' => '2','nullable' => True),
'export_itemsyntax' => array('type' =>
'int','precision' => '2','nullable' => True),
'export_title' => array('type' =>
'varchar','precision' => '255','nullable' => True),
'export_link' => array('type' =>
'varchar','precision' => '255','nullable' => True),
- 'export_description' => array('type' => 'text',
'nullable' => True),
+ 'export_description' => array('type' =>
'text','nullable' => True),
'export_img_title' => array('type' =>
'varchar','precision' => '255','nullable' => True),
'export_img_url' => array('type' =>
'varchar','precision' => '255','nullable' => True),
- 'export_img_link' => array('type' =>
'varchar','precision' => '255','nullable' => True),
+ 'export_img_link' => array('type' =>
'varchar','precision' => '255','nullable' => True)
),
'pk' => array('cat_id'),
'fk' => array(),
'ix' => array(),
'uc' => array()
- ),
+ )
);
?>
====================================================
Index: news_admin/setup/tables_update.inc.php
diff -u news_admin/setup/tables_update.inc.php:1.2
news_admin/setup/tables_update.inc.php:1.3
--- news_admin/setup/tables_update.inc.php:1.2 Tue Jun 3 03:15:12 2003
+++ news_admin/setup/tables_update.inc.php Wed May 25 01:19:51 2005
@@ -46,9 +46,6 @@
return $setup_info['news_admin']['currentver'];
}
-
-
-
$test[] = '0.8.1.002';
function news_admin_upgrade0_8_1_002()
{
@@ -87,4 +84,77 @@
$GLOBALS['setup_info']['news_admin']['currentver'] =
'0.9.14.501';
return $GLOBALS['setup_info']['news_admin']['currentver'];
}
+
+ $test[] = '0.9.14.501';
+ function news_admin_upgrade0_9_14_501()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_news','news_begin',array(
+ 'type' => 'int','precision' => '4','nullable' => True
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_news','news_end',array(
+ 'type' => 'int','precision' => '4','nullable' => True
+ ));
+ $db2 = $GLOBALS['phpgw_setup']->db;
+ $GLOBALS['phpgw_setup']->oProc->query('SELECT
news_id,news_status FROM phpgw_news');
+ while($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $unixtimestampmax = 2147483647;
+ $db2->query('UPDATE phpgw_news SET
news_begin=news_date,news_end=' .
+
(($GLOBALS['phpgw_setup']->oProc->f('news_status') == 'Active') ?
$unixtimestampmax : 'news_date') .
+ ' WHERE news_id=' .
$GLOBALS['phpgw_setup']->oProc->f('news_id'));
+ }
+ $newtbldef = array(
+ 'fd' => array(
+ 'news_id' => array('type' => 'auto','nullable'
=> False),
+ 'news_date' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'news_subject' => array('type' =>
'varchar','precision' => '255','nullable' => True),
+ 'news_submittedby' => array('type' =>
'varchar','precision' => '255','nullable' => True),
+ 'news_content' => array('type' =>
'blob','nullable' => True),
+ 'news_begin' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'news_end' => array('type' => 'int','precision'
=> '4','nullable' => True),
+ 'news_cat' => array('type' => 'int','precision'
=> '4','nullable' => True),
+ 'news_teaser' => array('type' =>
'varchar','precision' => '255','nullable' => True)
+ ),
+ 'pk' => array('news_id'),
+ 'fk' => array(),
+ 'ix' => array('news_date','news_subject'),
+ 'uc' => array()
+ );
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_news',$newtbldef,'news_status');
+
+ $GLOBALS['setup_info']['news_admin']['currentver'] =
'0.9.14.502';
+ return $GLOBALS['setup_info']['news_admin']['currentver'];
+ }
+
+
+
+
+ $test[] = '0.9.14.502';
+ function news_admin_upgrade0_9_14_502()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_news','is_html',array(
+ 'type' => 'int',
+ 'precision' => '2',
+ 'nullable' => False,
+ 'default' => '0'
+ ));
+
+
+ $GLOBALS['setup_info']['news_admin']['currentver'] =
'0.9.14.503';
+ return $GLOBALS['setup_info']['news_admin']['currentver'];
+ }
+
+
+ $test[] = '0.9.14.503';
+ function news_admin_upgrade0_9_14_503()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_news','news_teaser',array(
+ 'type' => 'text',
+ 'nullable' => True
+ ));
+
+
+ $GLOBALS['setup_info']['news_admin']['currentver'] =
'0.9.17.501';
+ return $GLOBALS['setup_info']['news_admin']['currentver'];
+ }
?>
====================================================
Index: news_admin/setup/setup.inc.php
diff -u news_admin/setup/setup.inc.php:1.12 news_admin/setup/setup.inc.php:1.13
--- news_admin/setup/setup.inc.php:1.12 Sun May 15 12:25:42 2005
+++ news_admin/setup/setup.inc.php Wed May 25 01:19:51 2005
@@ -14,7 +14,7 @@
/* Basic information about this app */
$setup_info['news_admin']['name'] = 'news_admin';
//$setup_info['news_admin']['title'] = 'News Admin';
- $setup_info['news_admin']['version'] = '0.9.14.503';
+ $setup_info['news_admin']['version'] = '0.9.17.501';
$setup_info['news_admin']['app_order'] = 4;
$setup_info['news_admin']['enable'] = 1;
@@ -29,6 +29,7 @@
/* Dependencies for this app to work */
$setup_info['news_admin']['depends'][] = array(
'appname' => 'phpgwapi',
- 'versions' => Array('0.9.13', '0.9.14', '0.9.15', '0.9.17',
'0.9.18')
+ 'versions' => Array('0.9.13', '0.9.14', '0.9.15', '0.9.16')
);
+
====================================================
Index: news_admin/setup/phpgw_pl.lang
diff -u news_admin/setup/phpgw_pl.lang:1.1 news_admin/setup/phpgw_pl.lang:1.2
--- news_admin/setup/phpgw_pl.lang:1.1 Fri Aug 23 03:01:18 2002
+++ news_admin/setup/phpgw_pl.lang Wed May 25 01:19:51 2005
@@ -4,7 +4,7 @@
item has been deleted news_admin pl
maintain news admin pl
new item has been added news_admin pl Dodano nowy punkt
-news admin common pl Wiadomo¶ci administratora
+news_admin common pl Wiadomo¶ci administratora
no entries found news_admin pl
submitted by common pl Wys³ane przez
the news content is missing news_admin pl
====================================================
Index: news_admin/setup/phpgw_fi.lang
diff -u news_admin/setup/phpgw_fi.lang:1.1 news_admin/setup/phpgw_fi.lang:1.2
--- news_admin/setup/phpgw_fi.lang:1.1 Tue Apr 2 21:04:51 2002
+++ news_admin/setup/phpgw_fi.lang Wed May 25 01:19:51 2005
@@ -1,13 +1,13 @@
-active news_admin fi Aktiivinen
-add news item news_admin fi Lisää uutinen
-content news_admin fi Sisältö
-item has been deleted news_admin fi Kohde poistettu
-maintain news admin fi Uutisten ylläpito
-new item has been added news_admin fi Uusi kohde lisätty
-news admin common fi Uutisten ylläpito
-no entries found news_admin fi ei kohteita
-submitted by common fi Luonut
-the news content is missing news_admin fi Uutisen sisältö puuttuu
-the subject is missing news_admin fi Uutisen otsikko puuttuu
-view this category news_admin fi Näytä luokka
-webpage news admin news_admin fi Web-uutisten ylläpito
+active news_admin fi Aktiivinen
+add news item news_admin fi Lisää uutinen
+content news_admin fi Sisältö
+item has been deleted news_admin fi Kohde poistettu
+maintain news admin fi Uutisten ylläpito
+new item has been added news_admin fi Uusi kohde lisätty
+news_admin common fi Uutisten ylläpito
+no entries found news_admin fi ei kohteita
+submitted by common fi Luonut
+the news content is missing news_admin fi Uutisen sisältö puuttuu
+the subject is missing news_admin fi Uutisen otsikko puuttuu
+view this category news_admin fi Näytä luokka
+webpage news admin news_admin fi Web-uutisten ylläpito
====================================================
Index: news_admin/setup/phpgw_fr.lang
diff -u news_admin/setup/phpgw_fr.lang:1.4 news_admin/setup/phpgw_fr.lang:1.5
--- news_admin/setup/phpgw_fr.lang:1.4 Tue Jun 3 20:40:18 2003
+++ news_admin/setup/phpgw_fr.lang Wed May 25 01:19:51 2005
@@ -1,17 +1,26 @@
active news_admin fr Actif
-add new news news_admin fr Ajouter des nouvelles "nouvelles"
+add new news news_admin fr Ajouter des nouvelles récentes
add news item news_admin fr Ajouter un objet de nouvelles
+all news news_admin fr Toutes les nouvelles
+always news_admin fr Toujours
configuration news_admin fr Configuration
-configure access permissions news_admin fr Configurer les
permissions d'accès
+configure access permissions news_admin fr Configurer les droits
d'accès
configure rss exports news_admin fr Configurer les exports RSS
+contains html news_admin fr Contient du HTML
content news_admin fr Contenu
Edit news item news_admin fr Modifier un objet de nouvelles
-format for links to items news_admin fr Format des liens vers
les objets
-format of export news_admin fr Format de l'export
+format for links to items news_admin fr Format pour les liens
vers les objets
+format of export news_admin fr Format d'export
+from news_admin fr Depuis
global news news_admin fr Nouvelles globales
-implies read permission news_admin fr Implique la permission
en lecture
+global_news news_admin fr Nouvelles_globales
+image link news_admin fr Lien Image
+image title news_admin fr Titre Image
+image url news_admin fr URL Image
+implies read permission news_admin fr implique les droits en
lecture
item has been deleted news_admin fr L'objet a été effacé
item not found news_admin fr Objet non trouvé
+link news_admin fr Lien
Main news_admin fr Principal
maintain news_admin fr Maintenir
maintain news admin fr Maintenir les nouvelles
@@ -23,16 +32,18 @@
News item has been updated news_admin fr Un objet de nouvelles a
été mis à jour
news_admin common fr Administration des nouvelles
no entries found news_admin fr Aucune entrée trouvée
-no news news_admin fr Pas de nouvelles
+no news news_admin fr Aucune nouvelle n'est actuellement
disponible dans la catégorie
no rss export news_admin fr Pas d'export RSS
+on news_admin fr sur
publish date news_admin fr Date de publication
-read news item news_admin fr Lire un objet de nouvelles
-read permissions news_admin fr Permissions en lecture
+read permissions news_admin fr Permissions de lecture
submitted by common fr Soumis par
teaser news_admin fr Accroche
the news content is missing news_admin fr Le contenu de la
nouvelle est manquant
the subject is missing news_admin fr Le sujet est manquant
+until news_admin fr Jusqu'à
view this category news_admin fr Voir cette catégorie
+visible news_admin fr Visible
webpage news admin news_admin fr Page Web d'aministration des
nouvelles
write news_admin fr Ecrire
-write permissions news_admin fr Permissions en écriture
+write permissions news_admin fr Permissions d'écriture
====================================================
Index: news_admin/setup/phpgw_en.lang
diff -u news_admin/setup/phpgw_en.lang:1.6 news_admin/setup/phpgw_en.lang:1.7
--- news_admin/setup/phpgw_en.lang:1.6 Tue Jun 3 20:40:18 2003
+++ news_admin/setup/phpgw_en.lang Wed May 25 01:19:51 2005
@@ -1,17 +1,26 @@
active news_admin en Active
add new news news_admin en Add new news
add news item news_admin en Add news item
+all news news_admin en All news
+always news_admin en Always
configuration news_admin en Configuration
configure access permissions news_admin en Configure Access
Permissions
configure rss exports news_admin en Configure RSS exports
+contains html news_admin en Contains HTML
content news_admin en Content
edit news item news_admin en Edit news item
format for links to items news_admin en Format for links to
items
format of export news_admin en Format of export
-global news news_admin en Global news
+from news_admin en From
+global news news_admin en Global News
+global_news news_admin en Global_News
+image link news_admin en Image Link
+image title news_admin en Image Title
+image url news_admin en Image URL
implies read permission news_admin en implies read permission
item has been deleted news_admin en Item has been deleted
item not found news_admin en Item not found
+link news_admin en Link
main news_admin en Main
maintain news_admin en Maintain
maintain news admin en Maintain News
@@ -23,16 +32,18 @@
news item has been updated news_admin en News item has been
updated
news_admin common en News Admin
no entries found news_admin en no entries found
-no news news_admin en no news
+no news news_admin en No News is Currently Available in the
Category
no rss export news_admin en No RSS export
publish date news_admin en Publish Date
-read news item news_admin en read news item
read permissions news_admin en Read permissions
-submitted by common en Submitted by
-teaser news_admin en teaser
+submitted by news_admin en Submitted by
+summary news_admin en Summary
+teaser news_admin en Teaser
the news content is missing news_admin en The news content is
missing
the subject is missing news_admin en The subject is missing
+until news_admin en until
view this category news_admin en View this category
+visible news_admin en Visible
webpage news admin news_admin en Webpage news admin
write news_admin en Write
write permissions news_admin en Write permissions
====================================================
Index: news_admin/setup/default_records.inc.php
diff -u news_admin/setup/default_records.inc.php:1.3
news_admin/setup/default_records.inc.php:1.4
--- news_admin/setup/default_records.inc.php:1.3 Mon Mar 4 07:18:46 2002
+++ news_admin/setup/default_records.inc.php Wed May 25 01:19:51 2005
@@ -11,7 +11,7 @@
/* $Id$ */
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_news
(news_date,news_subject,news_submittedby,news_content,news_status) "
- . "VALUES ('" . time()
- . "','Sample news item','1','This is a sample item to show what
this program does.','Active')");
+// $oProc->query("INSERT INTO phpgw_news
(news_date,news_subject,news_submittedby,news_content,news_status) "
+// . "VALUES ('" . time()
+// . "','Sample news item','1','This is a sample item to show what
this program does.','Active')");
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] news_admin/setup tables_current.inc.php, 1.5 tables_update.inc.php, 1.3 setup.inc.php, 1.13 phpgw_pl.lang, 1.2 phpgw_fi.lang, 1.2 phpgw_fr.lang, 1.5 phpgw_en.lang, 1.7 default_records.inc.php, 1.4,
skwashd <=