Remove all the too long lines
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3266 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
8
auth.php
8
auth.php
@@ -100,13 +100,9 @@ class auth
|
|||||||
$res .= " <input type='text' class='form-control' name='email' ";
|
$res .= " <input type='text' class='form-control' name='email' ";
|
||||||
$res .= "placeholder='".dgettext("domframework",
|
$res .= "placeholder='".dgettext("domframework",
|
||||||
"Email address")."' required autofocus/>\n";
|
"Email address")."' required autofocus/>\n";
|
||||||
$res .= " <input type='password' class='form-control' name='password' ";
|
$res .= " <input type='password' class='form-control' name='password'";
|
||||||
$res .= "placeholder='".dgettext("domframework",
|
$res .= " placeholder='".dgettext("domframework",
|
||||||
"Password")."' required/>\n";
|
"Password")."' required/>\n";
|
||||||
// $res .= " <label class='checkbox'>";
|
|
||||||
// $res .= "<input type='checkbox' name='remember-me'/>".dgettext("domframework",
|
|
||||||
// "Remember me");
|
|
||||||
// $res .= "</label>\n";
|
|
||||||
$res .= " <input type='submit' value='".dgettext("domframework",
|
$res .= " <input type='submit' value='".dgettext("domframework",
|
||||||
"Sign in")."'/>\n";
|
"Sign in")."'/>\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -837,7 +837,8 @@ class dblayer
|
|||||||
{
|
{
|
||||||
if ($s[1] === null)
|
if ($s[1] === null)
|
||||||
continue;
|
continue;
|
||||||
if ($this->debug) echo "DEBUG BIND : ".$s[0]."(".md5 ($s[0].$s[1]).")->".
|
if ($this->debug)
|
||||||
|
echo "DEBUG BIND : ".$s[0]."(".md5 ($s[0].$s[1]).")->".
|
||||||
var_export ($s[1], TRUE)."\n";
|
var_export ($s[1], TRUE)."\n";
|
||||||
$st->bindValue (":".md5 ($s[0].$s[1]), $s[1]);
|
$st->bindValue (":".md5 ($s[0].$s[1]), $s[1]);
|
||||||
}
|
}
|
||||||
@@ -846,7 +847,8 @@ class dblayer
|
|||||||
{
|
{
|
||||||
foreach ($foreignSelect as $s)
|
foreach ($foreignSelect as $s)
|
||||||
{
|
{
|
||||||
if ($this->debug) echo "DEBUG BIND : ".$s[0]."(".md5 ($s[0].$s[1]).")->".
|
if ($this->debug)
|
||||||
|
echo "DEBUG BIND : ".$s[0]."(".md5 ($s[0].$s[1]).")->".
|
||||||
var_export ($s[1], TRUE)."\n";
|
var_export ($s[1], TRUE)."\n";
|
||||||
$st->bindValue (":".md5 ($s[0].$s[1]), $s[1]);
|
$st->bindValue (":".md5 ($s[0].$s[1]), $s[1]);
|
||||||
}
|
}
|
||||||
|
|||||||
3
imap.php
3
imap.php
@@ -224,7 +224,8 @@ class imap
|
|||||||
//////////////////////
|
//////////////////////
|
||||||
/// LIST MAILS ///
|
/// LIST MAILS ///
|
||||||
//////////////////////
|
//////////////////////
|
||||||
/** Return an array of mailHeaders order by $field and by order ASC or DESC */
|
/** Return an array of mailHeaders order by $field and by order ASC or DESC
|
||||||
|
*/
|
||||||
public function imapSortMail ($mailHeaders, $field, $orderAsc = TRUE)
|
public function imapSortMail ($mailHeaders, $field, $orderAsc = TRUE)
|
||||||
{
|
{
|
||||||
if ($this->mailbox === null)
|
if ($this->mailbox === null)
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ class ipaddresses
|
|||||||
public function validIPAddress ($ip)
|
public function validIPAddress ($ip)
|
||||||
{
|
{
|
||||||
if (!is_string ($ip) || $ip === "")
|
if (!is_string ($ip) || $ip === "")
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IP address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IP address"),
|
||||||
|
500);
|
||||||
$rc = $this->validIPv4Address ($ip);
|
$rc = $this->validIPv4Address ($ip);
|
||||||
if ($rc === TRUE)
|
if ($rc === TRUE)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@@ -22,7 +23,8 @@ class ipaddresses
|
|||||||
public function validIPv4Address ($ip)
|
public function validIPv4Address ($ip)
|
||||||
{
|
{
|
||||||
if (!is_string ($ip) || $ip === "")
|
if (!is_string ($ip) || $ip === "")
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IPv4 address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IPv4 address"),
|
||||||
|
500);
|
||||||
$rc = filter_var ($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
|
$rc = filter_var ($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
|
||||||
if ($rc ===FALSE)
|
if ($rc ===FALSE)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -33,22 +35,24 @@ class ipaddresses
|
|||||||
public function validIPv6Address ($ip)
|
public function validIPv6Address ($ip)
|
||||||
{
|
{
|
||||||
if (!is_string ($ip) || $ip === "")
|
if (!is_string ($ip) || $ip === "")
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IPv6 address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IPv6 address"),
|
||||||
|
500);
|
||||||
$rc = filter_var ($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
|
$rc = filter_var ($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
|
||||||
if ($rc ===FALSE)
|
if ($rc ===FALSE)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Return the IPv6 uncompressed (all the fields exists). They are not filled by
|
/** Return the IPv6 uncompressed (all the fields exists). They are not filled
|
||||||
zeros
|
by zeros
|
||||||
If the provided IP is IPv4, there is no change applied
|
If the provided IP is IPv4, there is no change applied
|
||||||
Return False if the parameter is invalid
|
Return False if the parameter is invalid
|
||||||
Based on http://www.weberdev.com/get_example.php3?ExampleID=3921 */
|
Based on http://www.weberdev.com/get_example.php3?ExampleID=3921 */
|
||||||
public function uncompressIPv6 ($ip)
|
public function uncompressIPv6 ($ip)
|
||||||
{
|
{
|
||||||
if (! is_string ($ip) || $ip === "")
|
if (! is_string ($ip) || $ip === "")
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IP address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IP address"),
|
||||||
|
500);
|
||||||
if (strstr ($ip,"::"))
|
if (strstr ($ip,"::"))
|
||||||
{
|
{
|
||||||
$e = explode (":", $ip);
|
$e = explode (":", $ip);
|
||||||
@@ -84,9 +88,11 @@ class ipaddresses
|
|||||||
public function groupIPv6 ($ipv6)
|
public function groupIPv6 ($ipv6)
|
||||||
{
|
{
|
||||||
if (! is_string ($ipv6) || $ipv6 === "")
|
if (! is_string ($ipv6) || $ipv6 === "")
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IPv6 address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IPv6 address"),
|
||||||
|
500);
|
||||||
if (substr_count ($ipv6, ".") !== 31)
|
if (substr_count ($ipv6, ".") !== 31)
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IPv6 address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IPv6 address"),
|
||||||
|
500);
|
||||||
$ipv6 = str_replace (".", "", $ipv6);
|
$ipv6 = str_replace (".", "", $ipv6);
|
||||||
$new = "";
|
$new = "";
|
||||||
for ($i = 0 ; $i < 32 ; $i++)
|
for ($i = 0 ; $i < 32 ; $i++)
|
||||||
@@ -101,11 +107,13 @@ class ipaddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Return the IP adddress with filling the fields with the missing zeros.
|
/* Return the IP adddress with filling the fields with the missing zeros.
|
||||||
Valid only on IPv6 (but don't change anything if the provided address is IPv4) */
|
Valid only on IPv6 (but don't change anything if the provided address is
|
||||||
|
IPv4) */
|
||||||
public function completeAddressWithZero ($ip)
|
public function completeAddressWithZero ($ip)
|
||||||
{
|
{
|
||||||
if (! is_string ($ip) || $ip === "")
|
if (! is_string ($ip) || $ip === "")
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IP address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IP address"),
|
||||||
|
500);
|
||||||
$ip = $this->uncompressIPv6 ($ip);
|
$ip = $this->uncompressIPv6 ($ip);
|
||||||
if (substr_count ($ip, ":") === 7)
|
if (substr_count ($ip, ":") === 7)
|
||||||
{
|
{
|
||||||
@@ -192,7 +200,8 @@ class ipaddresses
|
|||||||
function reverseIPAddress ($ipReverse)
|
function reverseIPAddress ($ipReverse)
|
||||||
{
|
{
|
||||||
if (!is_string ($ipReverse) || $ipReverse === "")
|
if (!is_string ($ipReverse) || $ipReverse === "")
|
||||||
throw new \Exception (dgettext("domframework", "Invalid IP address"), 500);
|
throw new \Exception (dgettext("domframework", "Invalid IP address"),
|
||||||
|
500);
|
||||||
$ipReverse = $this->completeAddressWithZero ($ipReverse);
|
$ipReverse = $this->completeAddressWithZero ($ipReverse);
|
||||||
if (substr_count ($ipReverse, ":") === 7 && strlen ($ipReverse) == 39)
|
if (substr_count ($ipReverse, ":") === 7 && strlen ($ipReverse) == 39)
|
||||||
{
|
{
|
||||||
|
|||||||
3
mail.php
3
mail.php
@@ -893,7 +893,8 @@ class mail
|
|||||||
continue;
|
continue;
|
||||||
if ($inline === true && substr ($disposition, 0, 6) === "inline")
|
if ($inline === true && substr ($disposition, 0, 6) === "inline")
|
||||||
$res[] = $sectionID;
|
$res[] = $sectionID;
|
||||||
elseif ($inline === false && substr ($disposition, 0, 10) === "attachment")
|
elseif ($inline === false &&
|
||||||
|
substr ($disposition, 0, 10) === "attachment")
|
||||||
$res[] = $sectionID;
|
$res[] = $sectionID;
|
||||||
}
|
}
|
||||||
return $res;
|
return $res;
|
||||||
|
|||||||
@@ -135,7 +135,8 @@ class renderer
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$dataflash .= " alert-dismissable'>\n";
|
$dataflash .= " alert-dismissable'>\n";
|
||||||
$dataflash .= "<button type='button' class='close' data-dismiss='alert'";
|
$dataflash .= "<button type='button' class='close' ".
|
||||||
|
"data-dismiss='alert'";
|
||||||
$dataflash .= " aria-hidden='true'>×</button>\n";
|
$dataflash .= " aria-hidden='true'>×</button>\n";
|
||||||
$dataflash .= "<strong>$alert</strong> ".$flash[1]."\n";
|
$dataflash .= "<strong>$alert</strong> ".$flash[1]."\n";
|
||||||
$dataflash .= "</div>\n";
|
$dataflash .= "</div>\n";
|
||||||
|
|||||||
442
routeSQL.php
442
routeSQL.php
@@ -762,44 +762,174 @@ $content .= "</li>\n";
|
|||||||
if ($this->enableInternalCSS === true)
|
if ($this->enableInternalCSS === true)
|
||||||
{
|
{
|
||||||
$content .= "<style type='text/css' scoped='scoped'>\n";
|
$content .= "<style type='text/css' scoped='scoped'>\n";
|
||||||
$content .= ".routeSQL { width:95%; margin-left:auto; margin-right:auto; }\n";
|
$content .= ".routeSQL {
|
||||||
$content .= ".routeSQL a { text-decoration:none; }\n";
|
width:95%;
|
||||||
$content .= ".routeSQL .topBar { display: block; overflow: auto; }\n";
|
margin-left:auto;
|
||||||
$content .= ".routeSQL .topBar .topleft { display: inline; float:left; }\n";
|
margin-right:auto;
|
||||||
$content .= ".routeSQL .topBar .topright { display: inline; float:right; }\n";
|
}\n";
|
||||||
$content .= ".routeSQL .bottomBar { display: block; overflow: auto; }\n";
|
$content .= ".routeSQL a {
|
||||||
$content .= ".routeSQL .bottomBar .bottomleft { display: inline; float:left; }\n";
|
text-decoration:none;
|
||||||
$content .= ".routeSQL .bottomBar .bottomright { display: inline; float:right; }\n";
|
}\n";
|
||||||
$content .= ".routeSQL .actionExtern { border:1px solid #ddd; border-radius:5px; padding:0px; margin:3px; float:left; }\n";
|
$content .= ".routeSQL .topBar {
|
||||||
$content .= ".routeSQL .actionExtern a { display: block; padding : 9px; }\n";
|
display: block;
|
||||||
$content .= ".routeSQL .numberEntryByDisplayArea { border:1px solid #ddd; border-radius:5px; padding:10px; margin:3px; float:left; }\n";
|
overflow: auto;
|
||||||
$content .= ".routeSQL .searchArea { border:1px solid #ddd; border-radius:5px; padding:10px; margin:3px; float:left; }\n";
|
}\n";
|
||||||
$content .= ".routeSQL .searchArea form { margin:-1px; }\n";
|
$content .= ".routeSQL .topBar .topleft {
|
||||||
$content .= ".routeSQL .numberEntryByDisplayArea form { margin:-3px; }\n";
|
display: inline;
|
||||||
$content .= ".routeSQL .informationArea { border:1px solid #ddd; border-radius:5px; padding:10px; margin:3px; float:left; }\n";
|
float:left;
|
||||||
$content .= ".routeSQL div.paginatorArea { float:left; }\n";
|
}\n";
|
||||||
$content .= ".routeSQL div.paginatorArea>ul>li>a { display: block; }\n";
|
$content .= ".routeSQL .topBar .topright {
|
||||||
$content .= ".routeSQL ul.paginatorArea { list-style-type:none; margin: 0px; padding:0px; border:1px solid #ddd; border-radius:5px; }\n";
|
display: inline;
|
||||||
$content .= ".routeSQL ul.paginatorArea li.selected { background-color: #04d; padding:0px;}\n";
|
float:right;
|
||||||
$content .= ".routeSQL ul.paginatorArea li.selected:first-child { border-top-left-radius: 5px; border-bottom-left-radius: 5px;}\n";
|
}\n";
|
||||||
$content .= ".routeSQL ul.paginatorArea li.selected:last-child { border-top-right-radius: 5px; border-bottom-right-radius: 5px;}\n";
|
$content .= ".routeSQL .bottomBar {
|
||||||
$content .= ".routeSQL ul.paginatorArea li.selected a { padding : 10px;color:white; font-weight:bold; }\n";
|
display: block;
|
||||||
$content .= ".routeSQL ul.paginatorArea li a { padding : 10px }\n";
|
overflow: auto;
|
||||||
$content .= ".routeSQL ul.paginatorArea li { display: inline-block; }\n";
|
}\n";
|
||||||
$content .= ".routeSQL table { width:100%;overflow:auto; border-collapse:collapse; }\n";
|
$content .= ".routeSQL .bottomBar .bottomleft {
|
||||||
$content .= ".routeSQL table tr { border-top:1px solid #ccc;}\n";
|
display: inline;
|
||||||
$content .= ".routeSQL table th { border-bottom:3px solid #ccc; border-top:1px solid #fff; padding:9px 5px 9px 1px; }\n";
|
float:left;
|
||||||
$content .= ".routeSQL table td { empty-cells:true; padding:9px 5px 9px 1px; }\n";
|
}\n";
|
||||||
$content .= ".routeSQL table .noentry { text-align:center; color:#c00; font-weight:bolder; }\n";
|
$content .= ".routeSQL .bottomBar .bottomright {
|
||||||
$content .= ".routeSQL table .action { text-align:left; padding-left: 8px; }\n";
|
display: inline;
|
||||||
$content .= ".routeSQL table .action .edit { color:#222; font-weight:bolder;}\n";
|
float:right;
|
||||||
$content .= ".routeSQL table .action .delete { color:#c00; font-weight:bolder; }\n";
|
}\n";
|
||||||
$content .= ".routeSQL table .odd { background-color:#f9f9f9; }\n";
|
$content .= ".routeSQL .actionExtern {
|
||||||
$content .= ".routeSQL .alert { border-radius: 4px ; border-width: 1px; padding:10px; }\n";
|
border:1px solid #ddd;
|
||||||
$content .= ".routeSQL .alert-success { border-color: #d6e9c6; background-color: #dff0d8; color: #3c763d}\n";
|
border-radius:5px;
|
||||||
$content .= ".routeSQL .alert-info { border-color: #bce8f1; background-color: #d9edf7; color: #31708f;}\n";
|
padding:0px;
|
||||||
$content .= ".routeSQL .alert-warning { border-color: #faebcc; background-color: #fcf8e3; color: #8a6d3b;}\n";
|
margin:3px;
|
||||||
$content .= ".routeSQL .alert-danger { border-color: #ebccd1; background-color: #f2dede; color: #a94442; }\n";
|
float:left;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .actionExtern a {
|
||||||
|
display: block;
|
||||||
|
padding : 9px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .numberEntryByDisplayArea {
|
||||||
|
border:1px solid #ddd;
|
||||||
|
border-radius:5px;
|
||||||
|
padding:10px;
|
||||||
|
margin:3px;
|
||||||
|
float:left;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .searchArea {
|
||||||
|
border:1px solid #ddd;
|
||||||
|
border-radius:5px;
|
||||||
|
padding:10px;
|
||||||
|
margin:3px;
|
||||||
|
float:left;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .searchArea form {
|
||||||
|
margin:-1px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .numberEntryByDisplayArea form {
|
||||||
|
margin:-3px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .informationArea {
|
||||||
|
border:1px solid #ddd;
|
||||||
|
border-radius:5px;
|
||||||
|
padding:10px;
|
||||||
|
margin:3px;
|
||||||
|
float:left;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL div.paginatorArea {
|
||||||
|
float:left;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL div.paginatorArea>ul>li>a {
|
||||||
|
display: block;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL ul.paginatorArea {
|
||||||
|
list-style-type:none;
|
||||||
|
margin: 0px;
|
||||||
|
padding:0px;
|
||||||
|
border:1px solid #ddd;
|
||||||
|
border-radius:5px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL ul.paginatorArea li.selected {
|
||||||
|
background-color: #04d;
|
||||||
|
padding:0px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL ul.paginatorArea li.selected:first-child {
|
||||||
|
border-top-left-radius: 5px;
|
||||||
|
border-bottom-left-radius: 5px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL ul.paginatorArea li.selected:last-child {
|
||||||
|
border-top-right-radius: 5px;
|
||||||
|
border-bottom-right-radius: 5px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL ul.paginatorArea li.selected a {
|
||||||
|
padding : 10px;
|
||||||
|
color:white;
|
||||||
|
font-weight:bold;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL ul.paginatorArea li a {
|
||||||
|
padding : 10px
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL ul.paginatorArea li {
|
||||||
|
display: inline-block;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table {
|
||||||
|
width:100%;
|
||||||
|
overflow:auto;
|
||||||
|
border-collapse:collapse;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table tr {
|
||||||
|
border-top:1px solid #ccc;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table th {
|
||||||
|
border-bottom:3px solid #ccc;
|
||||||
|
border-top:1px solid #fff;
|
||||||
|
padding:9px 5px 9px 1px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table td {
|
||||||
|
empty-cells:true;
|
||||||
|
padding:9px 5px 9px 1px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table .noentry {
|
||||||
|
text-align:center;
|
||||||
|
color:#c00;
|
||||||
|
font-weight:bolder;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table .action {
|
||||||
|
text-align:left;
|
||||||
|
padding-left: 8px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table .action .edit {
|
||||||
|
color:#222;
|
||||||
|
font-weight:bolder;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table .action .delete {
|
||||||
|
color:#c00;
|
||||||
|
font-weight:bolder;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL table .odd {
|
||||||
|
background-color:#f9f9f9;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .alert {
|
||||||
|
border-radius: 4px ;
|
||||||
|
border-width: 1px;
|
||||||
|
padding:10px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .alert-success {
|
||||||
|
border-color: #d6e9c6;
|
||||||
|
background-color: #dff0d8;
|
||||||
|
color: #3c763d
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .alert-info {
|
||||||
|
border-color: #bce8f1;
|
||||||
|
background-color: #d9edf7;
|
||||||
|
color: #31708f;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .alert-warning {
|
||||||
|
border-color: #faebcc;
|
||||||
|
background-color: #fcf8e3;
|
||||||
|
color: #8a6d3b;
|
||||||
|
}\n";
|
||||||
|
$content .= ".routeSQL .alert-danger {
|
||||||
|
border-color: #ebccd1;
|
||||||
|
background-color: #f2dede;
|
||||||
|
color: #a94442;
|
||||||
|
}\n";
|
||||||
$content .= "</style>\n";
|
$content .= "</style>\n";
|
||||||
}
|
}
|
||||||
$content .= "<div class='routeSQL'>\n";
|
$content .= "<div class='routeSQL'>\n";
|
||||||
@@ -1076,29 +1206,101 @@ $content .= "</li>\n";
|
|||||||
{
|
{
|
||||||
// CSS is in edit an id too !
|
// CSS is in edit an id too !
|
||||||
$content .= "<style type='text/css' scoped='scoped'>\n";
|
$content .= "<style type='text/css' scoped='scoped'>\n";
|
||||||
$content .= "#form .col-sm-2 { float:left; width: 16.66666667%; padding-left:15px;padding-right:15px;};\n";
|
$content .= "#form .col-sm-2 {
|
||||||
$content .= "#form .col-sm-10 {float:left; width: 83.33333333%; }\n";
|
float:left;
|
||||||
$content .= "#form .col-sm-12 { width: 100%; }\n";
|
width: 16.66666667%;
|
||||||
$content .= "#form input[type='submit'] { width:93%; margin-left:auto;margin-right:auto}\n";
|
padding-left:15px;
|
||||||
$content .= "#form .btn-primary { color: #fff; background-color: #428bca; border-color: #357ebd; }\n";
|
padding-right:15px;
|
||||||
|
};\n";
|
||||||
|
$content .= "#form .col-sm-10 {
|
||||||
$content .= ".help-block { margin-left:16.7%;display: block; color:#a94442;} \n";
|
float:left;
|
||||||
$content .= "#form input[type='text'] { background-color:#fff;}\n";
|
width: 83.33333333%;
|
||||||
$content .= "#form .has-error label { color:#a94442; }\n";
|
}\n";
|
||||||
$content .= "#form .has-error .form-control { border-color:#a94442; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset; }\n";
|
$content .= "#form .col-sm-12 {
|
||||||
$content .= ".form-group { margin-bottom: 15px; }\n";
|
width: 100%;
|
||||||
$content .= ".form-horizontal .control-label { text-align: right; }\n";
|
}\n";
|
||||||
$content .= "label { display: inline-block; font-weight: 700; }\n";
|
$content .= "#form input[type='submit'] {
|
||||||
$content .= ".form-control { display: block; border-radius: 4px;padding-top: 6px; padding-right: 12px; padding-bottom: 6px; padding-left: 12px; width: 80%; }\n";
|
width:93%;
|
||||||
$content .= "* { box-sizing: border-box;}\n";
|
margin-left:auto;
|
||||||
$content .= "button, input, optgroup, select, textarea { margin:0px 0px 0px 0px; }\n";
|
margin-right:auto
|
||||||
$content .= "#form .form-control[disabled], #form .form-control[readonly], #form fieldset[disabled] .form-control { cursor: not-allowed; background-color: #eee; opacity: 1; }\n";
|
}\n";
|
||||||
$content .= ".alert { border-radius: 4px ; border-width: 1px; padding:10px; }\n";
|
$content .= "#form .btn-primary {
|
||||||
$content .= ".alert-success { border-color: #d6e9c6; background-color: #dff0d8; color: #3c763d}\n";
|
color: #fff;
|
||||||
$content .= ".alert-info { border-color: #bce8f1; background-color: #d9edf7; color: #31708f;}\n";
|
background-color: #428bca;
|
||||||
$content .= ".alert-warning { border-color: #faebcc; background-color: #fcf8e3; color: #8a6d3b;}\n";
|
border-color: #357ebd;
|
||||||
$content .= ".alert-danger { border-color: #ebccd1; background-color: #f2dede; color: #a94442; }\n";
|
}\n";
|
||||||
|
$content .= ".help-block {
|
||||||
|
margin-left:16.7%;
|
||||||
|
display: block;
|
||||||
|
color:#a94442;
|
||||||
|
} \n";
|
||||||
|
$content .= "#form input[type='text'] {
|
||||||
|
background-color:#fff;
|
||||||
|
}\n";
|
||||||
|
$content .= "#form .has-error label {
|
||||||
|
color:#a94442;
|
||||||
|
}\n";
|
||||||
|
$content .= "#form .has-error .form-control {
|
||||||
|
border-color:#a94442;
|
||||||
|
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
|
||||||
|
}\n";
|
||||||
|
$content .= ".form-group {
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".form-horizontal .control-label {
|
||||||
|
text-align: right;
|
||||||
|
}\n";
|
||||||
|
$content .= "label {
|
||||||
|
display: inline-block;
|
||||||
|
font-weight: 700;
|
||||||
|
}\n";
|
||||||
|
$content .= ".form-control {
|
||||||
|
display: block;
|
||||||
|
border-radius: 4px;
|
||||||
|
padding-top: 6px;
|
||||||
|
padding-right: 12px;
|
||||||
|
padding-bottom: 6px;
|
||||||
|
padding-left: 12px;
|
||||||
|
width: 80%;
|
||||||
|
}\n";
|
||||||
|
$content .= "* {
|
||||||
|
box-sizing: border-box;
|
||||||
|
}\n";
|
||||||
|
$content .= "button, input, optgroup, select, textarea {
|
||||||
|
margin:0px 0px 0px 0px;
|
||||||
|
}\n";
|
||||||
|
$content .= "#form .form-control[disabled],
|
||||||
|
#form .form-control[readonly],
|
||||||
|
#form fieldset[disabled] .form-control {
|
||||||
|
cursor: not-allowed;
|
||||||
|
background-color: #eee;
|
||||||
|
opacity: 1;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert {
|
||||||
|
border-radius: 4px ;
|
||||||
|
border-width: 1px;
|
||||||
|
padding:10px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-success {
|
||||||
|
border-color: #d6e9c6;
|
||||||
|
background-color: #dff0d8;
|
||||||
|
color: #3c763d
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-info {
|
||||||
|
border-color: #bce8f1;
|
||||||
|
background-color: #d9edf7;
|
||||||
|
color: #31708f;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-warning {
|
||||||
|
border-color: #faebcc;
|
||||||
|
background-color: #fcf8e3;
|
||||||
|
color: #8a6d3b;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-danger {
|
||||||
|
border-color: #ebccd1;
|
||||||
|
background-color: #f2dede;
|
||||||
|
color: #a94442;
|
||||||
|
}\n";
|
||||||
$content .= "</style>\n";
|
$content .= "</style>\n";
|
||||||
// CSS is in edit an id too !
|
// CSS is in edit an id too !
|
||||||
}
|
}
|
||||||
@@ -1318,29 +1520,101 @@ $content .= "</li>\n";
|
|||||||
{
|
{
|
||||||
// CSS is in add too !
|
// CSS is in add too !
|
||||||
$content .= "<style type='text/css' scoped='scoped'>\n";
|
$content .= "<style type='text/css' scoped='scoped'>\n";
|
||||||
$content .= "#form .col-sm-2 { float:left; width: 16.66666667%; padding-left:15px;padding-right:15px;};\n";
|
$content .= "#form .col-sm-2 {
|
||||||
$content .= "#form .col-sm-10 {float:left; width: 83.33333333%; }\n";
|
float:left;
|
||||||
$content .= "#form .col-sm-12 { width: 100%; }\n";
|
width: 16.66666667%;
|
||||||
$content .= "#form input[type='submit'] { width:93%; margin-left:auto;margin-right:auto}\n";
|
padding-left:15px;
|
||||||
$content .= "#form .btn-primary { color: #fff; background-color: #428bca; border-color: #357ebd; }\n";
|
padding-right:15px;
|
||||||
|
};\n";
|
||||||
|
$content .= "#form .col-sm-10 {
|
||||||
$content .= ".help-block { margin-left:16.7%;display: block; color:#a94442;} \n";
|
float:left;
|
||||||
$content .= "#form input[type='text'] { background-color:#fff;}\n";
|
width: 83.33333333%;
|
||||||
$content .= "#form .has-error label { color:#a94442; }\n";
|
}\n";
|
||||||
$content .= "#form .has-error .form-control { border-color:#a94442; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset; }\n";
|
$content .= "#form .col-sm-12 {
|
||||||
$content .= ".form-group { margin-bottom: 15px; }\n";
|
width: 100%;
|
||||||
$content .= ".form-horizontal .control-label { text-align: right; }\n";
|
}\n";
|
||||||
$content .= "label { display: inline-block; font-weight: 700; }\n";
|
$content .= "#form input[type='submit'] {
|
||||||
$content .= ".form-control { display: block; border-radius: 4px;padding-top: 6px; padding-right: 12px; padding-bottom: 6px; padding-left: 12px; width: 80%; }\n";
|
width:93%;
|
||||||
$content .= "* { box-sizing: border-box;}\n";
|
margin-left:auto;
|
||||||
$content .= "button, input, optgroup, select, textarea { margin:0px 0px 0px 0px; }\n";
|
margin-right:auto
|
||||||
$content .= "#form .form-control[disabled], #form .form-control[readonly], #form fieldset[disabled] .form-control { cursor: not-allowed; background-color: #eee; opacity: 1; }\n";
|
}\n";
|
||||||
$content .= ".alert { border-radius: 4px ; border-width: 1px; padding:10px; }\n";
|
$content .= "#form .btn-primary {
|
||||||
$content .= ".alert-success { border-color: #d6e9c6; background-color: #dff0d8; color: #3c763d}\n";
|
color: #fff;
|
||||||
$content .= ".alert-info { border-color: #bce8f1; background-color: #d9edf7; color: #31708f;}\n";
|
background-color: #428bca;
|
||||||
$content .= ".alert-warning { border-color: #faebcc; background-color: #fcf8e3; color: #8a6d3b;}\n";
|
border-color: #357ebd;
|
||||||
$content .= ".alert-danger { border-color: #ebccd1; background-color: #f2dede; color: #a94442; }\n";
|
}\n";
|
||||||
|
$content .= ".help-block {
|
||||||
|
margin-left:16.7%;
|
||||||
|
display: block;
|
||||||
|
color:#a94442;
|
||||||
|
} \n";
|
||||||
|
$content .= "#form input[type='text'] {
|
||||||
|
background-color:#fff;
|
||||||
|
}\n";
|
||||||
|
$content .= "#form .has-error label {
|
||||||
|
color:#a94442;
|
||||||
|
}\n";
|
||||||
|
$content .= "#form .has-error .form-control {
|
||||||
|
border-color:#a94442;
|
||||||
|
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
|
||||||
|
}\n";
|
||||||
|
$content .= ".form-group {
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".form-horizontal .control-label {
|
||||||
|
text-align: right;
|
||||||
|
}\n";
|
||||||
|
$content .= "label {
|
||||||
|
display: inline-block;
|
||||||
|
font-weight: 700;
|
||||||
|
}\n";
|
||||||
|
$content .= ".form-control {
|
||||||
|
display: block;
|
||||||
|
border-radius: 4px;
|
||||||
|
padding-top: 6px;
|
||||||
|
padding-right: 12px;
|
||||||
|
padding-bottom: 6px;
|
||||||
|
padding-left: 12px;
|
||||||
|
width: 80%;
|
||||||
|
}\n";
|
||||||
|
$content .= "* {
|
||||||
|
box-sizing: border-box;
|
||||||
|
}\n";
|
||||||
|
$content .= "button, input, optgroup, select, textarea {
|
||||||
|
margin:0px 0px 0px 0px;
|
||||||
|
}\n";
|
||||||
|
$content .= "#form .form-control[disabled],
|
||||||
|
#form .form-control[readonly],
|
||||||
|
#form fieldset[disabled] .form-control {
|
||||||
|
cursor: not-allowed;
|
||||||
|
background-color: #eee;
|
||||||
|
opacity: 1;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert {
|
||||||
|
border-radius: 4px ;
|
||||||
|
border-width: 1px;
|
||||||
|
padding:10px;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-success {
|
||||||
|
border-color: #d6e9c6;
|
||||||
|
background-color: #dff0d8;
|
||||||
|
color: #3c763d
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-info {
|
||||||
|
border-color: #bce8f1;
|
||||||
|
background-color: #d9edf7;
|
||||||
|
color: #31708f;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-warning {
|
||||||
|
border-color: #faebcc;
|
||||||
|
background-color: #fcf8e3;
|
||||||
|
color: #8a6d3b;
|
||||||
|
}\n";
|
||||||
|
$content .= ".alert-danger {
|
||||||
|
border-color: #ebccd1;
|
||||||
|
background-color: #f2dede;
|
||||||
|
color: #a94442;
|
||||||
|
}\n";
|
||||||
$content .= "</style>\n";
|
$content .= "</style>\n";
|
||||||
// CSS is in add too !
|
// CSS is in add too !
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,17 +5,20 @@ require_once ("domframework/markdown.php");
|
|||||||
|
|
||||||
if (! isset ($argv[1]))
|
if (! isset ($argv[1]))
|
||||||
{
|
{
|
||||||
file_put_contents ("php://stderr", "No file to convert in markdown provided\n");
|
file_put_contents ("php://stderr",
|
||||||
|
"No file to convert in markdown provided\n");
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
if (! file_exists ($argv[1]))
|
if (! file_exists ($argv[1]))
|
||||||
{
|
{
|
||||||
file_put_contents ("php://stderr", "The file to convert in markdown doesn't exists\n");
|
file_put_contents ("php://stderr",
|
||||||
|
"The file to convert in markdown doesn't exists\n");
|
||||||
exit (2);
|
exit (2);
|
||||||
}
|
}
|
||||||
if (! is_readable ($argv[1]))
|
if (! is_readable ($argv[1]))
|
||||||
{
|
{
|
||||||
file_put_contents ("php://stderr", "The file to convert in markdown is not readable\n");
|
file_put_contents ("php://stderr",
|
||||||
|
"The file to convert in markdown is not readable\n");
|
||||||
exit (3);
|
exit (3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user