From b1a10a129d7950186012cb7896f64af6d285431e Mon Sep 17 00:00:00 2001 From: DSB Date: Sun, 25 Nov 2012 15:41:51 +0100 Subject: [PATCH] CRLF -> LF --- .gitattributes | 22 + .gitignore | 4 + .../ftp_uploadtest/ftp_transfer_testfile.txt | 20 +- application/language/ar/lang.php | 24 +- application/language/bg_BG/lang.php | 24 +- application/language/ca/lang.php | 24 +- application/language/cs/lang.php | 24 +- application/language/da/lang.php | 24 +- application/language/de/lang.php | 24 +- application/language/de_CH/lang.php | 24 +- application/language/de_LU/lang.php | 24 +- application/language/el/lang.php | 24 +- application/language/en/lang.php | 24 +- application/language/es/lang.php | 24 +- application/language/fa/lang.php | 24 +- application/language/fr/lang.php | 24 +- application/language/hr/lang.php | 24 +- application/language/hu_HU/lang.php | 24 +- application/language/it/lang.php | 24 +- application/language/nl/lang.php | 24 +- application/language/pl/lang.php | 24 +- application/language/pt_BR/lang.php | 24 +- application/language/ro/lang.php | 24 +- application/language/ru/lang.php | 24 +- application/language/sk/lang.php | 24 +- application/language/sl/lang.php | 24 +- application/language/sv_SE/lang.php | 24 +- application/language/tr/lang.php | 24 +- application/language/vi_VN/lang.php | 24 +- application/language/zh_CN/lang.php | 24 +- .../views/mobile/scripts/config/index.phtml | 326 ++++++------- .../mobile/scripts/partials/header.phtml | 36 +- .../sql/databases/create-database.phtml | 176 +++---- .../views/scripts/sql/sqlbox/sqlbox.phtml | 266 +++++----- .../views/scripts/sql/tables/button-bar.phtml | 170 +++---- .../scripts/sql/tables/create-table.phtml | 14 +- pdepend.xml | 18 +- public/js/jquery/autogrow.js | 122 ++--- public/js/pwdmeter.js | 460 +++++++++--------- 39 files changed, 1154 insertions(+), 1128 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..412eeda --- /dev/null +++ b/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f9bad04 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ + +/.idea +/application/configs/users.ini +/work/config/mysqldumper.ini \ No newline at end of file diff --git a/application/forms/Config/ftp_uploadtest/ftp_transfer_testfile.txt b/application/forms/Config/ftp_uploadtest/ftp_transfer_testfile.txt index 99ade61..37bb4cc 100644 --- a/application/forms/Config/ftp_uploadtest/ftp_transfer_testfile.txt +++ b/application/forms/Config/ftp_uploadtest/ftp_transfer_testfile.txt @@ -1,11 +1,11 @@ -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. - -Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. - -Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. - -Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. - -Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. - +Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. + +Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. + +Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. + +Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. + +Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. + At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur \ No newline at end of file diff --git a/application/language/ar/lang.php b/application/language/ar/lang.php index 7bf5d89..be77d5d 100644 --- a/application/language/ar/lang.php +++ b/application/language/ar/lang.php @@ -1,14 +1,14 @@ - 'حدث', 'L_ACTIVATED' => 'تفعيل', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/bg_BG/lang.php b/application/language/bg_BG/lang.php index 0020128..60dc07d 100644 --- a/application/language/bg_BG/lang.php +++ b/application/language/bg_BG/lang.php @@ -1,14 +1,14 @@ - 'Действие', 'L_ACTIVATED' => 'Активиран', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/ca/lang.php b/application/language/ca/lang.php index a22ef02..277f450 100644 --- a/application/language/ca/lang.php +++ b/application/language/ca/lang.php @@ -1,14 +1,14 @@ - 'Acció', 'L_ACTIVATED' => 'actiu', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Només es permeten digits numerals.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Tipus no vàlid. S\'esperava String (cadena de texte), Integer (nombre sencer), Float (nombre amb coma flotant), Boolean (boleà) o Array (matriz).', 'L_ZEND_ID_NOT_SAME' => 'Ambdós IDs no coincideixen.', -); +); return $lang; diff --git a/application/language/cs/lang.php b/application/language/cs/lang.php index bb37b25..8b440d6 100644 --- a/application/language/cs/lang.php +++ b/application/language/cs/lang.php @@ -1,14 +1,14 @@ - 'Akce', 'L_ACTIVATED' => 'aktivní', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/da/lang.php b/application/language/da/lang.php index 3c3ed0a..e5aaf3d 100644 --- a/application/language/da/lang.php +++ b/application/language/da/lang.php @@ -1,14 +1,14 @@ - 'Aktion', 'L_ACTIVATED' => 'aktiveret', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Kun tal kan indtastes.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Typen af ​​værdien er ugyldig. Streng, heltal, float, boolean eller array forventet.', 'L_ZEND_ID_NOT_SAME' => 'De to givne tokens stemmer ikke overens.', -); +); return $lang; diff --git a/application/language/de/lang.php b/application/language/de/lang.php index 19c6fb7..9cb7658 100644 --- a/application/language/de/lang.php +++ b/application/language/de/lang.php @@ -1,14 +1,14 @@ - 'Aktion', 'L_ACTIVATED' => 'aktiviert', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Es dürfen nur Zahlen eingegeben werden.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Der Typ des Wertes ist ungültig. Es wird ein String, Integer, Float, Boolean oder Array erwartet.', 'L_ZEND_ID_NOT_SAME' => 'Die beiden angegebenen Merkmale stimmen nicht überein.', -); +); return $lang; diff --git a/application/language/de_CH/lang.php b/application/language/de_CH/lang.php index 9d53c5e..f3e80b3 100644 --- a/application/language/de_CH/lang.php +++ b/application/language/de_CH/lang.php @@ -1,14 +1,14 @@ - 'Aktion', 'L_ACTIVATED' => 'aktiviärt', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/de_LU/lang.php b/application/language/de_LU/lang.php index 19b8e64..35852ae 100644 --- a/application/language/de_LU/lang.php +++ b/application/language/de_LU/lang.php @@ -1,14 +1,14 @@ - '', 'L_ACTIVATED' => 'aktivéiert', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/el/lang.php b/application/language/el/lang.php index d4d142b..c71a576 100644 --- a/application/language/el/lang.php +++ b/application/language/el/lang.php @@ -1,14 +1,14 @@ - 'Ενέργεια', 'L_ACTIVATED' => 'ενεργό', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Επιτρέπονται μόνο ψηφία', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Δόθηκε άκυρος τύπος. Αναμενόταν κείμενο, ακέραιος, float, boolean ή array.', 'L_ZEND_ID_NOT_SAME' => 'Τα δύο σύμβολα δεν ταιριάζουν', -); +); return $lang; diff --git a/application/language/en/lang.php b/application/language/en/lang.php index 0db818c..d26282f 100644 --- a/application/language/en/lang.php +++ b/application/language/en/lang.php @@ -1,14 +1,14 @@ - 'Action', 'L_ACTIVATED' => 'activated', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Only digits are allowed.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Invalid type given. String, integer, float, boolean or array expected.', 'L_ZEND_ID_NOT_SAME' => 'The two given tokens do not match.', -); +); return $lang; diff --git a/application/language/es/lang.php b/application/language/es/lang.php index 11d27eb..ba068e8 100644 --- a/application/language/es/lang.php +++ b/application/language/es/lang.php @@ -1,14 +1,14 @@ - 'Acción', 'L_ACTIVATED' => 'activo', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Sólo se permite números.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Tipo no válido. Se esperaba String (cadena de texto), Integer (número entero), Float (número con coma flotante), Boolean (boleano) o Array (matriz).', 'L_ZEND_ID_NOT_SAME' => 'Ambos IDs no coinciden.', -); +); return $lang; diff --git a/application/language/fa/lang.php b/application/language/fa/lang.php index cffbbe7..b41fd9a 100644 --- a/application/language/fa/lang.php +++ b/application/language/fa/lang.php @@ -1,14 +1,14 @@ - 'عمليات', 'L_ACTIVATED' => 'فعال', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'فقط ارقام معتبر میباشند', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'مقدار ناصحیح وارد شده است', 'L_ZEND_ID_NOT_SAME' => 'رمز ها یکسان نیستند', -); +); return $lang; diff --git a/application/language/fr/lang.php b/application/language/fr/lang.php index 10e99fb..011a364 100644 --- a/application/language/fr/lang.php +++ b/application/language/fr/lang.php @@ -1,14 +1,14 @@ - 'Action', 'L_ACTIVATED' => 'activé', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => 'Les deux données ne correspondent pas !', -); +); return $lang; diff --git a/application/language/hr/lang.php b/application/language/hr/lang.php index 69f19f5..5924f8b 100644 --- a/application/language/hr/lang.php +++ b/application/language/hr/lang.php @@ -1,14 +1,14 @@ - 'Akcija', 'L_ACTIVATED' => 'aktiviran', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/hu_HU/lang.php b/application/language/hu_HU/lang.php index 37c3097..6a54882 100644 --- a/application/language/hu_HU/lang.php +++ b/application/language/hu_HU/lang.php @@ -1,14 +1,14 @@ - '', 'L_ACTIVATED' => 'aktiválva', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Csak számok engedélyezettek.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/it/lang.php b/application/language/it/lang.php index 448b18e..01ce43d 100644 --- a/application/language/it/lang.php +++ b/application/language/it/lang.php @@ -1,14 +1,14 @@ - 'Azione', 'L_ACTIVATED' => 'attivato', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/nl/lang.php b/application/language/nl/lang.php index 3769bd9..503e45b 100644 --- a/application/language/nl/lang.php +++ b/application/language/nl/lang.php @@ -1,14 +1,14 @@ - 'Actie', 'L_ACTIVATED' => 'geactiveerd', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Er zijn alleen maar cijfers toegelaten.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Foute formaat: String, integer, float, boolean en array is verwacht.', 'L_ZEND_ID_NOT_SAME' => 'Beide aangegeven tokens komen niet uit.', -); +); return $lang; diff --git a/application/language/pl/lang.php b/application/language/pl/lang.php index 73938b3..dd15f9b 100644 --- a/application/language/pl/lang.php +++ b/application/language/pl/lang.php @@ -1,14 +1,14 @@ - 'Akcja', 'L_ACTIVATED' => 'aktywowany', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Dopuszczalne są tylko cyfry.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => 'Tokeny nie pasują do siebie.', -); +); return $lang; diff --git a/application/language/pt_BR/lang.php b/application/language/pt_BR/lang.php index 63c20c7..71400e5 100644 --- a/application/language/pt_BR/lang.php +++ b/application/language/pt_BR/lang.php @@ -1,14 +1,14 @@ - '', 'L_ACTIVATED' => 'ativado', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/ro/lang.php b/application/language/ro/lang.php index bf4677b..ff89d4e 100644 --- a/application/language/ro/lang.php +++ b/application/language/ro/lang.php @@ -1,14 +1,14 @@ - 'Actiunea', 'L_ACTIVATED' => 'aktivat', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/ru/lang.php b/application/language/ru/lang.php index 5746b56..f362f4f 100644 --- a/application/language/ru/lang.php +++ b/application/language/ru/lang.php @@ -1,14 +1,14 @@ - 'Действие', 'L_ACTIVATED' => 'активировано', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/sk/lang.php b/application/language/sk/lang.php index 752d2d5..c2774b2 100644 --- a/application/language/sk/lang.php +++ b/application/language/sk/lang.php @@ -1,14 +1,14 @@ - 'Akcia', 'L_ACTIVATED' => 'Aktívne', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Len číslice sú povolené.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Typ hodnoty je neplatný. Očakáva sa, reťazec, celé číslo, float, boolean alebo pole.', 'L_ZEND_ID_NOT_SAME' => 'Tieto dve uvedené charakteristiky nezodpovedajú.', -); +); return $lang; diff --git a/application/language/sl/lang.php b/application/language/sl/lang.php index f6b0f1c..e89ad2d 100644 --- a/application/language/sl/lang.php +++ b/application/language/sl/lang.php @@ -1,14 +1,14 @@ - 'Akcija', 'L_ACTIVATED' => 'vključeno', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Samo številke so dovoljene.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Podan je napačen tip. Niz, celo število, decimalno število, logična vrednost ali polje je pričakovan tip.', 'L_ZEND_ID_NOT_SAME' => 'Ta dva žetona se ne ujemata.', -); +); return $lang; diff --git a/application/language/sv_SE/lang.php b/application/language/sv_SE/lang.php index 6cb7ba7..9423925 100644 --- a/application/language/sv_SE/lang.php +++ b/application/language/sv_SE/lang.php @@ -1,14 +1,14 @@ - 'Aktion', 'L_ACTIVATED' => 'aktiverat', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Ange endast siffror.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Värdets typ är ogiltig. String, Integer, Float, Boolean eller Array förväntas.', 'L_ZEND_ID_NOT_SAME' => 'De bägge kriterierna stämmer ej överens.', -); +); return $lang; diff --git a/application/language/tr/lang.php b/application/language/tr/lang.php index 76a5a16..29c9184 100644 --- a/application/language/tr/lang.php +++ b/application/language/tr/lang.php @@ -1,14 +1,14 @@ - 'İşlem', 'L_ACTIVATED' => 'etkin', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/language/vi_VN/lang.php b/application/language/vi_VN/lang.php index 763e40d..e04ab64 100644 --- a/application/language/vi_VN/lang.php +++ b/application/language/vi_VN/lang.php @@ -1,14 +1,14 @@ - 'Thực hiện', 'L_ACTIVATED' => 'đã kích hoạt', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => 'Chỉ cho phép các chữ số.', 'L_ZEND_ID_NOT_EMPTY_INVALID' => 'Kiểu này không hợp lệ. Yêu cầu chuỗi, số nguyên, boolean float, hoặc một mảng.', 'L_ZEND_ID_NOT_SAME' => 'Hai chuỗi không khớp.', -); +); return $lang; diff --git a/application/language/zh_CN/lang.php b/application/language/zh_CN/lang.php index e81c482..fbd0428 100644 --- a/application/language/zh_CN/lang.php +++ b/application/language/zh_CN/lang.php @@ -1,14 +1,14 @@ - '', 'L_ACTIVATED' => '激活', @@ -765,5 +765,5 @@ $lang=array( 'L_ZEND_ID_NOT_DIGITS' => '', 'L_ZEND_ID_NOT_EMPTY_INVALID' => '', 'L_ZEND_ID_NOT_SAME' => '', -); +); return $lang; diff --git a/application/views/mobile/scripts/config/index.phtml b/application/views/mobile/scripts/config/index.phtml index 18a7302..c086a64 100644 --- a/application/views/mobile/scripts/config/index.phtml +++ b/application/views/mobile/scripts/config/index.phtml @@ -1,163 +1,163 @@ -getTranslator(); -?> -
- partial('/partials/header.phtml', array( - 'title' => 'L_CONFIG', - 'lastPage' => array( - 'title' => 'L_HOME', - 'url' => $this->absoluteUrl(array( - 'controller' => 'index', - 'action' => 'index' - )), - ))); ?> -
-
- -
- -
- -
-
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_GENERAL', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - ))); ?> -
- form->getSubForm('general'); ?> -
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_DBS', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - ))); ?> -
- form->getSubForm('dbuser'); ?> -
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_CONFIG_INTERFACE', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - )));?> -
- form->getSubForm('interface'); ?> -
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_CONFIG_AUTODELETE', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - )));?> -
- form->getSubForm('autodelete'); ?> -
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_EMAIL', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - ))); ?> -
- form->getSubForm('email'); ?> -
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_FTP', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - ))); ?> -
- form->getSubForm('ftp'); ?> -
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_CRONSCRIPT', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - ))); ?> -
- form->getSubForm('cronscript'); ?> -
-
- -
- partial('/partials/header.phtml', array( - 'title' => 'L_CONFIGFILES', - 'lastPage' => array( - 'url' => 'back', - 'title' => 'L_CONFIG' - ))); ?> -
- form->getSubForm('configfiles'); ?> -
-
+getTranslator(); +?> +
+ partial('/partials/header.phtml', array( + 'title' => 'L_CONFIG', + 'lastPage' => array( + 'title' => 'L_HOME', + 'url' => $this->absoluteUrl(array( + 'controller' => 'index', + 'action' => 'index' + )), + ))); ?> +
+
+ +
+ +
+ +
+
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_GENERAL', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + ))); ?> +
+ form->getSubForm('general'); ?> +
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_DBS', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + ))); ?> +
+ form->getSubForm('dbuser'); ?> +
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_CONFIG_INTERFACE', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + )));?> +
+ form->getSubForm('interface'); ?> +
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_CONFIG_AUTODELETE', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + )));?> +
+ form->getSubForm('autodelete'); ?> +
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_EMAIL', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + ))); ?> +
+ form->getSubForm('email'); ?> +
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_FTP', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + ))); ?> +
+ form->getSubForm('ftp'); ?> +
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_CRONSCRIPT', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + ))); ?> +
+ form->getSubForm('cronscript'); ?> +
+
+ +
+ partial('/partials/header.phtml', array( + 'title' => 'L_CONFIGFILES', + 'lastPage' => array( + 'url' => 'back', + 'title' => 'L_CONFIG' + ))); ?> +
+ form->getSubForm('configfiles'); ?> +
+
diff --git a/application/views/mobile/scripts/partials/header.phtml b/application/views/mobile/scripts/partials/header.phtml index d0c0bdc..d2becd0 100644 --- a/application/views/mobile/scripts/partials/header.phtml +++ b/application/views/mobile/scripts/partials/header.phtml @@ -1,19 +1,19 @@ -getTranslator(); -?> -
- lastPage)): ?> - lastPage;?> - - - - - - _($lastPage['title']);?> - -

