@@ -28,5 +28,5 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | function PluginUpperCompile(Compiler $compiler, $value) |
| 30 | 30 | { |
| 31 | - return 'mb_strtoupper((string) ' . $value . ', $this->charset)'; |
|
| 31 | + return 'mb_strtoupper((string) ' . $value . ', $this->charset)'; |
|
| 32 | 32 | } |
@@ -28,5 +28,5 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | function PluginSafeCompile(Compiler $compiler, $var) |
| 30 | 30 | { |
| 31 | - return preg_replace('#\(is_string\(\$tmp=(.+)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', '$1', $var); |
|
| 31 | + return preg_replace('#\(is_string\(\$tmp=(.+)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', '$1', $var); |
|
| 32 | 32 | } |
@@ -28,5 +28,5 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | function PluginOptionalCompile(Compiler $compiler, $value) |
| 30 | 30 | { |
| 31 | - return $value; |
|
| 31 | + return $value; |
|
| 32 | 32 | } |
@@ -29,156 +29,156 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | class PluginDump extends Plugin |
| 31 | 31 | { |
| 32 | - protected $outputObjects; |
|
| 33 | - protected $outputMethods; |
|
| 34 | - |
|
| 35 | - public function process($var = '$', $show_methods = false) |
|
| 36 | - { |
|
| 37 | - $this->outputMethods = $show_methods; |
|
| 38 | - if ($var === '$') { |
|
| 39 | - $var = $this->core->getData(); |
|
| 40 | - $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">data'; |
|
| 41 | - } else { |
|
| 42 | - $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">dump'; |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - $this->outputObjects = array(); |
|
| 46 | - |
|
| 47 | - if (!is_array($var)) { |
|
| 48 | - if (is_object($var)) { |
|
| 49 | - return $this->exportObj('', $var); |
|
| 50 | - } else { |
|
| 51 | - return $this->exportVar('', $var); |
|
| 52 | - } |
|
| 53 | - } |
|
| 54 | - |
|
| 55 | - $scope = $this->core->getScope(); |
|
| 56 | - |
|
| 57 | - if ($var === $scope) { |
|
| 58 | - $out .= ' (current scope): <div style="background:#ccc;">'; |
|
| 59 | - } else { |
|
| 60 | - $out .= ':<div style="padding-left:20px;">'; |
|
| 61 | - } |
|
| 62 | - |
|
| 63 | - $out .= $this->export($var, $scope); |
|
| 64 | - |
|
| 65 | - return $out . '</div></div>'; |
|
| 66 | - } |
|
| 67 | - |
|
| 68 | - protected function export($var, $scope) |
|
| 69 | - { |
|
| 70 | - $out = ''; |
|
| 71 | - foreach ($var as $i => $v) { |
|
| 72 | - if (is_array($v) || (is_object($v) && $v instanceof Iterator)) { |
|
| 73 | - $out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')'; |
|
| 74 | - if ($v === $scope) { |
|
| 75 | - $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>'; |
|
| 76 | - } else { |
|
| 77 | - $out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>'; |
|
| 78 | - } |
|
| 79 | - } elseif (is_object($v)) { |
|
| 80 | - $out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v); |
|
| 81 | - } else { |
|
| 82 | - $out .= $this->exportVar($i . ' = ', $v); |
|
| 83 | - } |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - return $out; |
|
| 87 | - } |
|
| 88 | - |
|
| 89 | - protected function exportVar($i, $v) |
|
| 90 | - { |
|
| 91 | - if (is_string($v) || is_bool($v) || is_numeric($v)) { |
|
| 92 | - return $i . htmlentities(var_export($v, true)) . '<br />'; |
|
| 93 | - } elseif (is_null($v)) { |
|
| 94 | - return $i . 'null<br />'; |
|
| 95 | - } elseif (is_resource($v)) { |
|
| 96 | - return $i . 'resource(' . get_resource_type($v) . ')<br />'; |
|
| 97 | - } else { |
|
| 98 | - return $i . htmlentities(var_export($v, true)) . '<br />'; |
|
| 99 | - } |
|
| 100 | - } |
|
| 101 | - |
|
| 102 | - protected function exportObj($i, $obj) |
|
| 103 | - { |
|
| 104 | - if (array_search($obj, $this->outputObjects, true) !== false) { |
|
| 105 | - return $i . ' [recursion, skipped]<br />'; |
|
| 106 | - } |
|
| 107 | - |
|
| 108 | - $this->outputObjects[] = $obj; |
|
| 109 | - |
|
| 110 | - $list = (array)$obj; |
|
| 111 | - |
|
| 112 | - $protectedLength = strlen(get_class($obj)) + 2; |
|
| 113 | - |
|
| 114 | - $out = array(); |
|
| 115 | - |
|
| 116 | - if ($this->outputMethods) { |
|
| 117 | - $ref = new ReflectionObject($obj); |
|
| 118 | - |
|
| 119 | - foreach ($ref->getMethods() as $method) { |
|
| 120 | - if (!$method->isPublic()) { |
|
| 121 | - continue; |
|
| 122 | - } |
|
| 123 | - |
|
| 124 | - if (empty($out['method'])) { |
|
| 125 | - $out['method'] = ''; |
|
| 126 | - } |
|
| 127 | - |
|
| 128 | - $params = array(); |
|
| 129 | - foreach ($method->getParameters() as $param) { |
|
| 130 | - $params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : ''); |
|
| 131 | - } |
|
| 132 | - |
|
| 133 | - $out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />'; |
|
| 134 | - } |
|
| 135 | - } |
|
| 136 | - |
|
| 137 | - foreach ($list as $attributeName => $attributeValue) { |
|
| 138 | - if (property_exists($obj, $attributeName)) { |
|
| 139 | - $key = 'public'; |
|
| 140 | - } elseif (substr($attributeName, 0, 3) === "\0*\0") { |
|
| 141 | - $key = 'protected'; |
|
| 142 | - $attributeName = substr($attributeName, 3); |
|
| 143 | - } else { |
|
| 144 | - $key = 'private'; |
|
| 145 | - $attributeName = substr($attributeName, $protectedLength); |
|
| 146 | - } |
|
| 147 | - |
|
| 148 | - if (empty($out[$key])) { |
|
| 149 | - $out[$key] = ''; |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - $out[$key] .= '(' . $key . ') '; |
|
| 153 | - |
|
| 154 | - if (is_array($attributeValue)) { |
|
| 155 | - $out[$key] .= $attributeName . ' (array):<br /> |
|
| 32 | + protected $outputObjects; |
|
| 33 | + protected $outputMethods; |
|
| 34 | + |
|
| 35 | + public function process($var = '$', $show_methods = false) |
|
| 36 | + { |
|
| 37 | + $this->outputMethods = $show_methods; |
|
| 38 | + if ($var === '$') { |
|
| 39 | + $var = $this->core->getData(); |
|
| 40 | + $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">data'; |
|
| 41 | + } else { |
|
| 42 | + $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">dump'; |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + $this->outputObjects = array(); |
|
| 46 | + |
|
| 47 | + if (!is_array($var)) { |
|
| 48 | + if (is_object($var)) { |
|
| 49 | + return $this->exportObj('', $var); |
|
| 50 | + } else { |
|
| 51 | + return $this->exportVar('', $var); |
|
| 52 | + } |
|
| 53 | + } |
|
| 54 | + |
|
| 55 | + $scope = $this->core->getScope(); |
|
| 56 | + |
|
| 57 | + if ($var === $scope) { |
|
| 58 | + $out .= ' (current scope): <div style="background:#ccc;">'; |
|
| 59 | + } else { |
|
| 60 | + $out .= ':<div style="padding-left:20px;">'; |
|
| 61 | + } |
|
| 62 | + |
|
| 63 | + $out .= $this->export($var, $scope); |
|
| 64 | + |
|
| 65 | + return $out . '</div></div>'; |
|
| 66 | + } |
|
| 67 | + |
|
| 68 | + protected function export($var, $scope) |
|
| 69 | + { |
|
| 70 | + $out = ''; |
|
| 71 | + foreach ($var as $i => $v) { |
|
| 72 | + if (is_array($v) || (is_object($v) && $v instanceof Iterator)) { |
|
| 73 | + $out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')'; |
|
| 74 | + if ($v === $scope) { |
|
| 75 | + $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>'; |
|
| 76 | + } else { |
|
| 77 | + $out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>'; |
|
| 78 | + } |
|
| 79 | + } elseif (is_object($v)) { |
|
| 80 | + $out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v); |
|
| 81 | + } else { |
|
| 82 | + $out .= $this->exportVar($i . ' = ', $v); |
|
| 83 | + } |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + return $out; |
|
| 87 | + } |
|
| 88 | + |
|
| 89 | + protected function exportVar($i, $v) |
|
| 90 | + { |
|
| 91 | + if (is_string($v) || is_bool($v) || is_numeric($v)) { |
|
| 92 | + return $i . htmlentities(var_export($v, true)) . '<br />'; |
|
| 93 | + } elseif (is_null($v)) { |
|
| 94 | + return $i . 'null<br />'; |
|
| 95 | + } elseif (is_resource($v)) { |
|
| 96 | + return $i . 'resource(' . get_resource_type($v) . ')<br />'; |
|
| 97 | + } else { |
|
| 98 | + return $i . htmlentities(var_export($v, true)) . '<br />'; |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | + |
|
| 102 | + protected function exportObj($i, $obj) |
|
| 103 | + { |
|
| 104 | + if (array_search($obj, $this->outputObjects, true) !== false) { |
|
| 105 | + return $i . ' [recursion, skipped]<br />'; |
|
| 106 | + } |
|
| 107 | + |
|
| 108 | + $this->outputObjects[] = $obj; |
|
| 109 | + |
|
| 110 | + $list = (array)$obj; |
|
| 111 | + |
|
| 112 | + $protectedLength = strlen(get_class($obj)) + 2; |
|
| 113 | + |
|
| 114 | + $out = array(); |
|
| 115 | + |
|
| 116 | + if ($this->outputMethods) { |
|
| 117 | + $ref = new ReflectionObject($obj); |
|
| 118 | + |
|
| 119 | + foreach ($ref->getMethods() as $method) { |
|
| 120 | + if (!$method->isPublic()) { |
|
| 121 | + continue; |
|
| 122 | + } |
|
| 123 | + |
|
| 124 | + if (empty($out['method'])) { |
|
| 125 | + $out['method'] = ''; |
|
| 126 | + } |
|
| 127 | + |
|
| 128 | + $params = array(); |
|
| 129 | + foreach ($method->getParameters() as $param) { |
|
| 130 | + $params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : ''); |
|
| 131 | + } |
|
| 132 | + |
|
| 133 | + $out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />'; |
|
| 134 | + } |
|
| 135 | + } |
|
| 136 | + |
|
| 137 | + foreach ($list as $attributeName => $attributeValue) { |
|
| 138 | + if (property_exists($obj, $attributeName)) { |
|
| 139 | + $key = 'public'; |
|
| 140 | + } elseif (substr($attributeName, 0, 3) === "\0*\0") { |
|
| 141 | + $key = 'protected'; |
|
| 142 | + $attributeName = substr($attributeName, 3); |
|
| 143 | + } else { |
|
| 144 | + $key = 'private'; |
|
| 145 | + $attributeName = substr($attributeName, $protectedLength); |
|
| 146 | + } |
|
| 147 | + |
|
| 148 | + if (empty($out[$key])) { |
|
| 149 | + $out[$key] = ''; |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + $out[$key] .= '(' . $key . ') '; |
|
| 153 | + |
|
| 154 | + if (is_array($attributeValue)) { |
|
| 155 | + $out[$key] .= $attributeName . ' (array):<br /> |
|
| 156 | 156 | <div style="padding-left:20px;">' . $this->export($attributeValue, false) . '</div>'; |
| 157 | - } elseif (is_object($attributeValue)) { |
|
| 158 | - $out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue); |
|
| 159 | - } else { |
|
| 160 | - $out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue); |
|
| 161 | - } |
|
| 162 | - } |
|
| 157 | + } elseif (is_object($attributeValue)) { |
|
| 158 | + $out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue); |
|
| 159 | + } else { |
|
| 160 | + $out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue); |
|
| 161 | + } |
|
| 162 | + } |
|
| 163 | 163 | |
| 164 | - $return = $i . '<br /><div style="padding-left:20px;">'; |
|
| 164 | + $return = $i . '<br /><div style="padding-left:20px;">'; |
|
| 165 | 165 | |
| 166 | - if (!empty($out['method'])) { |
|
| 167 | - $return .= $out['method']; |
|
| 168 | - } |
|
| 166 | + if (!empty($out['method'])) { |
|
| 167 | + $return .= $out['method']; |
|
| 168 | + } |
|
| 169 | 169 | |
| 170 | - if (!empty($out['public'])) { |
|
| 171 | - $return .= $out['public']; |
|
| 172 | - } |
|
| 170 | + if (!empty($out['public'])) { |
|
| 171 | + $return .= $out['public']; |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | - if (!empty($out['protected'])) { |
|
| 175 | - $return .= $out['protected']; |
|
| 176 | - } |
|
| 174 | + if (!empty($out['protected'])) { |
|
| 175 | + $return .= $out['protected']; |
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | - if (!empty($out['private'])) { |
|
| 179 | - $return .= $out['private']; |
|
| 180 | - } |
|
| 178 | + if (!empty($out['private'])) { |
|
| 179 | + $return .= $out['private']; |
|
| 180 | + } |
|
| 181 | 181 | |
| 182 | - return $return . '</div>'; |
|
| 183 | - } |
|
| 182 | + return $return . '</div>'; |
|
| 183 | + } |
|
| 184 | 184 | } |
@@ -34,61 +34,61 @@ |
||
| 34 | 34 | */ |
| 35 | 35 | class PluginCounter extends Plugin |
| 36 | 36 | { |
| 37 | - protected $counters = array(); |
|
| 37 | + protected $counters = array(); |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param string $name |
|
| 41 | - * @param null $start |
|
| 42 | - * @param null $skip |
|
| 43 | - * @param null $direction |
|
| 44 | - * @param null $print |
|
| 45 | - * @param null $assign |
|
| 46 | - * |
|
| 47 | - * @return mixed |
|
| 48 | - */ |
|
| 49 | - public function process($name = 'default', $start = null, $skip = null, $direction = null, $print = null, $assign = null) |
|
| 50 | - { |
|
| 51 | - // init counter |
|
| 52 | - if (!isset($this->counters[$name])) { |
|
| 53 | - $this->counters[$name] = array( |
|
| 54 | - 'count' => $start === null ? 1 : (int)$start, |
|
| 55 | - 'skip' => $skip === null ? 1 : (int)$skip, |
|
| 56 | - 'print' => $print === null ? true : (bool)$print, |
|
| 57 | - 'assign' => $assign === null ? null : (string)$assign, |
|
| 58 | - 'direction' => strtolower($direction) === 'down' ? - 1 : 1, |
|
| 59 | - ); |
|
| 60 | - } // increment |
|
| 61 | - else { |
|
| 62 | - // override setting if present |
|
| 63 | - if ($skip !== null) { |
|
| 64 | - $this->counters[$name]['skip'] = (int)$skip; |
|
| 65 | - } |
|
| 39 | + /** |
|
| 40 | + * @param string $name |
|
| 41 | + * @param null $start |
|
| 42 | + * @param null $skip |
|
| 43 | + * @param null $direction |
|
| 44 | + * @param null $print |
|
| 45 | + * @param null $assign |
|
| 46 | + * |
|
| 47 | + * @return mixed |
|
| 48 | + */ |
|
| 49 | + public function process($name = 'default', $start = null, $skip = null, $direction = null, $print = null, $assign = null) |
|
| 50 | + { |
|
| 51 | + // init counter |
|
| 52 | + if (!isset($this->counters[$name])) { |
|
| 53 | + $this->counters[$name] = array( |
|
| 54 | + 'count' => $start === null ? 1 : (int)$start, |
|
| 55 | + 'skip' => $skip === null ? 1 : (int)$skip, |
|
| 56 | + 'print' => $print === null ? true : (bool)$print, |
|
| 57 | + 'assign' => $assign === null ? null : (string)$assign, |
|
| 58 | + 'direction' => strtolower($direction) === 'down' ? - 1 : 1, |
|
| 59 | + ); |
|
| 60 | + } // increment |
|
| 61 | + else { |
|
| 62 | + // override setting if present |
|
| 63 | + if ($skip !== null) { |
|
| 64 | + $this->counters[$name]['skip'] = (int)$skip; |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - if ($direction !== null) { |
|
| 68 | - $this->counters[$name]['direction'] = strtolower($direction) === 'down' ? - 1 : 1; |
|
| 69 | - } |
|
| 67 | + if ($direction !== null) { |
|
| 68 | + $this->counters[$name]['direction'] = strtolower($direction) === 'down' ? - 1 : 1; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - if ($print !== null) { |
|
| 72 | - $this->counters[$name]['print'] = (bool)$print; |
|
| 73 | - } |
|
| 71 | + if ($print !== null) { |
|
| 72 | + $this->counters[$name]['print'] = (bool)$print; |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - if ($assign !== null) { |
|
| 76 | - $this->counters[$name]['assign'] = (string)$assign; |
|
| 77 | - } |
|
| 75 | + if ($assign !== null) { |
|
| 76 | + $this->counters[$name]['assign'] = (string)$assign; |
|
| 77 | + } |
|
| 78 | 78 | |
| 79 | - if ($start !== null) { |
|
| 80 | - $this->counters[$name]['count'] = (int)$start; |
|
| 81 | - } else { |
|
| 82 | - $this->counters[$name]['count'] += ($this->counters[$name]['skip'] * $this->counters[$name]['direction']); |
|
| 83 | - } |
|
| 84 | - } |
|
| 79 | + if ($start !== null) { |
|
| 80 | + $this->counters[$name]['count'] = (int)$start; |
|
| 81 | + } else { |
|
| 82 | + $this->counters[$name]['count'] += ($this->counters[$name]['skip'] * $this->counters[$name]['direction']); |
|
| 83 | + } |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - $out = $this->counters[$name]['count']; |
|
| 86 | + $out = $this->counters[$name]['count']; |
|
| 87 | 87 | |
| 88 | - if ($this->counters[$name]['assign'] !== null) { |
|
| 89 | - $this->core->assignInScope($out, $this->counters[$name]['assign']); |
|
| 90 | - } elseif ($this->counters[$name]['print'] === true) { |
|
| 91 | - return $out; |
|
| 92 | - } |
|
| 93 | - } |
|
| 88 | + if ($this->counters[$name]['assign'] !== null) { |
|
| 89 | + $this->core->assignInScope($out, $this->counters[$name]['assign']); |
|
| 90 | + } elseif ($this->counters[$name]['print'] === true) { |
|
| 91 | + return $out; |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | 94 | } |
@@ -30,22 +30,22 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | function PluginRegexReplace(Core $dwoo, $value, $search, $replace) |
| 32 | 32 | { |
| 33 | - $search = (array)$search; |
|
| 34 | - $cnt = count($search); |
|
| 33 | + $search = (array)$search; |
|
| 34 | + $cnt = count($search); |
|
| 35 | 35 | |
| 36 | - for ($i = 0; $i < $cnt; ++ $i) { |
|
| 37 | - // Credits for this to Monte Ohrt who made smarty's regex_replace modifier |
|
| 38 | - if (($pos = strpos($search[$i], "\0")) !== false) { |
|
| 39 | - $search[$i] = substr($search[$i], 0, $pos); |
|
| 40 | - } |
|
| 36 | + for ($i = 0; $i < $cnt; ++ $i) { |
|
| 37 | + // Credits for this to Monte Ohrt who made smarty's regex_replace modifier |
|
| 38 | + if (($pos = strpos($search[$i], "\0")) !== false) { |
|
| 39 | + $search[$i] = substr($search[$i], 0, $pos); |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - if (preg_match('#[a-z\s]+$#is', $search[$i], $m) && (strpos($m[0], 'e') !== false)) { |
|
| 43 | - $search[$i] = substr($search[$i], 0, - strlen($m[0])) . str_replace(array( |
|
| 44 | - 'e', |
|
| 45 | - ' ' |
|
| 46 | - ), '', $m[0]); |
|
| 47 | - } |
|
| 48 | - } |
|
| 42 | + if (preg_match('#[a-z\s]+$#is', $search[$i], $m) && (strpos($m[0], 'e') !== false)) { |
|
| 43 | + $search[$i] = substr($search[$i], 0, - strlen($m[0])) . str_replace(array( |
|
| 44 | + 'e', |
|
| 45 | + ' ' |
|
| 46 | + ), '', $m[0]); |
|
| 47 | + } |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - return preg_replace($search, $replace, $value); |
|
| 50 | + return preg_replace($search, $replace, $value); |
|
| 51 | 51 | } |
@@ -30,52 +30,52 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | function PluginDateFormat(Core $dwoo, $value, $format = '%b %e, %Y', $default = null) |
| 32 | 32 | { |
| 33 | - if (!empty($value)) { |
|
| 34 | - // convert if it's not a valid unix timestamp |
|
| 35 | - if (preg_match('#^-?\d{1,10}$#', $value) === 0) { |
|
| 36 | - $value = strtotime($value); |
|
| 37 | - } |
|
| 38 | - } elseif (!empty($default)) { |
|
| 39 | - // convert if it's not a valid unix timestamp |
|
| 40 | - if (preg_match('#^-?\d{1,10}$#', $default) === 0) { |
|
| 41 | - $value = strtotime($default); |
|
| 42 | - } else { |
|
| 43 | - $value = $default; |
|
| 44 | - } |
|
| 45 | - } else { |
|
| 46 | - return ''; |
|
| 47 | - } |
|
| 33 | + if (!empty($value)) { |
|
| 34 | + // convert if it's not a valid unix timestamp |
|
| 35 | + if (preg_match('#^-?\d{1,10}$#', $value) === 0) { |
|
| 36 | + $value = strtotime($value); |
|
| 37 | + } |
|
| 38 | + } elseif (!empty($default)) { |
|
| 39 | + // convert if it's not a valid unix timestamp |
|
| 40 | + if (preg_match('#^-?\d{1,10}$#', $default) === 0) { |
|
| 41 | + $value = strtotime($default); |
|
| 42 | + } else { |
|
| 43 | + $value = $default; |
|
| 44 | + } |
|
| 45 | + } else { |
|
| 46 | + return ''; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - // Credits for that windows compat block to Monte Ohrt who made smarty's date_format plugin |
|
| 50 | - if (DIRECTORY_SEPARATOR == '\\') { |
|
| 51 | - $_win_from = array( |
|
| 52 | - '%D', |
|
| 53 | - '%h', |
|
| 54 | - '%n', |
|
| 55 | - '%r', |
|
| 56 | - '%R', |
|
| 57 | - '%t', |
|
| 58 | - '%T' |
|
| 59 | - ); |
|
| 60 | - $_win_to = array( |
|
| 61 | - '%m/%d/%y', |
|
| 62 | - '%b', |
|
| 63 | - "\n", |
|
| 64 | - '%I:%M:%S %p', |
|
| 65 | - '%H:%M', |
|
| 66 | - "\t", |
|
| 67 | - '%H:%M:%S' |
|
| 68 | - ); |
|
| 69 | - if (strpos($format, '%e') !== false) { |
|
| 70 | - $_win_from[] = '%e'; |
|
| 71 | - $_win_to[] = sprintf('%\' 2d', date('j', $value)); |
|
| 72 | - } |
|
| 73 | - if (strpos($format, '%l') !== false) { |
|
| 74 | - $_win_from[] = '%l'; |
|
| 75 | - $_win_to[] = sprintf('%\' 2d', date('h', $value)); |
|
| 76 | - } |
|
| 77 | - $format = str_replace($_win_from, $_win_to, $format); |
|
| 78 | - } |
|
| 49 | + // Credits for that windows compat block to Monte Ohrt who made smarty's date_format plugin |
|
| 50 | + if (DIRECTORY_SEPARATOR == '\\') { |
|
| 51 | + $_win_from = array( |
|
| 52 | + '%D', |
|
| 53 | + '%h', |
|
| 54 | + '%n', |
|
| 55 | + '%r', |
|
| 56 | + '%R', |
|
| 57 | + '%t', |
|
| 58 | + '%T' |
|
| 59 | + ); |
|
| 60 | + $_win_to = array( |
|
| 61 | + '%m/%d/%y', |
|
| 62 | + '%b', |
|
| 63 | + "\n", |
|
| 64 | + '%I:%M:%S %p', |
|
| 65 | + '%H:%M', |
|
| 66 | + "\t", |
|
| 67 | + '%H:%M:%S' |
|
| 68 | + ); |
|
| 69 | + if (strpos($format, '%e') !== false) { |
|
| 70 | + $_win_from[] = '%e'; |
|
| 71 | + $_win_to[] = sprintf('%\' 2d', date('j', $value)); |
|
| 72 | + } |
|
| 73 | + if (strpos($format, '%l') !== false) { |
|
| 74 | + $_win_from[] = '%l'; |
|
| 75 | + $_win_to[] = sprintf('%\' 2d', date('h', $value)); |
|
| 76 | + } |
|
| 77 | + $format = str_replace($_win_from, $_win_to, $format); |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - return strftime($format, $value); |
|
| 80 | + return strftime($format, $value); |
|
| 81 | 81 | } |
@@ -38,13 +38,13 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | function PluginArrayCompile(Compiler $compiler, array $rest = array()) |
| 40 | 40 | { |
| 41 | - $out = array(); |
|
| 42 | - foreach ($rest as $key => $value) { |
|
| 43 | - if (!is_numeric($key) && !strstr($key, '$this->scope')) { |
|
| 44 | - $key = "'" . $key . "'"; |
|
| 45 | - } |
|
| 46 | - $out[] = $key . '=>' . $value; |
|
| 47 | - } |
|
| 41 | + $out = array(); |
|
| 42 | + foreach ($rest as $key => $value) { |
|
| 43 | + if (!is_numeric($key) && !strstr($key, '$this->scope')) { |
|
| 44 | + $key = "'" . $key . "'"; |
|
| 45 | + } |
|
| 46 | + $out[] = $key . '=>' . $value; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - return 'array(' . implode(', ', $out) . ')'; |
|
| 49 | + return 'array(' . implode(', ', $out) . ')'; |
|
| 50 | 50 | } |
@@ -27,47 +27,47 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | class PluginForeachelse extends BlockPlugin implements ICompilableBlock |
| 29 | 29 | { |
| 30 | - public function init() |
|
| 31 | - { |
|
| 32 | - } |
|
| 30 | + public function init() |
|
| 31 | + { |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @param Compiler $compiler |
|
| 36 | - * @param array $params |
|
| 37 | - * @param string $prepend |
|
| 38 | - * @param string $append |
|
| 39 | - * @param string $type |
|
| 40 | - * |
|
| 41 | - * @return string |
|
| 42 | - */ |
|
| 43 | - public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type) |
|
| 44 | - { |
|
| 45 | - $with = &$compiler->findBlock('foreach', true); |
|
| 34 | + /** |
|
| 35 | + * @param Compiler $compiler |
|
| 36 | + * @param array $params |
|
| 37 | + * @param string $prepend |
|
| 38 | + * @param string $append |
|
| 39 | + * @param string $type |
|
| 40 | + * |
|
| 41 | + * @return string |
|
| 42 | + */ |
|
| 43 | + public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type) |
|
| 44 | + { |
|
| 45 | + $with = &$compiler->findBlock('foreach', true); |
|
| 46 | 46 | |
| 47 | - $params['initialized'] = true; |
|
| 48 | - $compiler->injectBlock($type, $params); |
|
| 47 | + $params['initialized'] = true; |
|
| 48 | + $compiler->injectBlock($type, $params); |
|
| 49 | 49 | |
| 50 | - return ''; |
|
| 51 | - } |
|
| 50 | + return ''; |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * @param Compiler $compiler |
|
| 55 | - * @param array $params |
|
| 56 | - * @param string $prepend |
|
| 57 | - * @param string $append |
|
| 58 | - * @param string $content |
|
| 59 | - * |
|
| 60 | - * @return string |
|
| 61 | - */ |
|
| 62 | - public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content) |
|
| 63 | - { |
|
| 64 | - if (!isset($params['initialized'])) { |
|
| 65 | - return ''; |
|
| 66 | - } |
|
| 53 | + /** |
|
| 54 | + * @param Compiler $compiler |
|
| 55 | + * @param array $params |
|
| 56 | + * @param string $prepend |
|
| 57 | + * @param string $append |
|
| 58 | + * @param string $content |
|
| 59 | + * |
|
| 60 | + * @return string |
|
| 61 | + */ |
|
| 62 | + public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content) |
|
| 63 | + { |
|
| 64 | + if (!isset($params['initialized'])) { |
|
| 65 | + return ''; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - $block = &$compiler->getCurrentBlock(); |
|
| 69 | - $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE; |
|
| 68 | + $block = &$compiler->getCurrentBlock(); |
|
| 69 | + $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE; |
|
| 70 | 70 | |
| 71 | - return ''; |
|
| 72 | - } |
|
| 71 | + return ''; |
|
| 72 | + } |
|
| 73 | 73 | } |