Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-20 16:37:48 +02:00
Code Issues Projects Releases Wiki Activity

fix php cs fixer concat operator to use space

Browse source
This commit is contained in:
osaajani 2020-01-17 18:47:08 +01:00
parent 9de6697752
commit 08bf5a878a
26 changed files with 113 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

4
controllers/internals/Adapter.php
View file

@ -72,7 +72,7 @@ namespace controllers\internals;
continue;
}
$adapters_files[] = PWD_ADAPTERS.'/'.$filename;
$adapters_files[] = PWD_ADAPTERS . '/' . $filename;
}
return $adapters_files;
@ -95,7 +95,7 @@ namespace controllers\internals;
}
$adapter_classname = pathinfo($adapter_file, PATHINFO_FILENAME);
$reflection_class = new \ReflectionClass('\adapters\\'.$adapter_classname);
$reflection_class = new \ReflectionClass('\adapters\\' . $adapter_classname);
if (!$reflection_class)
{
return false;

6
controllers/internals/Command.php
View file

@ -41,7 +41,7 @@ namespace controllers\internals;
}
$internal_event = new Event($this->bdd);
$internal_event->create($id_user, 'COMMAND_ADD', 'Ajout commande : '.$name.' => '.$script);
$internal_event->create($id_user, 'COMMAND_ADD', 'Ajout commande : ' . $name . ' => ' . $script);
return $result;
}
@ -127,9 +127,9 @@ namespace controllers\internals;
$decode_message['password'] = '******';
$updated_text = json_encode($decode_message);
$generated_command = PWD_SCRIPTS.'/'.$find_command['script'];
$generated_command = PWD_SCRIPTS . '/' . $find_command['script'];
$args = $decode_message['args'] ?? '';
$generated_command .= ' '.escapeshellcmd($args);
$generated_command .= ' ' . escapeshellcmd($args);
return [
'updated_text' => $updated_text,

2
controllers/internals/ConditionalGroup.php
View file

@ -46,7 +46,7 @@ namespace controllers\internals;
}
$internal_event = new Event($this->bdd);
$internal_event->create($id_user, 'CONDITIONAL_GROUP_ADD', 'Ajout du groupe conditionnel : '.$name);
$internal_event->create($id_user, 'CONDITIONAL_GROUP_ADD', 'Ajout du groupe conditionnel : ' . $name);
return $id_group;
}

8
controllers/internals/Contact.php
View file

@ -79,7 +79,7 @@ namespace controllers\internals;
}
$internal_event = new Event($this->bdd);
$internal_event->create($id_user, 'CONTACT_ADD', 'Ajout contact : '.$name.' ('.\controllers\internals\Tool::phone_format($number).')');
$internal_event->create($id_user, 'CONTACT_ADD', 'Ajout contact : ' . $name . ' (' . \controllers\internals\Tool::phone_format($number) . ')');
return $result;
}
@ -288,7 +288,7 @@ namespace controllers\internals;
//Php only support csv formatting to file. To get it in string we need to create a tmp in memory file, write in it, and then read the file into a var
// output up to 5MB is kept in memory, if it becomes bigger it will automatically be written to a temporary file
$csv_tmp_file = fopen('php://temp/maxmemory:'.(5 * 1024 * 1024), 'r+');
$csv_tmp_file = fopen('php://temp/maxmemory:' . (5 * 1024 * 1024), 'r+');
fputcsv($csv_tmp_file, $columns);
foreach ($lines as $line)
{
@ -302,7 +302,7 @@ namespace controllers\internals;
'headers' => [
'Content-Disposition: attachment; filename=contacts.csv',
'Content-Type: text/csv',
'Content-Length: '.\mb_strlen($csv_string),
'Content-Length: ' . mb_strlen($csv_string),
],
'content' => $csv_string,
];
@ -331,7 +331,7 @@ namespace controllers\internals;
'headers' => [
'Content-Disposition: attachment; filename=contacts.json',
'Content-Type: application/json',
'Content-Length: '.\mb_strlen($content),
'Content-Length: ' . mb_strlen($content),
],
'content' => $content,
];

