diff --git a/.gitattributes b/.gitattributes index cb431d73..44198379 100644 --- a/.gitattributes +++ b/.gitattributes @@ -281,7 +281,6 @@ bureau/admin/js/jquery_ui/css/smoothness/jquery-ui-1.8.23.custom.css -text bureau/admin/js/jquery_ui/index.html -text bureau/admin/js/jquery_ui/js/jquery-1.7.2.min.js -text bureau/admin/js/jquery_ui/js/jquery-ui-1.8.23.custom.min.js -text -bureau/admin/js/passwordStrengthMeter.js -text bureau/admin/js/prototype.js -text bureau/admin/login.php -text bureau/admin/logo2.png -text @@ -336,13 +335,11 @@ bureau/admin/sql_users_list.php -text bureau/admin/sql_users_password.php -text bureau/admin/sql_users_rights.php -text bureau/admin/stats_members.php -text -bureau/admin/styles/passwordStrengthMeter.css -text bureau/admin/styles/style-bluedesktop10.css -text bureau/admin/styles/style-empty.css -text bureau/admin/styles/style-hw.css -text bureau/admin/styles/style.css -text bureau/admin/tempovars.php -text -bureau/admin/trash_dateselect.php -text bureau/admin/vm.php -text bureau/admin/webmail-redirect.php -text bureau/class/config.php -text @@ -371,7 +368,6 @@ bureau/class/m_menu.php -text bureau/class/m_mysql.php -text bureau/class/m_piwik.php -text bureau/class/m_quota.php -text -bureau/class/m_trash.php -text bureau/class/mime.php -text bureau/class/reset_stats_conf.php -text bureau/class/variables.php -text diff --git a/bureau/admin/head.php b/bureau/admin/head.php index 13a00d4a..725e1d67 100644 --- a/bureau/admin/head.php +++ b/bureau/admin/head.php @@ -31,9 +31,8 @@ if (!$charset) $charset="UTF-8"; <?php __("AlternC Control Panel"); ?> - - + @@ -45,11 +44,7 @@ if (!$charset) $charset="UTF-8"; -"; -?> + {}\[\]]+/, - uniqueChars : 17 - } - ]; - - /** - * Checks the supplied password - * @param {String} password - * @return The predicted lifetime of the password, as a percentage of the defined password lifetime. - */ - PasswordValidator.prototype.checkPassword = function(password) { - if (password == null) password="0" - var - expressions = this.expressions, - i, - l = expressions.length, - expression, - possibilitiesPerLetterInPassword = 0; - - for (i = 0; i < l; i++) { - - expression = expressions[i]; - - if (expression.regex.exec(password)) { - possibilitiesPerLetterInPassword += expression.uniqueChars; - } - - } - - var - totalCombinations = Math.pow(possibilitiesPerLetterInPassword, password.length), - // how long, on average, it would take to crack this (@ 200 attempts per second) - crackTime = ((totalCombinations / this.passwordAttemptsPerSecond) / 2) / secondsInADay, - // how close is the time to the projected time? - percentage = crackTime / this.passwordLifeTimeInDays; - - return Math.min(Math.max(password.length * 5, percentage * 100), 100); - - }; - - IW.PasswordValidator = new PasswordValidator(); - -})(IW); - -/** - * jQuery plugin which allows you to add password validation to any - * form element. - */ -(function(IW, jQuery) { - - function updatePassword() { - - var - percentage = IW.PasswordValidator.checkPassword(this.val()), - progressBar = this.parent().find(".passwordStrengthBar div"); - - progressBar - .removeClass("strong medium weak useless") - .stop() - .animate({"width": percentage + "%"}); - - if (percentage > 90) { - progressBar.addClass("strong"); - } else if (percentage > 50) { - progressBar.addClass("medium") - } else if (percentage > 10) { - progressBar.addClass("weak"); - } else { - progressBar.addClass("useless"); - } - } - - jQuery.fn.passwordValidate = function() { - - this - .bind('keyup', jQuery.proxy(updatePassword, this)) - .after("
" + - "
" + - "
"); - - updatePassword.apply(this); - - return this; // for chaining - - } - -})(IW, jQuery); - -/* Have all the password elements on the page validate */ -jQuery("input[type='password']").passwordValidate(); diff --git a/bureau/admin/styles/passwordStrengthMeter.css b/bureau/admin/styles/passwordStrengthMeter.css deleted file mode 100644 index 8e8a6309..00000000 --- a/bureau/admin/styles/passwordStrengthMeter.css +++ /dev/null @@ -1,9 +0,0 @@ -.style1 { - font-family: Geneva, Arial, Helvetica, sans-serif; - font-size: 12px; -} -.inbox { width:200px;border:solid 1px gray; } -.graybar { width:200px; background:#dddddd; height:3px; float:left; } -.colorbar {margin-top:-3px;width:1px;background-image:url(images/passwordstrength.jpg);height:3px; float:left;} -.percent {margin-top:0px;float:left;} -.result {color:green; font-family:Tahoma;font-size:11px;} diff --git a/bureau/admin/trash_dateselect.php b/bureau/admin/trash_dateselect.php deleted file mode 100644 index 86b79972..00000000 --- a/bureau/admin/trash_dateselect.php +++ /dev/null @@ -1,107 +0,0 @@ -is_trash ) { - $istrash=true; -} -?> - -

