Skip to content

Commit

Permalink
New Feature: #2995: Quota Termination should have programmable URL, o…
Browse files Browse the repository at this point in the history 
…ption for auto-redirect, and editable text

Dev: Requires upgrade to db-schema 136 - new table and altered quota table

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@6726 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@jcleeland
jcleeland committed Apr 27, 2009
1 parent 481a375 commit c56b6ac
Show file tree
Hide file tree
Showing 9 changed files with 397 additions and 53 deletions.
17 changes: 16 additions & 1 deletion admin/install/create-mysql.sql
View file
Expand Up @@ -118,10 +118,25 @@ CREATE TABLE `prefix_quota` (
`qlimit` int(8) default NULL,
`action` int(2) default NULL,
`active` int(1) NOT NULL default '1',
`autoload_url` int(1) NOT NULL default '0',
PRIMARY KEY (`id`)
) ENGINE=$databasetabletype CHARACTER SET utf8 COLLATE utf8_unicode_ci;


--
-- Table Structure for table quota_languagesettings
--

CREATE TABLE `prefix_quota_languagesettings` (
`quotals_id` int(11) NOT NULL auto_increment,
`quotals_quota_id` int(11) NOT NULL default '0',
`quotals_language` varchar(45) NOT NULL default 'en',
`quotals_name` varchar(255) collate utf8_unicode_ci default NULL,
`quotals_message` text NOT NULL,
`quotals_url` varchar(255),
`quotals_urldescrip` varchar(255),
PRIMARY KEY (`quotals_id`)
) ENGINE=$databasetabletype CHARACTER SET utf8 COLLATE utf8_unicode_ci;