2
controllers/internals/Group.php
View file

@ -53,7 +53,7 @@ namespace controllers\internals;
}
$internal_event = new Event($this->bdd);
$internal_event->create($id_user, 'GROUP_ADD', 'Ajout group : '.$name);
$internal_event->create($id_user, 'GROUP_ADD', 'Ajout group : ' . $name);
return $id_group;
}

2
controllers/internals/Scheduled.php
View file

@ -56,7 +56,7 @@ namespace controllers\internals;
{
$date = date('Y-m-d H:i:s');
$internal_event = new Event($this->bdd);
$internal_event->create($id_user, 'SCHEDULED_ADD', 'Ajout d\'un Sms pour le '.$date.'.');
$internal_event->create($id_user, 'SCHEDULED_ADD', 'Ajout d\'un Sms pour le ' . $date . '.');
return false;
}

8
controllers/internals/Tool.php
View file

@ -80,7 +80,7 @@ namespace controllers\internals;
$number_format = self::phone_format($number);
$url = \descartes\Router::url('Discussion', 'show', ['number' => $number]);
return '<a href="'.self::s($url, false, true, false).'">'.self::s($number_format, false, true, false).'</a>';
return '<a href="' . self::s($url, false, true, false) . '">' . self::s($number_format, false, true, false) . '</a>';
}
/**
@ -228,7 +228,7 @@ namespace controllers\internals;
switch ($file['error'])
{
case UPLOAD_ERR_INI_SIZE:
$result['content'] = 'Impossible de télécharger le fichier car il dépasse les '.ini_get('upload_max_filesize') / (1000 * 1000).' Mégaoctets.';
$result['content'] = 'Impossible de télécharger le fichier car il dépasse les ' . ini_get('upload_max_filesize') / (1000 * 1000) . ' Mégaoctets.';
break;
case UPLOAD_ERR_FORM_SIZE:
@ -295,7 +295,7 @@ namespace controllers\internals;
switch ($file['error'])
{
case UPLOAD_ERR_INI_SIZE:
$result['content'] = 'Impossible de télécharger le fichier car il dépasse les '.ini_get('upload_max_filesize') / (1000 * 1000).' Mégaoctets.';
$result['content'] = 'Impossible de télécharger le fichier car il dépasse les ' . ini_get('upload_max_filesize') / (1000 * 1000) . ' Mégaoctets.';
break;
case UPLOAD_ERR_FORM_SIZE:
@ -339,7 +339,7 @@ namespace controllers\internals;
return $result;
}
$new_file_path = PWD_DATAS.'/'.$md5_filename;
$new_file_path = PWD_DATAS . '/' . $md5_filename;
if (file_exists($new_file_path))
{

14
controllers/publics/Api.php
View file

@ -104,14 +104,14 @@ namespace controllers\publics;
{
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'].'entry_type must be one of : '.implode(', ', $entry_types).'.';
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . 'entry_type must be one of : ' . implode(', ', $entry_types) . '.';
$this->auto_http_code(false);
$this->json($return);
return false;
}
$controller_str = 'internal_'.$entry_type;
$controller_str = 'internal_' . $entry_type;
$controller = $this->{$controller_str};
$page = (int) $page;
@ -184,7 +184,7 @@ namespace controllers\publics;
{
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['MISSING_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['MISSING_PARAMETER'].($at ? '' : 'at ').($text ? '' : 'text');
$return['message'] = self::ERROR_MESSAGES['MISSING_PARAMETER'] . ($at ? '' : 'at ') . ($text ? '' : 'text');
$this->auto_http_code(false);
$this->json($return);
@ -195,7 +195,7 @@ namespace controllers\publics;
{
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'].'at must be a date of format "Y-m-d H:i:s".';
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . 'at must be a date of format "Y-m-d H:i:s".';
$this->auto_http_code(false);
$this->json($return);
@ -220,7 +220,7 @@ namespace controllers\publics;
{
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['MISSING_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['MISSING_PARAMETER'].'You must specify at least one valid number, contact, group or conditional_group.';
$return['message'] = self::ERROR_MESSAGES['MISSING_PARAMETER'] . 'You must specify at least one valid number, contact, group or conditional_group.';
$this->auto_http_code(false);
$this->json($return);
@ -231,7 +231,7 @@ namespace controllers\publics;
{
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'].'origin : You must specify an origin number among thoses of user phones.';
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . 'origin : You must specify an origin number among thoses of user phones.';
$this->auto_http_code(false);
$this->json($return);
@ -260,6 +260,7 @@ namespace controllers\publics;
* Delete a scheduled message.
*
* @param int $id : Id of scheduled message to delete
*
* @return bool : void
*/
public function delete_scheduled(int $id)
@ -274,6 +275,7 @@ namespace controllers\publics;
}
$this->auto_http_code(true);
return true;
}
}