_($this->title); ?>

- _('L_HOME'); ?> +getTranslator(); +?> +
+ lastPage)): ?> + lastPage;?> + + + + + + _($lastPage['title']);?> + +

_($this->title); ?>

+ _('L_HOME'); ?>
\ No newline at end of file diff --git a/application/views/scripts/sql/databases/create-database.phtml b/application/views/scripts/sql/databases/create-database.phtml index f22854f..c68d1f3 100644 --- a/application/views/scripts/sql/databases/create-database.phtml +++ b/application/views/scripts/sql/databases/create-database.phtml @@ -1,89 +1,89 @@ -url(array('controller'=>'sql','action'=>'create.database')); -?> -
-

lang->L_CREATE_DATABASE;?>

-sqlHeadNavi(); ?> -

lang->L_CREATE_DATABASE;?>:

-
- - - - - - - - - - - - - - - - - -
lang->L_DB_NAME; ?>:
lang->L_DEFAULT_CHARSET;?>:
lang->L_DEFAULT_COLLATION_NAME;?>:
  - -
-
-
-jQuery()->onLoadCaptureStart(); ?> -var dbCollations = collations); ?>; -var dbDefaultCollations = defaultCollations); ?>; -$('#dbCharset').bind('change', function() { - var newOpts = ''; - var curCharset = $(this).val(); - $(dbCollations[curCharset]).each(function(id, v) { - var selected = ''; - if (v == dbDefaultCollations[curCharset]) { - selected = ' selected="selected"'; - } - newOpts += ''; - $('#dbCollation').html(newOpts); - }); -}); -$(document).ready(function() { - $('#dbName').focus(); -}); -jQuery()->onLoadCaptureEnd(); - -if (isset($this->dbCreated)) { - if ($this->dbCreated) { - $this->popUpMessage()->addMessage( - 'dialogDbCreation', - 'L_CREATE_DATABASE', - array('L_DATABASE_CREATED_SUCCESS', $this->newDbInfo['dbName']), - array( - 'modal' => 'true', - 'autoOpen' => 'true', - 'buttons' => array( - 'L_OK' => 'function(){$(this).dialog("close"); }', - ) - ) - ); - } else { - $this->popUpMessage()->addMessage( - 'dialogDbCreation', - 'L_CREATE_DATABASE', - array( - 'L_DATABASE_CREATED_FAILED', - '(' . $this->errorInfo['code'] . ') ' - . $this->errorInfo['message'] .'' - ), - array( - 'modal' => 'true', - 'autoOpen' => 'true', - 'buttons' => array( - 'L_OK' => 'function(){$(this).dialog("close"); }', - ) - ) - ); - } -} +url(array('controller'=>'sql','action'=>'create.database')); +?> +
+