- onclick="hide('trash_expire_picker');"> - onclick="show('trash_expire_picker');"> -

- -
- - - - - - - - -
- - -
- - -
- - -
- " /> -
-
- - -
- - - diff --git a/bureau/class/m_trash.php b/bureau/class/m_trash.php deleted file mode 100644 index 59895ecf..00000000 --- a/bureau/class/m_trash.php +++ /dev/null @@ -1,101 +0,0 @@ -expiration_date_db=$expiration_date_db; - $this->expiration_date=strtotime($this->expiration_date_db); - if ($this->expiration_date_db) $this->is_trash=true; - } - - function human_display() { - return strftime("%d/%m/%Y",$this->expiration_date); - } - - function getfromform() { - $fields = array ( - "istrash" => array ("request", "boolean", false), - "trash_type_expiration" => array ("request", "string", ""), - "trash_exp_in_value" => array ("request", "string", ""), - "trash_exp_in_unit" => array ("request", "string", ""), - "trash_datepicker" => array ("request", "string", ""), - ); - $champs=getFields($fields); - foreach($champs as $k=>$v) $$k = $v; - - if (!$istrash) $trash_type_expiration="no_exp"; - - switch($trash_type_expiration) { - case "trash_at_x": - // We can use date_parse_from_format if we have php 5.3 - //$this->expiration_date=date_parse_from_format("%d/%m/%Y",$trash_datepicker); - $mydate=strptime($trash_datepicker, "%d/%m/%Y"); - if ($mydate){ - $this->expiration_date=new DateTime("@".mktime( 0, 0, 0, $mydate['tm_mon']+1, $mydate['tm_mday']+1, 1900+$mydate['tm_year'])); - } else { - $this->expiration_date=new DateTime("@".(time() + (7*24*3600))); - } - $this->is_trash=true; - break; - case "trash_in_x": - $this->is_trash=true; - switch ($trash_exp_in_unit) { - case "weeks": - $trash_unit = 7*24*3600; - break; - case "days": - $trash_unit = 24*3600; - break; - case "hours": - $trash_unit = 3600; - break; - } - $this->expiration_date= new DateTime("@".(time() + ($trash_exp_in_value*$trash_unit)) ); - break; - case "no_exp": - $this->is_trash=false; - break; - default: - $this->is_trash=false; - } // switch - - if (!is_null($this->expiration_date)) $this->expiration_date_db=$this->expiration_date->format('Y-m-d H:i:s'); - } - -} - -?>