2
controllers/publics/ConditionalGroup.php
View file

@ -227,7 +227,7 @@ namespace controllers\publics;
$contacts_name[] = $contact['name'];
}
$return['result'] = 'Contacts du groupe : '.implode(', ', $contacts_name);
$return['result'] = 'Contacts du groupe : ' . implode(', ', $contacts_name);
$return['success'] = true;
echo json_encode($return);

4
controllers/publics/Contact.php
View file

@ -306,10 +306,10 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Contact', 'list'));
}
$msg = $result.' nouveau contact a été inséré.';
$msg = $result . ' nouveau contact a été inséré.';
if ($result > 1)
{
$msg = $result.' nouveaux contacts ont été insérés.';
$msg = $result . ' nouveaux contacts ont été insérés.';
}
\FlashMessage\FlashMessage::push('success', $msg);

2
controllers/publics/Discussion.php
View file

@ -122,7 +122,7 @@ namespace controllers\publics;
'date' => htmlspecialchars($received['at']),
'text' => htmlspecialchars($received['text']),
'type' => 'received',
'md5' => md5($received['at'].$received['text']),
'md5' => md5($received['at'] . $received['text']),
];
}

6
controllers/publics/Received.php
View file

@ -59,7 +59,7 @@ namespace controllers\publics;
continue;
}
$receiveds[$key]['origin'] = $contact['name'].' ('.$received['origin'].')';
$receiveds[$key]['origin'] = $contact['name'] . ' (' . $received['origin'] . ')';
}
$this->render('received/list', ['receiveds' => $receiveds, 'page' => $page, 'limit' => $limit, 'nb_results' => \count($receiveds)]);
@ -85,7 +85,7 @@ namespace controllers\publics;
continue;
}
$receiveds[$key]['origin'] = $contact['name'].' ('.$received['origin'].')';
$receiveds[$key]['origin'] = $contact['name'] . ' (' . $received['origin'] . ')';
}
$this->render('received/list_unread', ['receiveds' => $receiveds, 'page' => $page, 'limit' => $limit, 'nb_results' => \count($receiveds)]);
@ -134,7 +134,7 @@ namespace controllers\publics;
continue;
}
$receiveds[$key]['origin'] = $this->s($contact['name'], false, true, false).' ('.\controllers\internals\Tool::phone_link($received['origin']).')';
$receiveds[$key]['origin'] = $this->s($contact['name'], false, true, false) . ' (' . \controllers\internals\Tool::phone_link($received['origin']) . ')';
}
$nb_received = \count($receiveds);

4
controllers/publics/Scheduled.php
View file

@ -297,7 +297,7 @@ namespace controllers\publics;
$media = $_FILES['media'] ?? false;
if (!($_SESSION['user']['settings']['mms'] ?? false) || !$media)
{
\FlashMessage\FlashMessage::push('success', 'Le Sms a bien été créé pour le '.$at.'.');
\FlashMessage\FlashMessage::push('success', 'Le Sms a bien été créé pour le ' . $at . '.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
@ -310,7 +310,7 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
\FlashMessage\FlashMessage::push('success', 'Le Sms a bien été créé pour le '.$at.'.');
\FlashMessage\FlashMessage::push('success', 'Le Sms a bien été créé pour le ' . $at . '.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}