lang->L_CREATE_DATABASE;?>

+sqlHeadNavi(); ?> +

lang->L_CREATE_DATABASE;?>:

+
+ + + + + + + + + + + + + + + + + +
lang->L_DB_NAME; ?>:
lang->L_DEFAULT_CHARSET;?>:
lang->L_DEFAULT_COLLATION_NAME;?>:
  + +
+
+
+jQuery()->onLoadCaptureStart(); ?> +var dbCollations = collations); ?>; +var dbDefaultCollations = defaultCollations); ?>; +$('#dbCharset').bind('change', function() { + var newOpts = ''; + var curCharset = $(this).val(); + $(dbCollations[curCharset]).each(function(id, v) { + var selected = ''; + if (v == dbDefaultCollations[curCharset]) { + selected = ' selected="selected"'; + } + newOpts += ''; + $('#dbCollation').html(newOpts); + }); +}); +$(document).ready(function() { + $('#dbName').focus(); +}); +jQuery()->onLoadCaptureEnd(); + +if (isset($this->dbCreated)) { + if ($this->dbCreated) { + $this->popUpMessage()->addMessage( + 'dialogDbCreation', + 'L_CREATE_DATABASE', + array('L_DATABASE_CREATED_SUCCESS', $this->newDbInfo['dbName']), + array( + 'modal' => 'true', + 'autoOpen' => 'true', + 'buttons' => array( + 'L_OK' => 'function(){$(this).dialog("close"); }', + ) + ) + ); + } else { + $this->popUpMessage()->addMessage( + 'dialogDbCreation', + 'L_CREATE_DATABASE', + array( + 'L_DATABASE_CREATED_FAILED', + '(' . $this->errorInfo['code'] . ') ' + . $this->errorInfo['message'] .'' + ), + array( + 'modal' => 'true', + 'autoOpen' => 'true', + 'buttons' => array( + 'L_OK' => 'function(){$(this).dialog("close"); }', + ) + ) + ); + } +} ?> \ No newline at end of file diff --git a/application/views/scripts/sql/sqlbox/sqlbox.phtml b/application/views/scripts/sql/sqlbox/sqlbox.phtml index 9382374..af9b6d7 100644 --- a/application/views/scripts/sql/sqlbox/sqlbox.phtml +++ b/application/views/scripts/sql/sqlbox/sqlbox.phtml @@ -1,133 +1,133 @@ -jQuery()->onLoadCaptureStart(); ?> -$('#sqltextarea').bind('keyup', function(e){ - if (e.which == 13 && e.ctrlKey) { - $('#execsql').trigger('click'); - } -}); -jQuery()->onLoadCaptureEnd(); ?> -
-