Expand Down Expand Up @@ -343,7 +358,7 @@ CREATE TABLE `prefix_templates` (
-- Table `settings_global`
--

INSERT INTO `prefix_settings_global` VALUES ('DBVersion', '134');
INSERT INTO `prefix_settings_global` VALUES ('DBVersion', '136');
INSERT INTO `prefix_settings_global` VALUES ('SessionName', '$sessionname');

--
Expand Down
14 changes: 12 additions & 2 deletions admin/install/create-odbc_mssql.sql
View file
Expand Up @@ -9,11 +9,21 @@ CREATE TABLE [prefix_quota] (
[qlimit] int ,
[action] int ,
[active] int NOT NULL default '1',
[autoload_url] int NOT NULL default '0',
PRIMARY KEY ([id])
);



CREATE TABLE [prefix_quota_languagesettings] (
[quotals_id] int NOT NULL IDENTITY (1,1),
[quotals_quota_id] int,
[quotals_language] varchar(45) NOT NULL default 'en',
[quotals_name] varchar(255),
[quotals_message] text,
[quotals_url] varchar(255),
[quotals_urldescrip] varchar(255),
PRIMARY KEY ([quotals_id])
);


CREATE TABLE [prefix_quota_members] (
Expand Down Expand Up @@ -361,7 +371,7 @@ CREATE TABLE [prefix_templates] (
-- Table [settings_global]
--

INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '134');
INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '136');
INSERT INTO [prefix_settings_global] VALUES ('SessionName', '$sessionname');

--
Expand Down
17 changes: 15 additions & 2 deletions admin/install/create-postgres.sql
View file
Expand Up @@ -131,13 +131,26 @@ CREATE TABLE prefix_quota (
name character varying(255),
qlimit integer,
"action" integer,
"active" integer NOT NULL default '1'
"active" integer NOT NULL default '1',
autoload_url integer NOT NULL DEFAULT 0
);

ALTER TABLE ONLY prefix_quota
ADD CONSTRAINT prefix_quota_pkey PRIMARY KEY (id);

CREATE TABLE prefix_quota_languagesettings
(
quotals_id serial NOT NULL,
quotals_quota_id integer NOT NULL DEFAULT 0,
quotals_language character varying(45) NOT NULL DEFAULT 'en'::character varying,
quotals_name character varying(200),
quotals_message text NOT NULL,
quotals_url character varying(255),
quotals_urldescrip character varying(255)
);

ALTER TABLE ONLY prefix_quota_languagesettings
ADD CONSTRAINT prefix_quota_languagesettings_pkey PRIMARY KEY (quotals_id);

CREATE TABLE prefix_quota_members (
id serial,
Expand Down Expand Up @@ -498,7 +511,7 @@ CREATE INDEX prefix_labels_ixcode_idx ON prefix_labels USING btree (code);
-- Table `settings_global`
--

INSERT INTO prefix_settings_global VALUES ('DBVersion', '134');
INSERT INTO prefix_settings_global VALUES ('DBVersion', '136');
INSERT INTO prefix_settings_global VALUES ('SessionName', '$sessionname');

--
Expand Down
18 changes: 16 additions & 2 deletions admin/install/upgrade-mysql.php
View file
Expand Up @@ -285,8 +285,22 @@ function db_upgrade($oldversion) {
{
modify_database("","ALTER TABLE `prefix_question_attributes` MODIFY `value` text"); echo $modifyoutput; flush();
modify_database("","UPDATE `prefix_settings_global` SET `stg_value`='135' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();
}

}
if ($oldversion < 136) //New Quota Functions
{
modify_database("", "ALTER TABLE `prefix_quota_languagesettings` ADD `autoload_url` int(1) NOT NULL default '0'"); echo $modifyoutput; flush();
modify_database("","CREATE TABLE `prefix_quota_languagesettings` (
`quotals_id` int(11) NOT NULL auto_increment,
`quotals_quota_id` int(11) NOT NULL default '0',
`quotals_language` varchar(45) NOT NULL default 'en',
`quotals_name` varchar(255) collate utf8_unicode_ci default NULL,
`quotals_message` text NOT NULL,
`quotals_url` varchar(255),
`quotals_urldescrip` varchar(255),
PRIMARY KEY (`quotals_id`)
) ENGINE=$databasetabletype CHARACTER SET utf8 COLLATE utf8_unicode_ci;"); echo $modifyoutput; flush();
modify_database("","update [prefix_settings_global] set [stg_value]='136' where stg_name='DBVersion'"); echo $modifyoutput; flush();
}
return true;
}

Expand Down
17 changes: 16 additions & 1 deletion admin/install/upgrade-odbc_mssql.php
View file
Expand Up @@ -292,7 +292,22 @@ function db_upgrade($oldversion) {
mssql_drop_constraint('value','question_attributes');
modify_database("","ALTER TABLE [prefix_question_attributes] ALTER COLUMN [value] text"); echo $modifyoutput; flush();
modify_database("","update [prefix_settings_global] set [stg_value]='135' where stg_name='DBVersion'"); echo $modifyoutput; flush();
}
}
if ($oldversion < 136) //New quota functions
{
modify_database("", "ALTER TABLE[prefix_quota] ADD [autoload_url] int NOT NULL default '0'"); echo $modifyoutput; flush();
modify_database("","CREATE TABLE [prefix_quota_languagesettings] (
[quotals_id] int NOT NULL IDENTITY (1,1),
[quotals_quota_id] int,
[quotals_language] varchar(45) NOT NULL default 'en',
[quotals_name] varchar(255),
[quotals_message] text,
[quotals_url] varchar(255),
[quotals_urldescrip] varchar(255),
PRIMARY KEY ([quotals_id])
);");echo $modifyoutput; flush();
modify_database("","update [prefix_settings_global] set [stg_value]='136' where stg_name='DBVersion'"); echo $modifyoutput; flush();
}
return true;
}

Expand Down
17 changes: 16 additions & 1 deletion admin/install/upgrade-postgres.php
View file
Expand Up @@ -117,7 +117,22 @@ function db_upgrade($oldversion) {
{
modify_database("","ALTER TABLE prefix_question_attributes ALTER COLUMN value TYPE text"); echo $modifyoutput; flush();
modify_database("","update prefix_settings_global set stg_value='135' where stg_name='DBVersion'"); echo $modifyoutput; flush();
}
}
if ($oldversion < 136)
{
modify_database("", "ALTER TABLE prefix_quota ADD autoload_url integer NOT NULL DEFAULT 0"); echo $modifyoutput; flush();
modify_database("", "CREATE TABLE prefix_quota_languagesettings (
quotals_id serial NOT NULL,
quotals_quota_id integer NOT NULL DEFAULT 0,
quotals_language character varying(45) NOT NULL DEFAULT 'en'::character varying,
quotals_name character varying(200),
quotals_message text NOT NULL,
quotals_url character varying(255),
quotals_urldescrip character varying(255));"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE ONLY prefix_quota_languagesettings
ADD CONSTRAINT prefix_quota_languagesettings_pkey PRIMARY KEY (quotals_id);"); echo $modifyoutput; flush();
modify_database("","update prefix_settings_global set stg_value='136' where stg_name='DBVersion'"); echo $modifyoutput; flush();
}



Expand Down

0 comments on commit c56b6ac

Please sign in to comment.