[geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.9, 1.10 mysql_1.4.1_to_1.5.0.php, 1.45, 1.46

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv52026/sql/updates

Modified Files:
	mssql_1.4.1_to_1.5.0.php mysql_1.4.1_to_1.5.0.php 
Log Message:
Added a "Webservices" group and a 'restric_webservices' option (not used yet)


Index: mssql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mssql_1.4.1_to_1.5.0.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mssql_1.4.1_to_1.5.0.php	6 Jan 2008 09:56:38 -0000	1.9
--- mssql_1.4.1_to_1.5.0.php	6 Jan 2008 11:57:13 -0000	1.10
***************
*** 2,6 ****
  
  /* These queries were copied from the mysql 1.4.2 upgrade and
- 
   * probably need to be rewritten for MS SQL
  
--- 2,5 ----
***************
*** 185,189 ****
      $c->add('hide_no_news_msg',0,'select',1,24,0,1300,TRUE);
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
-     $c->add('atom_max_stories', 10, 'text', 1, 24, 0, 1315, TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
      $c->add('aftersave_story','item','select',1,24,9,1330,TRUE);
--- 184,187 ----
***************
*** 237,241 ****
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
      $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,37,12,1830,TRUE);
! 
  }
  
--- 235,241 ----
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
      $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,37,12,1830,TRUE);
!     $c->add('disable_webservices',   0, 'select', 7, 38, 0, 1840, TRUE);
!     $c->add('restrict_webservices',  0, 'select', 7, 38, 0, 1850, TRUE);
!     $c->add('atom_max_stories',     10, 'text',   7, 38, 0, 1860, TRUE);
  }
  

Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** mysql_1.4.1_to_1.5.0.php	6 Jan 2008 09:56:38 -0000	1.45
--- mysql_1.4.1_to_1.5.0.php	6 Jan 2008 11:57:13 -0000	1.46
***************
*** 174,178 ****
      $c->add('hide_no_news_msg',0,'select',1,24,0,1300,TRUE);
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
-     $c->add('atom_max_stories', 10, 'text', 1, 24, 0, 1315, TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
      $c->add('aftersave_story','item','select',1,24,9,1330,TRUE);
--- 174,177 ----
***************
*** 218,222 ****
      $c->add('allowed_protocols',array('http','ftp','https'),'%text',0,0,NULL,1740,TRUE);
      $c->add('disable_autolinks',0,'select',7,7,0,1750,TRUE);
-     $c->add('disable_webservices',0,'select',7,7,0,1755,TRUE);
      $c->add('censormode',1,'select',7,35,0,1760,TRUE);
      $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
--- 217,220 ----
***************
*** 227,231 ****
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
      $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,37,12,1830,TRUE);
! 
  }
  
--- 225,231 ----
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
      $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,37,12,1830,TRUE);
!     $c->add('disable_webservices',   0, 'select', 7, 38, 0, 1840, TRUE);
!     $c->add('restrict_webservices',  0, 'select', 7, 38, 0, 1850, TRUE);
!     $c->add('atom_max_stories',     10, 'text',   7, 38, 0, 1860, TRUE);
  }