lang->L_SQLBOX;?>

-sqlHeadNavi(); ?> - -
-
-
- - - lang->L_TABLE;?>: - - - -
-
-
- -
lang->L_SQL_WARNING;?>
-
-
-
-
-jQuery()->javascriptCaptureStart(); -if (isset($this->errorMessage)) { - $this->popUpMessage()->addMessage( - 'SqlError', - $this->lang->L_ERROR, - $this->errorMessage, - array( - 'modal' => true, - 'height' => 220, - 'width' => 400, - 'dialogClass' => 'error' - ) - ); -} -?> -function setShowTableQuery() -{ - query = $('#selectTable').attr('value'); - query = 'SELECT * FROM `' + query + '`;'; - $('#sqltextarea').val(query); - $('#myForm').submit(); -} -jQuery()->javascriptCaptureEnd(); - -if (isset($this->resultset) && is_array($this->resultset)) { - $res = $this->resultset; - if (count($res)>0) { - $fieldNames = array_keys($res[0]); - $i = 1; - $cycleHelper = $this->getHelper('cycle')->cycle(array('row-even', 'row-odd')); - ?> - - - - ' . $field .''; - } - ?> - - - - - ' . $data . ''; - } else { - echo ''; - } - } - echo ''; - $i++; - } - ?> -
#
numberFormat($i);?>.' . $this->out($data) . '
- ' . $this->lang->L_NO_ENTRIES . '

'; - } -} - -if (isset($this->resultSummary)) { - $i = 1; - $totalQueries = 0; - $cycleHelper = $this->getHelper('cycle')->cycle(array('row-even', 'row-odd')); - ?> - - - - - - - - - - resultSummary as $type => $count) { - $totalQueries += $count; - ?> - - - - - - - - - - - -
lang->L_RESULT;?>:
#lang->L_QUERY_TYPE;?>lang->L_NR_OF_QUERIES;?>
numberFormat($i);?>.numberFormat($count);?>
 lang->L_SUM_TOTAL;;?>numberFormat($totalQueries);?>
- -
+jQuery()->onLoadCaptureStart(); ?> +$('#sqltextarea').bind('keyup', function(e){ + if (e.which == 13 && e.ctrlKey) { + $('#execsql').trigger('click'); + } +}); +jQuery()->onLoadCaptureEnd(); ?> +
+

lang->L_SQLBOX;?>

+sqlHeadNavi(); ?> + +
+
+
+ + + lang->L_TABLE;?>: + + + +
+
+
+ +
lang->L_SQL_WARNING;?>
+
+
+
+
+jQuery()->javascriptCaptureStart(); +if (isset($this->errorMessage)) { + $this->popUpMessage()->addMessage( + 'SqlError', + $this->lang->L_ERROR, + $this->errorMessage, + array( + 'modal' => true, + 'height' => 220, + 'width' => 400, + 'dialogClass' => 'error' + ) + ); +} +?> +function setShowTableQuery() +{ + query = $('#selectTable').attr('value'); + query = 'SELECT * FROM `' + query + '`;'; + $('#sqltextarea').val(query); + $('#myForm').submit(); +} +jQuery()->javascriptCaptureEnd(); + +if (isset($this->resultset) && is_array($this->resultset)) { + $res = $this->resultset; + if (count($res)>0) { + $fieldNames = array_keys($res[0]); + $i = 1; + $cycleHelper = $this->getHelper('cycle')->cycle(array('row-even', 'row-odd')); + ?> + + + + ' . $field .''; + } + ?> + + + + + ' . $data . ''; + } else { + echo ''; + } + } + echo ''; + $i++; + } + ?> +
#
numberFormat($i);?>.' . $this->out($data) . '
+ ' . $this->lang->L_NO_ENTRIES . '

'; + } +} + +if (isset($this->resultSummary)) { + $i = 1; + $totalQueries = 0; + $cycleHelper = $this->getHelper('cycle')->cycle(array('row-even', 'row-odd')); + ?> + + + + + + + + + + resultSummary as $type => $count) { + $totalQueries += $count; + ?> + + + + + + + + + + + +
lang->L_RESULT;?>:
#lang->L_QUERY_TYPE;?>lang->L_NR_OF_QUERIES;?>
numberFormat($i);?>.numberFormat($count);?>
 lang->L_SUM_TOTAL;;?>numberFormat($totalQueries);?>
