From 93e066dbccde757ac54fce818bd97ef0043b6207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 21 Dec 2011 00:03:21 +0100 Subject: bug 964: Patches from Brian Dawson: allow selection of keysize in IE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- includes/keygen.php | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++ pages/account/17.php | 122 +---------------------------- pages/account/4.php | 175 +---------------------------------------- 3 files changed, 220 insertions(+), 293 deletions(-) create mode 100644 includes/keygen.php diff --git a/includes/keygen.php b/includes/keygen.php new file mode 100644 index 0000000..688f7a1 --- /dev/null +++ b/includes/keygen.php @@ -0,0 +1,216 @@ + + + +Internet Options->Security->Trusted Websites, click on Custom Level, check ActiveX control elements that are not marked as safe initialized on start in scripts")?> + +

+ + + + + +
+

+ + +

+

+Select Keysize: + + + +"> + +
+

+ diff --git a/pages/account/17.php b/pages/account/17.php index 2ba5390..36b0c9f 100644 --- a/pages/account/17.php +++ b/pages/account/17.php @@ -14,124 +14,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ ?> - - - - -

- - - - - - -
-

- - -

-

- - - - -"> - -
-

- +require_once "../../includes/keygen.php"; diff --git a/pages/account/4.php b/pages/account/4.php index a4d6597..36b0c9f 100644 --- a/pages/account/4.php +++ b/pages/account/4.php @@ -14,177 +14,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ ?> - - -Internet Options->Security->Trusted Websites, click on Custom Level, check ActiveX control elements that are not marked as safe initialized on start in scripts")?> - -

- - - - - -
-

- - -

-

- - - -"> - -
-

- +require_once "../../includes/keygen.php"; -- cgit v1.2.1 From d230aee9764e30d3fc8bdb4f58c1e06580993683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 21 Dec 2011 00:31:06 +0100 Subject: bug 964: Format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- includes/keygen.php | 381 +++++++++++++++++++++++++++------------------------- 1 file changed, 195 insertions(+), 186 deletions(-) diff --git a/includes/keygen.php b/includes/keygen.php index 688f7a1..974d56e 100644 --- a/includes/keygen.php +++ b/includes/keygen.php @@ -1,6 +1,6 @@ - - -Internet Options->Security->Trusted Websites, click on Custom Level, check ActiveX control elements that are not marked as safe initialized on start in scripts")?> - -

- - - - - -
-

- + -

-

-Select Keysize: - - - -"> - -
-

- +

+

+ Select Keysize: + + + + + "> + +
+

+ Date: Wed, 21 Dec 2011 01:04:47 +0100 Subject: bug 964: Doh. require() confusion. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- pages/account/17.php | 2 +- pages/account/4.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/account/17.php b/pages/account/17.php index 36b0c9f..8ac8b65 100644 --- a/pages/account/17.php +++ b/pages/account/17.php @@ -16,4 +16,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -require_once "../../includes/keygen.php"; +require_once($_SESSION['_config']['filepath'].'/includes/keygen.php'); diff --git a/pages/account/4.php b/pages/account/4.php index 36b0c9f..8ac8b65 100644 --- a/pages/account/4.php +++ b/pages/account/4.php @@ -16,4 +16,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -require_once "../../includes/keygen.php"; +require_once($_SESSION['_config']['filepath'].'/includes/keygen.php'); -- cgit v1.2.1 From 30ac5366838978bd685da21208974c83883cd9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 21 Dec 2011 01:34:40 +0100 Subject: bug 964: Move the selection box to the right form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- includes/keygen.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/includes/keygen.php b/includes/keygen.php index 974d56e..fcbc48c 100644 --- a/includes/keygen.php +++ b/includes/keygen.php @@ -27,15 +27,21 @@ if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && Internet Options->Security->Trusted Websites, click on Custom Level, check ActiveX control elements that are not marked as safe initialized on start in scripts")?> -

- - + +

+

+ +

Select Keysize:

-
-

+

+ +

: + +

+ + + +

+ + + + + + + + + + + +

diff --git a/locale/Makefile b/locale/Makefile index 1517066..4215a4f 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -176,7 +176,8 @@ upload.clean: template.clean messages.pot: $(GETTEXT_FILES) xgettext --output - --sort-by-file --copyright-holder "CAcert Inc." \ --package-name "CAcert" --package-version "$(VERSION)" \ - --msgid-bugs-address "translations-admin@cacert.org" $^ | \ + --msgid-bugs-address "translations-admin@cacert.org" \ + --add-comments=TRANSLATORS $^ | \ # replace place holders in the lines before the first msgid\ sed '1,/^msgid/ { s/SOME DESCRIPTIVE TITLE/$(DESCRITPION)/; s/YEAR/$(COPYRIGHT_YEAR)/; s/PACKAGE/$(PACKAGE)/ }' \ > $@ diff --git a/www/keygenIE.js b/www/keygenIE.js new file mode 100644 index 0000000..fa4bce6 --- /dev/null +++ b/www/keygenIE.js @@ -0,0 +1,603 @@ +var CAcert_keygen_IE = function () { + + /// Makes a new DOM text node + var textnode = function (text) { + return document.createTextNode(text); + } + + + /// makes a new

element + var paragraph = function (text) { + var paragraph = document.createElement("p"); + paragraph.appendChild(textnode(text)); + return paragraph; + } + + + /// makes a new

 elemtent
+	var pre = function (text) {
+		var pre = document.createElement("pre");
+		pre.appendChild(textnode(text));
+		return pre;
+	}
+	
+	
+	/// makes a new