banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid unused local variables

Browse Source
pull/73/head
Aleksander Machniak 11 years ago
parent ef1d6525c2
commit 2193f6a130
16 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File

1
plugins/acl/acl.php
Unescape Escape View File

@ -384,7 +384,6 @@ class acl extends rcube_plugin
$table->add_header(array('class' => 'acl'.$key, 'title' => $label), $label);
}
$i = 1;
$js_table = array();
foreach ($acl as $user => $rights) {
if ($this->rc->storage->conn->user == $user) {

4
plugins/autologon/autologon.php
Unescape Escape View File

@ -19,8 +19,6 @@ class autologon extends rcube_plugin
function startup($args)
{
$rcmail = rcmail::get_instance();
// change action to login
if (empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
$args['action'] = 'login';
@ -37,7 +35,7 @@ class autologon extends rcube_plugin
$args['cookiecheck'] = false;
$args['valid'] = true;
}
return $args;
}

2
plugins/debug_logger/runlog/runlog.php
Unescape Escape View File

@ -194,7 +194,7 @@ class runlog {
public function print_totals(){
$totals = array();
foreach ( $this->run_log as $k => $entry ) {
foreach ($this->run_log as $entry) {
if ( $entry['type'] == 'start' && $entry['ended'] == true) {
$totals[$entry['value']]['duration'] += $entry['duration'];
$totals[$entry['value']]['count'] += 1;

6
plugins/enigma/enigma.php
Unescape Escape View File

@ -149,7 +149,7 @@ class enigma extends rcube_plugin
*/
function parse_structure($p)
{
$struct = $p['structure'];
// $struct = $p['structure'];
if ($p['mimetype'] == 'text/plain' || $p['mimetype'] == 'application/pgp') {
$this->parse_plain($p);
@ -391,7 +391,7 @@ class enigma extends rcube_plugin
function message_load($p)
{
$this->message = $p['object'];
// handle attachments vcard attachments
foreach ((array)$this->message->attachments as $attachment) {
if ($this->is_keys_part($attachment)) {
@ -399,7 +399,7 @@ class enigma extends rcube_plugin
}
}
// the same with message bodies
foreach ((array)$this->message->parts as $idx => $part) {
foreach ((array)$this->message->parts as $part) {
if ($this->is_keys_part($part)) {
$this->keys_parts[] = $part->mime_id;
$this->keys_bodies[] = $part->mime_id;

16
plugins/enigma/lib/enigma_engine.php
Unescape Escape View File

@ -497,9 +497,11 @@ class enigma_engine
$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
$mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
$storage = $this->rc->get_storage();
if ($uid && $mime_id) {
$part = $this->rc->storage->get_message_part($uid, $mime_id);
$storage->set_folder($mbox);
$part = $storage->get_message_part($uid, $mime_id);
}
if ($part && is_array($result = $this->import_key($part))) {
@ -528,16 +530,4 @@ class enigma_engine
$uid, $part->mime_id, $part);
}
}
/**
* Adds CSS style file to the page header.
*/
private function add_css()
{
$skin = $this->rc->config->get('skin');
if (!file_exists($this->home . "/skins/$skin/enigma.css"))
$skin = 'default';
$this->include_stylesheet("skins/$skin/enigma.css");
}
}

5
plugins/enigma/lib/enigma_ui.php
Unescape Escape View File

@ -176,8 +176,7 @@ class enigma_ui
$search = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GPC);
// define list of cols to be displayed
$a_show_cols = array('name');
$result = array();
// $a_show_cols = array('name');
// Get the list
$list = $this->enigma->engine->list_keys($search);
@ -200,7 +199,7 @@ class enigma_ui
$size = count($list);
// Add rows
foreach($list as $idx => $key) {
foreach ($list as $key) {
$this->rc->output->command('enigma_add_list_row',
array('name' => rcube::Q($key->name), 'id' => $key->id));
}

2
plugins/help/help.php
Unescape Escape View File

@ -21,8 +21,6 @@ class help extends rcube_plugin
function init()
{
$rcmail = rcmail::get_instance();
$this->add_texts('localization/', false);
// register task

6
plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
Unescape Escape View File

@ -206,7 +206,6 @@ class rcube_sieve_script
// rules
foreach ($this->content as $rule) {
$extension = '';
$script = '';
$tests = array();
$i = 0;
@ -1015,11 +1014,10 @@ class rcube_sieve_script
* @param mixed $num Number of tokens to return, 0 for all
* or True for all tokens until separator is found.
* Separator will be returned as last token.
* @param int $in_list Enable to call recursively inside a list
*
* @return mixed Tokens array or string if $num=1
*/
static function tokenize(&$str, $num=0, $in_list=false)
static function tokenize(&$str, $num=0)
{
$result = array();
@ -1054,7 +1052,7 @@ class rcube_sieve_script
// Parenthesized list
case '[':
$str = substr($str, 1);
$result[] = self::tokenize($str, 0, true);
$result[] = self::tokenize($str, 0);
break;
case ']':
$str = substr($str, 1);

8
plugins/managesieve/managesieve.php
Unescape Escape View File

@ -1640,7 +1640,7 @@ class managesieve extends rcube_plugin
.'value="' . rcube::Q($action['value']) . '" size="35" '
. $this->error_class($id, 'action', 'value', 'action_varvalue') .' />';
$out .= '<br /><span class="label">' .rcube::Q($this->gettext('setvarmodifiers')) . '</span><br />';
foreach ($set_modifiers as $j => $s_m) {
foreach ($set_modifiers as $s_m) {
$s_m_id = 'action_varmods' . $id . $s_m;
$out .= sprintf('<input type="checkbox" name="_action_varmods[%s][]" value="%s" id="%s"%s />%s<br>',
$id, $s_m, $s_m_id,
@ -1902,7 +1902,7 @@ class managesieve extends rcube_plugin
$user_script = $_SESSION['managesieve_user_script'];
// if the script is not active...
if ($user_script && ($key = array_search($name, $this->active)) === false) {
if ($user_script && array_search($name, $this->active) === false) {
// ...rewrite USER file adding appropriate include command
if ($this->sieve->load($user_script)) {
$script = $this->sieve->script->as_array();
@ -1920,7 +1920,7 @@ class managesieve extends rcube_plugin
// get all active scripts for sorting
foreach ($script as $rid => $rules) {
foreach ($rules['actions'] as $aid => $action) {
foreach ($rules['actions'] as $action) {
if ($action['type'] == 'include' && empty($action['global'])) {
$target = $extension ? preg_replace($regexp, '', $action['target']) : $action['target'];
$list[] = $target;
@ -1988,7 +1988,7 @@ class managesieve extends rcube_plugin
$name = $name.$extension;
foreach ($script as $rid => $rules) {
foreach ($rules['actions'] as $aid => $action) {
foreach ($rules['actions'] as $action) {
if ($action['type'] == 'include' && empty($action['global'])
&& $action['target'] == $name
) {

2
plugins/new_user_identity/new_user_identity.php
Unescape Escape View File

@ -33,8 +33,6 @@ class new_user_identity extends rcube_plugin
function lookup_user_name($args)
{
$rcmail = rcmail::get_instance();
if ($this->init_ldap($args['host'])) {
$results = $this->ldap->search('*', $args['user'], true);
if (count($results->records) == 1) {

1
plugins/password/drivers/directadmin.php
Unescape Escape View File

@ -297,7 +297,6 @@ class HTTPSocket {
$status = socket_get_status($socket);
$startTime = time();
$length = 0;
$prevSecond = 0;
while ( !feof($socket) && !$status['timed_out'] )
{
$chunk = fgets($socket,1024);

5
plugins/password/drivers/sql.php
Unescape Escape View File

@ -34,8 +34,9 @@ class rcube_sql_password
$db = $rcmail->get_dbh();
}
if ($err = $db->is_error())
if ($db->is_error()) {
return PASSWORD_ERROR;
}
// crypted password
if (strpos($sql, '%c') !== FALSE) {
@ -184,7 +185,7 @@ class rcube_sql_password
if (!$db->is_error()) {
if (strtolower(substr(trim($sql),0,6)) == 'select') {
if ($result = $db->fetch_array($res))
if ($db->fetch_array($res))
return PASSWORD_SUCCESS;
} else {
// This is the good case: 1 row updated

4
plugins/password/drivers/xmail.php
Unescape Escape View File

@ -67,7 +67,7 @@ class XMail {
function send($msg)
{
socket_write($this->socket,$msg);
if (substr($in = socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
if (substr(socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
return false;
}
return true;
@ -85,7 +85,7 @@ class XMail {
return false;
}
if (substr($in = socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
if (substr(socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
socket_close($this->socket);
return false;
}

2
plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
Unescape Escape View File

@ -63,7 +63,7 @@ class squirrelmail_usercopy extends rcube_plugin
if ($this->prefs['___sig'.$i.'___'])
$ident_data['signature'] = $this->prefs['___sig'.$i.'___'];
// insert identity
$identid = $rcmail->user->insert_identity($ident_data);
$rcmail->user->insert_identity($ident_data);
}
}

3
plugins/vcard_attachments/vcard_attachments.php
Unescape Escape View File

@ -45,7 +45,7 @@ class vcard_attachments extends rcube_plugin
}
}
// the same with message bodies
foreach ((array)$this->message->parts as $idx => $part) {
foreach ((array)$this->message->parts as $part) {
if ($this->is_vcard($part)) {
$this->vcard_parts[] = $part->mime_id;
$this->vcard_bodies[] = $part->mime_id;
@ -63,7 +63,6 @@ class vcard_attachments extends rcube_plugin
function html_output($p)
{
$attach_script = false;
$icon = 'plugins/vcard_attachments/' .$this->local_skin_path(). '/vcard_add_contact.png';
foreach ($this->vcard_parts as $part) {
$vcards = rcube_vcard::import($this->message->get_part_content($part, null, true));

4
plugins/zipdownload/zipdownload.php
Unescape Escape View File

@ -169,7 +169,7 @@ class zipdownload extends rcube_plugin
for ($i = 0; ($i * $imap->get_pagesize()) <= $count; $i++) {
$a_headers = $imap->list_messages($mbox_name, ($i + 1));
foreach ($a_headers as $n => $header) {
foreach ($a_headers as $header) {
if (empty($header))
continue;
@ -199,7 +199,7 @@ class zipdownload extends rcube_plugin
$zip = new ZipArchive();
$zip->open($tmpfname, ZIPARCHIVE::OVERWRITE);
foreach ($uids as $key => $uid){
foreach ($uids as $uid){
$headers = $imap->get_message_headers($uid);
$subject = rcube_mime::decode_mime_string((string)$headers->subject);
$subject = $this->_convert_filename($subject);

Write Preview
Loading…
Cancel
Save