+ +
diff --git a/application/views/scripts/sql/tables/button-bar.phtml b/application/views/scripts/sql/tables/button-bar.phtml index 6b7f520..dcaaa05 100644 --- a/application/views/scripts/sql/tables/button-bar.phtml +++ b/application/views/scripts/sql/tables/button-bar.phtml @@ -1,85 +1,85 @@ -url(array('controller' => 'sql', 'action' => 'optimize.tables')); -$analyzeTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'analyze.tables')); -$checkTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'check.tables')); -$repairTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'repair.tables')); -$emptyTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'empty.tables')); -$deleteTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'delete.tables')); -$createTableUrl = $this->url(array('controller' => 'sql', 'action' => 'create.table')); -?> - - -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
- - - - - +url(array('controller' => 'sql', 'action' => 'optimize.tables')); +$analyzeTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'analyze.tables')); +$checkTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'check.tables')); +$repairTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'repair.tables')); +$emptyTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'empty.tables')); +$deleteTablesUrl = $this->url(array('controller' => 'sql', 'action' => 'delete.tables')); +$createTableUrl = $this->url(array('controller' => 'sql', 'action' => 'create.table')); +?> + + +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+ + + + + diff --git a/application/views/scripts/sql/tables/create-table.phtml b/application/views/scripts/sql/tables/create-table.phtml index 1bb2e70..39c3655 100644 --- a/application/views/scripts/sql/tables/create-table.phtml +++ b/application/views/scripts/sql/tables/create-table.phtml @@ -1,8 +1,8 @@ -
-

lang->L_SQL_CREATETABLE;?>

- -

- -Hello (MySQLDumper-) World! - +
+

lang->L_SQL_CREATETABLE;?>

+ +

+ +Hello (MySQLDumper-) World! +
\ No newline at end of file diff --git a/pdepend.xml b/pdepend.xml index 853b674..5189b11 100644 --- a/pdepend.xml +++ b/pdepend.xml @@ -1,10 +1,10 @@ - - - - file - /tmp/pdepend - + + + + file + /tmp/pdepend + \ No newline at end of file diff --git a/public/js/jquery/autogrow.js b/public/js/jquery/autogrow.js index 1805899..4229745 100644 --- a/public/js/jquery/autogrow.js +++ b/public/js/jquery/autogrow.js @@ -1,61 +1,61 @@ -/*! - * Autogrow Textarea Plugin Version v2.0 - * http://www.technoreply.com/autogrow-textarea-plugin-version-2-0 - * - * Copyright 2011, Jevin O. Sewaruth - * - * Date: March 13, 2011 - */ -jQuery.fn.autoGrow = function(){ - return this.each(function(){ - // Variables - var colsDefault = this.cols; - var rowsDefault = this.rows; - - //Functions - var grow = function() { - growByRef(this); - } - - var growByRef = function(obj) { - var linesCount = 0; - var lines = obj.value.split('\n'); - - for (var i=lines.length-1; i>=0; --i) - { - linesCount += Math.floor((lines[i].length / colsDefault) + 1); - } - - if (linesCount >= rowsDefault) - obj.rows = linesCount + 1; - else - obj.rows = rowsDefault; - } - - var characterWidth = function (obj){ - var characterWidth = 0; - var temp1 = 0; - var temp2 = 0; - var tempCols = obj.cols; - - obj.cols = 1; - temp1 = obj.offsetWidth; - obj.cols = 2; - temp2 = obj.offsetWidth; - characterWidth = temp2 - temp1; - obj.cols = tempCols; - - return characterWidth; - } - - // Manipulations - this.style.width = "auto"; - this.style.height = "auto"; - this.style.overflow = "hidden"; - this.style.width = ((characterWidth(this) * this.cols) + 6) + "px"; - //this.onkeyup = grow; - //this.onfocus = grow; - //this.onblur = grow; - growByRef(this); - }); -}; +/*! + * Autogrow Textarea Plugin Version v2.0 + * http://www.technoreply.com/autogrow-textarea-plugin-version-2-0 + * + * Copyright 2011, Jevin O. Sewaruth + * + * Date: March 13, 2011 + */ +jQuery.fn.autoGrow = function(){ + return this.each(function(){ + // Variables + var colsDefault = this.cols; + var rowsDefault = this.rows; + + //Functions + var grow = function() { + growByRef(this); + } + + var growByRef = function(obj) { + var linesCount = 0; + var lines = obj.value.split('\n'); + + for (var i=lines.length-1; i>=0; --i) + { + linesCount += Math.floor((lines[i].length / colsDefault) + 1); + } + + if (linesCount >= rowsDefault) + obj.rows = linesCount + 1; + else + obj.rows = rowsDefault; + } + + var characterWidth = function (obj){ + var characterWidth = 0; + var temp1 = 0; + var temp2 = 0; + var tempCols = obj.cols; + + obj.cols = 1; + temp1 = obj.offsetWidth; + obj.cols = 2; + temp2 = obj.offsetWidth; + characterWidth = temp2 - temp1; + obj.cols = tempCols; + + return characterWidth; + } + + // Manipulations + this.style.width = "auto"; + this.style.height = "auto"; + this.style.overflow = "hidden"; + this.style.width = ((characterWidth(this) * this.cols) + 6) + "px"; + //this.onkeyup = grow; + //this.onfocus = grow; + //this.onblur = grow; + growByRef(this); + }); +}; diff --git a/public/js/pwdmeter.js b/public/js/pwdmeter.js index c24a6f4..9d116cc 100644 --- a/public/js/pwdmeter.js +++ b/public/js/pwdmeter.js @@ -1,231 +1,231 @@ -/* -** Created by: Jeff Todnem (http://www.todnem.com/) -** Created on: 2007-08-14 -** Last modified: 2010-05-03 -** -** License Information: -** ------------------------------------------------------------------------- -** Copyright (C) 2007 Jeff Todnem -** -** This program is free software; you can redistribute it and/or modify it -** under the terms of the GNU General Public License as published by the -** Free Software Foundation; either version 2 of the License, or (at your -** option) any later version. -** -** This program is distributed in the hope that it will be useful, but -** WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** 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., -** 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -** -*/ - -String.prototype.strReverse = function() { - var newstring = ""; - for (var s=0; s < this.length; s++) { - newstring = this.charAt(s) + newstring; - } - return newstring; -}; - -function chkPass(pwd) { - // Simultaneous variable declaration and value assignment aren't supported in IE apparently - // so I'm forced to assign the same value individually per var to support a crappy browser *sigh* - var nScore=0, nLength=0, nAlphaUC=0, nAlphaLC=0, nNumber=0, nSymbol=0, nMidChar=0, nRequirements=0, nAlphasOnly=0, nNumbersOnly=0, nUnqChar=0, nRepChar=0, nRepInc=0, nConsecAlphaUC=0, nConsecAlphaLC=0, nConsecNumber=0, nConsecSymbol=0, nConsecCharType=0, nSeqAlpha=0, nSeqNumber=0, nSeqSymbol=0, nSeqChar=0, nReqChar=0, nMultConsecCharType=0; - var nMultRepChar=1, nMultConsecSymbol=1; - var nMultMidChar=2, nMultRequirements=2, nMultConsecAlphaUC=2, nMultConsecAlphaLC=2, nMultConsecNumber=2; - var nReqCharType=3, nMultAlphaUC=3, nMultAlphaLC=3, nMultSeqAlpha=3, nMultSeqNumber=3, nMultSeqSymbol=3; - var nMultLength=4, nMultNumber=4; - var nMultSymbol=6; - var nTmpAlphaUC="", nTmpAlphaLC="", nTmpNumber="", nTmpSymbol=""; - var sAlphaUC="0", sAlphaLC="0", sNumber="0", sSymbol="0", sMidChar="0", sRequirements="0", sAlphasOnly="0", sNumbersOnly="0", sRepChar="0", sConsecAlphaUC="0", sConsecAlphaLC="0", sConsecNumber="0", sSeqAlpha="0", sSeqNumber="0", sSeqSymbol="0"; - var sAlphas = "abcdefghijklmnopqrstuvwxyz"; - var sNumerics = "01234567890"; - var sSymbols = ")!@#$%^&*()"; - var nMinPwdLen = 8; - if (document.all) { var nd = 0; } else { var nd = 1; } - if (pwd) { - nScore = parseInt(pwd.length * nMultLength); - nLength = pwd.length; - var arrPwd = pwd.replace(/\s+/g,"").split(/\s*/); - var arrPwdLen = arrPwd.length; - - /* Loop through password to check for Symbol, Numeric, Lowercase and Uppercase pattern matches */ - for (var a=0; a < arrPwdLen; a++) { - if (arrPwd[a].match(/[A-Z]/g)) { - if (nTmpAlphaUC !== "") { if ((nTmpAlphaUC + 1) == a) { nConsecAlphaUC++; nConsecCharType++; } } - nTmpAlphaUC = a; - nAlphaUC++; - } - else if (arrPwd[a].match(/[a-z]/g)) { - if (nTmpAlphaLC !== "") { if ((nTmpAlphaLC + 1) == a) { nConsecAlphaLC++; nConsecCharType++; } } - nTmpAlphaLC = a; - nAlphaLC++; - } - else if (arrPwd[a].match(/[0-9]/g)) { - if (a > 0 && a < (arrPwdLen - 1)) { nMidChar++; } - if (nTmpNumber !== "") { if ((nTmpNumber + 1) == a) { nConsecNumber++; nConsecCharType++; } } - nTmpNumber = a; - nNumber++; - } - else if (arrPwd[a].match(/[^a-zA-Z0-9_]/g)) { - if (a > 0 && a < (arrPwdLen - 1)) { nMidChar++; } - if (nTmpSymbol !== "") { if ((nTmpSymbol + 1) == a) { nConsecSymbol++; nConsecCharType++; } } - nTmpSymbol = a; - nSymbol++; - } - /* Internal loop through password to check for repeat characters */ - var bCharExists = false; - for (var b=0; b < arrPwdLen; b++) { - if (arrPwd[a] == arrPwd[b] && a != b) { /* repeat character exists */ - bCharExists = true; - /* - Calculate icrement deduction based on proximity to identical characters - Deduction is incremented each time a new match is discovered - Deduction amount is based on total password length divided by the - difference of distance between currently selected match - */ - nRepInc += Math.abs(arrPwdLen/(b-a)); - } - } - if (bCharExists) { - nRepChar++; - nUnqChar = arrPwdLen-nRepChar; - nRepInc = (nUnqChar) ? Math.ceil(nRepInc/nUnqChar) : Math.ceil(nRepInc); - } - } - - /* Check for sequential alpha string patterns (forward and reverse) */ - for (var s=0; s < 23; s++) { - var sFwd = sAlphas.substring(s,parseInt(s+3)); - var sRev = sFwd.strReverse(); - if (pwd.toLowerCase().indexOf(sFwd) != -1 || pwd.toLowerCase().indexOf(sRev) != -1) { nSeqAlpha++; nSeqChar++;} - } - - /* Check for sequential numeric string patterns (forward and reverse) */ - for (var s=0; s < 8; s++) { - var sFwd = sNumerics.substring(s,parseInt(s+3)); - var sRev = sFwd.strReverse(); - if (pwd.toLowerCase().indexOf(sFwd) != -1 || pwd.toLowerCase().indexOf(sRev) != -1) { nSeqNumber++; nSeqChar++;} - } - - /* Check for sequential symbol string patterns (forward and reverse) */ - for (var s=0; s < 8; s++) { - var sFwd = sSymbols.substring(s,parseInt(s+3)); - var sRev = sFwd.strReverse(); - if (pwd.toLowerCase().indexOf(sFwd) != -1 || pwd.toLowerCase().indexOf(sRev) != -1) { nSeqSymbol++; nSeqChar++;} - } - - /* Modify overall score value based on usage vs requirements */ - - /* General point assignment */ - if (nAlphaUC > 0 && nAlphaUC < nLength) { - nScore = parseInt(nScore + ((nLength - nAlphaUC) * 2)); - sAlphaUC = "+ " + parseInt((nLength - nAlphaUC) * 2); - } - if (nAlphaLC > 0 && nAlphaLC < nLength) { - nScore = parseInt(nScore + ((nLength - nAlphaLC) * 2)); - sAlphaLC = "+ " + parseInt((nLength - nAlphaLC) * 2); - } - if (nNumber > 0 && nNumber < nLength) { - nScore = parseInt(nScore + (nNumber * nMultNumber)); - sNumber = "+ " + parseInt(nNumber * nMultNumber); - } - if (nSymbol > 0) { - nScore = parseInt(nScore + (nSymbol * nMultSymbol)); - sSymbol = "+ " + parseInt(nSymbol * nMultSymbol); - } - if (nMidChar > 0) { - nScore = parseInt(nScore + (nMidChar * nMultMidChar)); - sMidChar = "+ " + parseInt(nMidChar * nMultMidChar); - } - - /* Point deductions for poor practices */ - if ((nAlphaLC > 0 || nAlphaUC > 0) && nSymbol === 0 && nNumber === 0) { // Only Letters - nScore = parseInt(nScore - nLength); - nAlphasOnly = nLength; - sAlphasOnly = "- " + nLength; - } - if (nAlphaLC === 0 && nAlphaUC === 0 && nSymbol === 0 && nNumber > 0) { // Only Numbers - nScore = parseInt(nScore - nLength); - nNumbersOnly = nLength; - sNumbersOnly = "- " + nLength; - } - if (nRepChar > 0) { // Same character exists more than once - nScore = parseInt(nScore - nRepInc); - sRepChar = "- " + nRepInc; - } - if (nConsecAlphaUC > 0) { // Consecutive Uppercase Letters exist - nScore = parseInt(nScore - (nConsecAlphaUC * nMultConsecAlphaUC)); - sConsecAlphaUC = "- " + parseInt(nConsecAlphaUC * nMultConsecAlphaUC); - } - if (nConsecAlphaLC > 0) { // Consecutive Lowercase Letters exist - nScore = parseInt(nScore - (nConsecAlphaLC * nMultConsecAlphaLC)); - sConsecAlphaLC = "- " + parseInt(nConsecAlphaLC * nMultConsecAlphaLC); - } - if (nConsecNumber > 0) { // Consecutive Numbers exist - nScore = parseInt(nScore - (nConsecNumber * nMultConsecNumber)); - sConsecNumber = "- " + parseInt(nConsecNumber * nMultConsecNumber); - } - if (nSeqAlpha > 0) { // Sequential alpha strings exist (3 characters or more) - nScore = parseInt(nScore - (nSeqAlpha * nMultSeqAlpha)); - sSeqAlpha = "- " + parseInt(nSeqAlpha * nMultSeqAlpha); - } - if (nSeqNumber > 0) { // Sequential numeric strings exist (3 characters or more) - nScore = parseInt(nScore - (nSeqNumber * nMultSeqNumber)); - sSeqNumber = "- " + parseInt(nSeqNumber * nMultSeqNumber); - } - if (nSeqSymbol > 0) { // Sequential symbol strings exist (3 characters or more) - nScore = parseInt(nScore - (nSeqSymbol * nMultSeqSymbol)); - sSeqSymbol = "- " + parseInt(nSeqSymbol * nMultSeqSymbol); - } - - /* Determine if mandatory requirements have been met and set image indicators accordingly */ - var arrChars = [nLength,nAlphaUC,nAlphaLC,nNumber,nSymbol]; - var arrCharsIds = ["nLength","nAlphaUC","nAlphaLC","nNumber","nSymbol"]; - var arrCharsLen = arrChars.length; - for (var c=0; c < arrCharsLen; c++) { - if (arrCharsIds[c] == "nLength") { var minVal = parseInt(nMinPwdLen - 1); } else { var minVal = 0; } - if (arrChars[c] == parseInt(minVal + 1)) { nReqChar++ } - else if (arrChars[c] > parseInt(minVal + 1)) { nReqChar++; } - } - - nRequirements = nReqChar; - if (pwd.length >= nMinPwdLen) { var nMinReqChars = 3; } else { var nMinReqChars = 4; } - if (nRequirements > nMinReqChars) { // One or more required characters exist - nScore = parseInt(nScore + (nRequirements * 2)); - sRequirements = "+ " + parseInt(nRequirements * 2); - } - - /* Display updated score criteria to client */ - if (nScore > 100) { nScore = 100; } else if (nScore < 0) { nScore = 0; } - $("#scorebar").css("width", parseInt(nScore) + "px"); - if (nScore > 0) { - $("#scorebar").css("display", ""); - } else { - $("#scorebar").css("display", "none"); - } - } - else { - /* Display default score criteria to client */ - initPwdChk(); - } -} - -function initPwdChk() { - /* Reset all form values to their default */ - $("#scorebar").css("width", "0px"); - $("#scorebar").css("display", "none"); -} - -$(document).ready(function() { - /* Init the password checking */ - $("#pass").keyup(function() { - chkPass(this.value); - }); - $("#scorebar").wrap('
'); - initPwdChk(); +/* +** Created by: Jeff Todnem (http://www.todnem.com/) +** Created on: 2007-08-14 +** Last modified: 2010-05-03 +** +** License Information: +** ------------------------------------------------------------------------- +** Copyright (C) 2007 Jeff Todnem +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2 of the License, or (at your +** option) any later version. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** 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., +** 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +** +*/ + +String.prototype.strReverse = function() { + var newstring = ""; + for (var s=0; s < this.length; s++) { + newstring = this.charAt(s) + newstring; + } + return newstring; +}; + +function chkPass(pwd) { + // Simultaneous variable declaration and value assignment aren't supported in IE apparently + // so I'm forced to assign the same value individually per var to support a crappy browser *sigh* + var nScore=0, nLength=0, nAlphaUC=0, nAlphaLC=0, nNumber=0, nSymbol=0, nMidChar=0, nRequirements=0, nAlphasOnly=0, nNumbersOnly=0, nUnqChar=0, nRepChar=0, nRepInc=0, nConsecAlphaUC=0, nConsecAlphaLC=0, nConsecNumber=0, nConsecSymbol=0, nConsecCharType=0, nSeqAlpha=0, nSeqNumber=0, nSeqSymbol=0, nSeqChar=0, nReqChar=0, nMultConsecCharType=0; + var nMultRepChar=1, nMultConsecSymbol=1; + var nMultMidChar=2, nMultRequirements=2, nMultConsecAlphaUC=2, nMultConsecAlphaLC=2, nMultConsecNumber=2; + var nReqCharType=3, nMultAlphaUC=3, nMultAlphaLC=3, nMultSeqAlpha=3, nMultSeqNumber=3, nMultSeqSymbol=3; + var nMultLength=4, nMultNumber=4; + var nMultSymbol=6; + var nTmpAlphaUC="", nTmpAlphaLC="", nTmpNumber="", nTmpSymbol=""; + var sAlphaUC="0", sAlphaLC="0", sNumber="0", sSymbol="0", sMidChar="0", sRequirements="0", sAlphasOnly="0", sNumbersOnly="0", sRepChar="0", sConsecAlphaUC="0", sConsecAlphaLC="0", sConsecNumber="0", sSeqAlpha="0", sSeqNumber="0", sSeqSymbol="0"; + var sAlphas = "abcdefghijklmnopqrstuvwxyz"; + var sNumerics = "01234567890"; + var sSymbols = ")!@#$%^&*()"; + var nMinPwdLen = 8; + if (document.all) { var nd = 0; } else { var nd = 1; } + if (pwd) { + nScore = parseInt(pwd.length * nMultLength); + nLength = pwd.length; + var arrPwd = pwd.replace(/\s+/g,"").split(/\s*/); + var arrPwdLen = arrPwd.length; + + /* Loop through password to check for Symbol, Numeric, Lowercase and Uppercase pattern matches */ + for (var a=0; a < arrPwdLen; a++) { + if (arrPwd[a].match(/[A-Z]/g)) { + if (nTmpAlphaUC !== "") { if ((nTmpAlphaUC + 1) == a) { nConsecAlphaUC++; nConsecCharType++; } } + nTmpAlphaUC = a; + nAlphaUC++; + } + else if (arrPwd[a].match(/[a-z]/g)) { + if (nTmpAlphaLC !== "") { if ((nTmpAlphaLC + 1) == a) { nConsecAlphaLC++; nConsecCharType++; } } + nTmpAlphaLC = a; + nAlphaLC++; + } + else if (arrPwd[a].match(/[0-9]/g)) { + if (a > 0 && a < (arrPwdLen - 1)) { nMidChar++; } + if (nTmpNumber !== "") { if ((nTmpNumber + 1) == a) { nConsecNumber++; nConsecCharType++; } } + nTmpNumber = a; + nNumber++; + } + else if (arrPwd[a].match(/[^a-zA-Z0-9_]/g)) { + if (a > 0 && a < (arrPwdLen - 1)) { nMidChar++; } + if (nTmpSymbol !== "") { if ((nTmpSymbol + 1) == a) { nConsecSymbol++; nConsecCharType++; } } + nTmpSymbol = a; + nSymbol++; + } + /* Internal loop through password to check for repeat characters */ + var bCharExists = false; + for (var b=0; b < arrPwdLen; b++) { + if (arrPwd[a] == arrPwd[b] && a != b) { /* repeat character exists */ + bCharExists = true; + /* + Calculate icrement deduction based on proximity to identical characters + Deduction is incremented each time a new match is discovered + Deduction amount is based on total password length divided by the + difference of distance between currently selected match + */ + nRepInc += Math.abs(arrPwdLen/(b-a)); + } + } + if (bCharExists) { + nRepChar++; + nUnqChar = arrPwdLen-nRepChar; + nRepInc = (nUnqChar) ? Math.ceil(nRepInc/nUnqChar) : Math.ceil(nRepInc); + } + } + + /* Check for sequential alpha string patterns (forward and reverse) */ + for (var s=0; s < 23; s++) { + var sFwd = sAlphas.substring(s,parseInt(s+3)); + var sRev = sFwd.strReverse(); + if (pwd.toLowerCase().indexOf(sFwd) != -1 || pwd.toLowerCase().indexOf(sRev) != -1) { nSeqAlpha++; nSeqChar++;} + } + + /* Check for sequential numeric string patterns (forward and reverse) */ + for (var s=0; s < 8; s++) { + var sFwd = sNumerics.substring(s,parseInt(s+3)); + var sRev = sFwd.strReverse(); + if (pwd.toLowerCase().indexOf(sFwd) != -1 || pwd.toLowerCase().indexOf(sRev) != -1) { nSeqNumber++; nSeqChar++;} + } + + /* Check for sequential symbol string patterns (forward and reverse) */ + for (var s=0; s < 8; s++) { + var sFwd = sSymbols.substring(s,parseInt(s+3)); + var sRev = sFwd.strReverse(); + if (pwd.toLowerCase().indexOf(sFwd) != -1 || pwd.toLowerCase().indexOf(sRev) != -1) { nSeqSymbol++; nSeqChar++;} + } + + /* Modify overall score value based on usage vs requirements */ + + /* General point assignment */ + if (nAlphaUC > 0 && nAlphaUC < nLength) { + nScore = parseInt(nScore + ((nLength - nAlphaUC) * 2)); + sAlphaUC = "+ " + parseInt((nLength - nAlphaUC) * 2); + } + if (nAlphaLC > 0 && nAlphaLC < nLength) { + nScore = parseInt(nScore + ((nLength - nAlphaLC) * 2)); + sAlphaLC = "+ " + parseInt((nLength - nAlphaLC) * 2); + } + if (nNumber > 0 && nNumber < nLength) { + nScore = parseInt(nScore + (nNumber * nMultNumber)); + sNumber = "+ " + parseInt(nNumber * nMultNumber); + } + if (nSymbol > 0) { + nScore = parseInt(nScore + (nSymbol * nMultSymbol)); + sSymbol = "+ " + parseInt(nSymbol * nMultSymbol); + } + if (nMidChar > 0) { + nScore = parseInt(nScore + (nMidChar * nMultMidChar)); + sMidChar = "+ " + parseInt(nMidChar * nMultMidChar); + } + + /* Point deductions for poor practices */ + if ((nAlphaLC > 0 || nAlphaUC > 0) && nSymbol === 0 && nNumber === 0) { // Only Letters + nScore = parseInt(nScore - nLength); + nAlphasOnly = nLength; + sAlphasOnly = "- " + nLength; + } + if (nAlphaLC === 0 && nAlphaUC === 0 && nSymbol === 0 && nNumber > 0) { // Only Numbers + nScore = parseInt(nScore - nLength); + nNumbersOnly = nLength; + sNumbersOnly = "- " + nLength; + } + if (nRepChar > 0) { // Same character exists more than once + nScore = parseInt(nScore - nRepInc); + sRepChar = "- " + nRepInc; + } + if (nConsecAlphaUC > 0) { // Consecutive Uppercase Letters exist + nScore = parseInt(nScore - (nConsecAlphaUC * nMultConsecAlphaUC)); + sConsecAlphaUC = "- " + parseInt(nConsecAlphaUC * nMultConsecAlphaUC); + } + if (nConsecAlphaLC > 0) { // Consecutive Lowercase Letters exist + nScore = parseInt(nScore - (nConsecAlphaLC * nMultConsecAlphaLC)); + sConsecAlphaLC = "- " + parseInt(nConsecAlphaLC * nMultConsecAlphaLC); + } + if (nConsecNumber > 0) { // Consecutive Numbers exist + nScore = parseInt(nScore - (nConsecNumber * nMultConsecNumber)); + sConsecNumber = "- " + parseInt(nConsecNumber * nMultConsecNumber); + } + if (nSeqAlpha > 0) { // Sequential alpha strings exist (3 characters or more) + nScore = parseInt(nScore - (nSeqAlpha * nMultSeqAlpha)); + sSeqAlpha = "- " + parseInt(nSeqAlpha * nMultSeqAlpha); + } + if (nSeqNumber > 0) { // Sequential numeric strings exist (3 characters or more) + nScore = parseInt(nScore - (nSeqNumber * nMultSeqNumber)); + sSeqNumber = "- " + parseInt(nSeqNumber * nMultSeqNumber); + } + if (nSeqSymbol > 0) { // Sequential symbol strings exist (3 characters or more) + nScore = parseInt(nScore - (nSeqSymbol * nMultSeqSymbol)); + sSeqSymbol = "- " + parseInt(nSeqSymbol * nMultSeqSymbol); + } + + /* Determine if mandatory requirements have been met and set image indicators accordingly */ + var arrChars = [nLength,nAlphaUC,nAlphaLC,nNumber,nSymbol]; + var arrCharsIds = ["nLength","nAlphaUC","nAlphaLC","nNumber","nSymbol"]; + var arrCharsLen = arrChars.length; + for (var c=0; c < arrCharsLen; c++) { + if (arrCharsIds[c] == "nLength") { var minVal = parseInt(nMinPwdLen - 1); } else { var minVal = 0; } + if (arrChars[c] == parseInt(minVal + 1)) { nReqChar++ } + else if (arrChars[c] > parseInt(minVal + 1)) { nReqChar++; } + } + + nRequirements = nReqChar; + if (pwd.length >= nMinPwdLen) { var nMinReqChars = 3; } else { var nMinReqChars = 4; } + if (nRequirements > nMinReqChars) { // One or more required characters exist + nScore = parseInt(nScore + (nRequirements * 2)); + sRequirements = "+ " + parseInt(nRequirements * 2); + } + + /* Display updated score criteria to client */ + if (nScore > 100) { nScore = 100; } else if (nScore < 0) { nScore = 0; } + $("#scorebar").css("width", parseInt(nScore) + "px"); + if (nScore > 0) { + $("#scorebar").css("display", ""); + } else { + $("#scorebar").css("display", "none"); + } + } + else { + /* Display default score criteria to client */ + initPwdChk(); + } +} + +function initPwdChk() { + /* Reset all form values to their default */ + $("#scorebar").css("width", "0px"); + $("#scorebar").css("display", "none"); +} + +$(document).ready(function() { + /* Init the password checking */ + $("#pass").keyup(function() { + chkPass(this.value); + }); + $("#scorebar").wrap('
'); + initPwdChk(); }); \ No newline at end of file